Merge pull request #1680 from atlassian/fix-for-logoug-confluence-9-2-0

Fix for logoug confluence 9 2 0

Author: SergeyMoroz0703

app/selenium_ui/confluence/modules.py

@@ -78,9 +78,10 @@ def sub_measure():
 
         def sub_measure():
             login_page.click_login_button()
+            all_updates_page = AllUpdates(webdriver)
+            all_updates_page.wait_for_page_loaded()
             if login_page.is_first_login():
                 login_page.first_user_setup()
-            all_updates_page = AllUpdates(webdriver)
             all_updates_page.wait_for_page_loaded()
             measure_dom_requests(webdriver, interaction="selenium_login:login_and_view_dashboard")
             if CONFLUENCE_SETTINGS.extended_metrics:
@@ -318,10 +319,13 @@ def measure():
 
 def log_out(webdriver, datasets):
     logout_page = Logout(webdriver)
+    login_page = Login(webdriver)
 
     @print_timing("selenium_log_out")
     def measure():
         logout_page.go_to()
         logout_page.wait_for_logout()
+        login_page.wait_for_page_loaded()
+        login_page.delete_all_cookies()
 
     measure()

app/selenium_ui/confluence/pages/pages.py

@@ -34,10 +34,8 @@ def set_credentials(self, username, password):
     def click_login_button(self):
         if self.is_2sv_login:
             self.wait_until_visible(LoginPageLocators.login_button_2sv).click()
-            self.wait_until_invisible(LoginPageLocators.login_button_2sv)
         else:
             self.wait_until_visible(LoginPageLocators.login_button).click()
-            self.wait_until_invisible(LoginPageLocators.login_button)
 
     def is_first_login(self):
         elements = self.get_elements(LoginPageLocators.first_login_setup_page)

app/selenium_ui/confluence/pages/selectors.py

@@ -35,7 +35,7 @@ class PopupLocators:
         (By.CSS_SELECTOR, ".aui-button.aui-button-link.skip-onboarding"),
         (By.CSS_SELECTOR, "#closeDisDialog"),
         (By.CSS_SELECTOR, ".aui-button.aui-button-primary.show-onboarding"),
-        (By.CSS_SELECTOR, "button[aria-label='Close this modal']")
+        (By.CSS_SELECTOR, 'button[aria-label="Close this modal"]')
     ]