fix flaky logout > login navigation

dmlemeshko · Sep 25, 2023 · a1dffd4 · a1dffd4
1 parent 79cdcdc
commit a1dffd4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/x-pack/test/functional/page_objects/security_page.ts b/x-pack/test/functional/page_objects/security_page.ts
@@ -323,7 +323,13 @@ export class SecurityPageObject extends FtrService {
         if (alert?.accept) {
           await alert.accept();
         }
-        return !(await this.browser.getCurrentUrl()).includes('/logout');
+
+        if (this.config.get('serverless')) {
+          // Logout might trigger multiple redirects, but in the end we expect the Cloud login page
+          return await this.find.existsByDisplayedByCssSelector('.login-form-password', 5000);
+        } else {
+          return !(await this.browser.getCurrentUrl()).includes('/logout');
+        }
       });
     }
   }

diff --git a/x-pack/test_serverless/functional/page_objects/svl_common_page.ts b/x-pack/test_serverless/functional/page_objects/svl_common_page.ts
@@ -11,7 +11,7 @@ import { FtrProviderContext } from '../ftr_provider_context';
 export function SvlCommonPageProvider({ getService, getPageObjects }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
   const config = getService('config');
-  const pageObjects = getPageObjects(['security']);
+  const pageObjects = getPageObjects(['security', 'common']);
   const retry = getService('retry');
   const kibanaServer = getService('kibanaServer');
   const log = getService('log');
@@ -25,6 +25,9 @@ export function SvlCommonPageProvider({ getService, getPageObjects }: FtrProvide
     async login() {
       await pageObjects.security.forceLogout({ waitForLoginPage: false });
 
+      // adding sleep to settle down logout
+      await pageObjects.common.sleep(2500);
+
       await retry.waitForWithTimeout(
         'Login successfully via API',
         10_000,