From c1f7c53ba04c316f9d41614ec203d19ff4a2ebbb Mon Sep 17 00:00:00 2001
From: Jon Koops <jonkoops@gmail.com>
Date: Tue, 28 Nov 2023 10:04:45 +0100
Subject: [PATCH] Wait for request when testing session revocation (#24048)
 (#25072)

Signed-off-by: Jon Koops <jonkoops@gmail.com>
---
 .../admin-ui/manage/sessions/SessionsPage.ts  | 59 ++++++++-----------
 1 file changed, 23 insertions(+), 36 deletions(-)

diff --git a/js/apps/admin-ui/cypress/support/pages/admin-ui/manage/sessions/SessionsPage.ts b/js/apps/admin-ui/cypress/support/pages/admin-ui/manage/sessions/SessionsPage.ts
index e3f1eef436d..31548e21cb5 100644
--- a/js/apps/admin-ui/cypress/support/pages/admin-ui/manage/sessions/SessionsPage.ts
+++ b/js/apps/admin-ui/cypress/support/pages/admin-ui/manage/sessions/SessionsPage.ts
@@ -1,54 +1,41 @@
 export default class SessionsPage {
-  sessionTypeList = ".pf-c-select__toggle + ul";
-  allSessionTypesOption = "all-sessions-option";
-  regularSSOOption = "regular-sso-option";
-  offlineOption = "offline-option";
-  directGrantOption = "direct-grant-option";
-  serviceAccountOption = "service-account-option";
-  selectedType = ".pf-c-select__toggle-text";
-  revocationActionItem = "revocation";
-  setToNowButton = "set-to-now-button";
-  actionDropdown = "action-dropdown";
-  clearNotBeforeButton = "clear-not-before-button";
-  pushButton = "modal-test-connection-button";
-  notBeforeInput = "not-before-input";
-  logoutAll = "logout-all";
-  logoutAllConfirm = "confirm";
+  #revocationActionItem = "revocation";
+  #setToNowButton = "set-to-now-button";
+  #actionDropdown = "action-dropdown";
+  #clearNotBeforeButton = "clear-not-before-button";
+  #pushButton = "modal-test-connection-button";
+  #notBeforeInput = "not-before-input";
 
   setToNow() {
-    cy.findByTestId(this.actionDropdown).should("exist").click();
-    cy.findByTestId(this.revocationActionItem).should("exist").click();
-    cy.findByTestId(this.setToNowButton).should("exist").click();
+    this.#openRevocationDialog();
+    cy.findByTestId(this.#setToNowButton).click();
     Cypress.session.clearAllSavedSessions();
   }
 
   checkNotBeforeValueExists() {
-    cy.findByTestId(this.actionDropdown).should("exist").click();
-    cy.findByTestId(this.revocationActionItem).should("exist").click();
-    cy.findByTestId(this.notBeforeInput).should("not.have.value", "None");
+    this.#openRevocationDialog();
+    cy.findByTestId(this.#notBeforeInput).should("not.have.value", "None");
   }
 
   clearNotBefore() {
-    cy.findByTestId(this.actionDropdown).should("exist").click();
-    cy.findByTestId(this.revocationActionItem).should("exist").click();
-    cy.findByTestId(this.clearNotBeforeButton).should("exist").click();
+    this.#openRevocationDialog();
+    cy.findByTestId(this.#clearNotBeforeButton).click();
   }
 
   checkNotBeforeCleared() {
-    cy.findByTestId(this.actionDropdown).should("exist").click();
-    cy.findByTestId(this.revocationActionItem).should("exist").click();
-    cy.findByTestId(this.notBeforeInput).should("have.value", "None");
-  }
-
-  logoutAllSessions() {
-    cy.findByTestId(this.actionDropdown).should("exist").click();
-    cy.findByTestId(this.logoutAll).should("exist").click();
-    cy.findByTestId(this.logoutAllConfirm).should("exist").click();
+    this.#openRevocationDialog();
+    cy.findByTestId(this.#notBeforeInput).should("have.value", "None");
   }
 
   pushRevocation() {
-    cy.findByTestId(this.actionDropdown).should("exist").click();
-    cy.findByTestId(this.revocationActionItem).should("exist").click();
-    cy.findByTestId(this.pushButton).should("exist").click();
+    this.#openRevocationDialog();
+    cy.findByTestId(this.#pushButton).click();
+  }
+
+  #openRevocationDialog() {
+    cy.findByTestId(this.#actionDropdown).click();
+    cy.intercept("/admin/realms/master").as("fetchRealm");
+    cy.findByTestId(this.#revocationActionItem).click();
+    cy.wait("@fetchRealm");
   }
 }