diff --git a/pages/base_page.py b/pages/base_page.py index 1e8699a567..ba5a915087 100644 --- a/pages/base_page.py +++ b/pages/base_page.py @@ -1,3 +1,5 @@ +import os + import allure from selenium.common import TimeoutException from selenium.webdriver import ActionChains @@ -79,6 +81,21 @@ def go_to_element(self, element): return self.driver.execute_script("arguments[0].scrollIntoView({ block: 'center'});", element) def check_expected_link(self, url): + with allure.step(f'Check url starts with: {url}'): + # Increasing the CI timeout + timeout = 45 if os.getenv('GITHUB_ACTIONS') else self.timeout + + # Waiting for URL + Wait(self.driver, timeout).until( + lambda d: d.current_url.startswith(url), + message=f"URL doesn't start with {url}. Current: {self.driver.current_url}") + + # Waiting for the page to be ready + Wait(self.driver, timeout).until(lambda d: d.execute_script("return document.readyState") == "complete") + + return True + + def check_expected_link1(self, url): with allure.step(f'Check url is present: {url}'): try: # return Wait(self.driver, self.timeout).until( diff --git a/pages/header_page.py b/pages/header_page.py index 63d18b8654..6e2f51c3bc 100644 --- a/pages/header_page.py +++ b/pages/header_page.py @@ -483,7 +483,7 @@ def click_on_Statistics_link_auth2(self): self.click_more_button() self.element_is_present_and_clickable(self.locators1.LINK_STATISTICS_AUTH2).click() current_url = self.get_current_tab_url() - # print(current_url) + print(current_url) return current_url @allure.step("Click on the 'About' link #2 for AUTHORIZED user") @@ -491,7 +491,7 @@ def click_on_About_link_auth2(self): self.click_more_button() self.element_is_present_and_clickable(self.locators1.LINK_ABOUT_AUTH2).click() current_url = self.get_current_tab_url() - # print(current_url) + print(current_url) return current_url @allure.step("Click on the 'Contacts' link for AUTHORIZED user -- ACTUAL") @@ -519,7 +519,7 @@ def click_on_Contributors_link_auth(self): self.element_is_present_and_clickable(self.locators1.LINK_CONTRIBUTORS_AUTH).click() Wait(self.driver, 10).until(EC.url_changes(current_url)) current_url = self.get_current_tab_url() - # print(current_url) + print(current_url) return current_url @allure.step("Click on the 'Used Resources' link for AUTHORIZED user -- ACTUAL") @@ -529,7 +529,7 @@ def click_on_Used_Resources_link_auth(self): self.element_is_present_and_clickable(self.locators1.LINK_USED_RESOURCES_AUTH).click() Wait(self.driver, 10).until(EC.url_changes(current_url)) current_url = self.get_current_tab_url() - # print(current_url) + print(current_url) return current_url @allure.step("Click on the 'Audiometry' link for AUTHORIZED user -- ACTUAL")