Anca/Add server not found pb + some POM changes (#847)

* Add 3029186 and improve POMs

* docstring and small changes

* Correct tc ids

* Add a comment

Author: soncuteanca

modules/browser_object_tabbar.py

@@ -136,6 +136,21 @@ def get_tab_title(self, tab_element: WebElement) -> str:
         tab_label = tab_element.find_element(*self.get_selector("tab-title"))
         return tab_label.text
 
+    @BasePage.context_chrome
+    def wait_for_tab_title(
+        self, expected_title: str, tab_index: int = 1, timeout: int = 30
+    ) -> None:
+        """
+        Wait until the tab title matches the expected value.
+        Arguments:
+            expected_title: The tab title to wait for.
+            tab_index: The tab index to check (default is 1).
+            timeout: Time limit (in seconds) before raising TimeoutException.
+        """
+        self.custom_wait(timeout=timeout).until(
+            lambda d: self.get_tab_title(self.get_tab(tab_index)) == expected_title
+        )
+
     @BasePage.context_chrome
     def expect_tab_sound_status(
         self, identifier: Union[str, int], status: MediaStatus

modules/page_object_error_page.py

@@ -9,16 +9,57 @@ class ErrorPage(BasePage):
     """
 
     def get_error_title(self) -> str:
+        """Get the main title text of the error page."""
         return self.get_element("error-title").get_attribute("innerText")
 
     def get_error_short_description(self) -> str:
+        """Get the short description text of the error page."""
         return self.get_element("error-short-description").get_attribute("innerText")
 
     def get_error_long_description_items(self) -> list[WebElement]:
+        """Get the list of bullet items under the long description section."""
         return self.get_elements("error-long-description-items")
 
     def get_try_again_button(self) -> WebElement:
+        """Get the 'Try Again' button element."""
         return self.get_element("try-again-button")
 
     def get_error_suggestion_link(self) -> WebElement:
+        """Get the suggestion link element."""
         return self.get_element("error-suggestion-link")
+
+    def verify_error_header(self, expected_titles: list[str], short_site: str) -> None:
+        """Verify the main title and short description on the error page.
+        Arguments:
+            expected_titles: The list of valid titles accepted for the error page.
+            short_site: The short version of the site URL (eg. "example" from "http://example")."""
+        assert self.get_error_title() in expected_titles
+        assert (
+            f"We can’t connect to the server at {short_site}"
+            in self.get_error_short_description()
+        )
+
+    def verify_error_bullets(
+        self,
+        expected_texts: list[str],
+        possible_permission_messages: list[str],
+    ) -> None:
+        """Verify bullet items under the long description section.
+        Arguments:
+            expected_texts: The list of exact text strings expected for the first two bullet items.
+            possible_permission_messages: The list of valid permission-related messages accepted for the third bullet item."""
+        items = self.get_error_long_description_items()
+        assert len(items) >= 3
+
+        for i in range(2):
+            assert items[i].text == expected_texts[i]
+        # Third must match one of the permission messages based on the chanel
+        assert items[2].text in possible_permission_messages
+
+    def click_suggestion_and_verify_redirect(self, redirect_url: str) -> "BasePage":
+        """Click the suggestion link and verify it redirects correctly.
+        Arguments:
+            redirect_url: The expected URL after clicking the suggestion link."""
+        self.get_error_suggestion_link().click()
+        self.url_contains(redirect_url)
+        return self

modules/page_object_prefs.py

@@ -430,8 +430,8 @@ def press_button_get_popup_dialog_iframe(self, button_label: str) -> WebElement:
         Returns the iframe object for the dialog panel in the popup after pressing some button that triggers a popup
         """
         # hack to know if the current iframe is the default browser one or not
-        if self.get_iframe().location['x'] > 0:
-            self.click_on('close-dialog')
+        if self.get_iframe().location["x"] > 0:
+            self.click_on("close-dialog")
         self.click_on("prefs-button", labels=[button_label])
         iframe = self.get_element("browser-popup")
         return iframe

tests/address_bar_and_search/test_server_not_found_error.py

@@ -1,7 +1,5 @@
 import pytest
 from selenium.webdriver import Firefox
-from selenium.webdriver.support import expected_conditions as EC
-from selenium.webdriver.support.wait import WebDriverWait
 
 from modules.browser_object import Navigation
 from modules.browser_object_tabbar import TabBar
@@ -15,16 +13,27 @@ def test_case():
 
 CHECK_SITE = "http://example"
 SHORT_SITE = CHECK_SITE.split("/")[-1]
+REDIRECT_URL = "https://www.example.com/"
 ERROR_TITLES = ["Hmm. We’re having trouble finding that site."]
+POSSIBLE_PERMISSION_MESSAGES = [
+    "Check that Firefox has permission to access the web (you might be connected but behind a firewall)",
+    "Check that Firefox Developer Edition has permission to access the web (you might be connected but behind a "
+    "firewall)",
+    "Check that Nightly has permission to access the web (you might be connected but behind a firewall)",
+]
+EXPECTED_TEXTS = [
+    "Try again later",
+    "Check your network connection",
+]
 
 
 def test_server_not_found_error(driver: Firefox, version: str):
     """
-    C1901393: - This tests that when a user navigates to a non-existent site, a "Server Not Found" error is
+    C3029186 - This tests that when a user navigates to a non-existent site, a "Server Not Found" error is
     displayed. The error page contains the correct elements, and the suggested link redirects to the appropriate page.
     """
 
-    # Create objects
+    # Instantiate objects
     nav = Navigation(driver)
     tabs = TabBar(driver)
     error_page = ErrorPage(driver)
@@ -33,40 +42,11 @@ def test_server_not_found_error(driver: Firefox, version: str):
     nav.search(CHECK_SITE)
 
     # Wait until the tab title updates to "Server Not Found"
-    WebDriverWait(driver, 30).until(
-        lambda d: tabs.get_tab_title(tabs.get_tab(1)) == "Server Not Found"
-    )
+    tabs.wait_for_tab_title("Server Not Found")
 
     # Verify elements on the error page
-    assert error_page.get_error_title() in ERROR_TITLES
-    assert (
-        f"We can’t connect to the server at {SHORT_SITE}"
-        in error_page.get_error_short_description()
-    )
+    error_page.verify_error_header(ERROR_TITLES, SHORT_SITE)
+    error_page.verify_error_bullets(EXPECTED_TEXTS, POSSIBLE_PERMISSION_MESSAGES)
 
-    # Define all possible valid permission messages (exact matches) for different Firefox channels
-    possible_permission_messages = [
-        "Check that Firefox has permission to access the web (you might be connected but behind a firewall)",
-        "Check that Firefox Developer Edition has permission to access the web (you might be connected but behind a "
-        "firewall)",
-        "Check that Nightly has permission to access the web (you might be connected but behind a firewall)",
-    ]
-
-    expected_texts = [
-        "Try again later",
-        "Check your network connection",
-    ]
-
-    items = error_page.get_error_long_description_items()
-    assert len(items) >= 3
-
-    # Verify that the first two bullet items exactly match the expected texts
-    for i in range(2):
-        assert items[i].text == expected_texts[i]
-
-    # Verify that the third bullet item exactly matches one of the valid permission messages
-    assert items[2].text in possible_permission_messages
-
-    # Verify that the suggested link redirects to the correct page
-    error_page.get_error_suggestion_link().click()
-    nav.expect_in_content(EC.url_contains("https://www.example.com/"))
+    # Verify the suggestion link redirects correctly
+    error_page.click_suggestion_and_verify_redirect(REDIRECT_URL)

tests/address_bar_and_search/test_server_not_found_error_pb.py

@@ -0,0 +1,53 @@
+import pytest
+from selenium.webdriver import Firefox
+
+from modules.browser_object import Navigation
+from modules.browser_object_panel_ui import PanelUi
+from modules.browser_object_tabbar import TabBar
+from modules.page_object_error_page import ErrorPage
+
+
+@pytest.fixture()
+def test_case():
+    return "3029188"
+
+
+CHECK_SITE = "http://example"
+SHORT_SITE = CHECK_SITE.split("/")[-1]
+REDIRECT_URL = "https://www.example.com/"
+ERROR_TITLES = ["Hmm. We’re having trouble finding that site."]
+POSSIBLE_PERMISSION_MESSAGES = [
+    "Check that Firefox has permission to access the web (you might be connected but behind a firewall)",
+    "Check that Firefox Developer Edition has permission to access the web (you might be connected but behind a "
+    "firewall)",
+    "Check that Nightly has permission to access the web (you might be connected but behind a firewall)",
+]
+EXPECTED_TEXTS = ["Try again later", "Check your network connection"]
+
+
+def test_server_not_found_error_on_private_window(driver: Firefox, version: str):
+    """
+    C3029188 - This tests that when a user navigates to a non-existent site in private window, a "Server Not Found"
+    error is displayed. The error page contains the correct elements, and the suggested link redirects to the
+    appropriate page.
+    """
+
+    # Instantiate objects
+    nav = Navigation(driver)
+    tabs = TabBar(driver)
+    error_page = ErrorPage(driver)
+    panel = PanelUi(driver)
+
+    # Open a new private window and navigate to the desired site
+    panel.open_and_switch_to_new_window("private")
+    nav.search(CHECK_SITE)
+
+    # Wait until the tab title updates to "Server Not Found"
+    tabs.wait_for_tab_title("Server Not Found")
+
+    # Verify elements on the error page
+    error_page.verify_error_header(ERROR_TITLES, SHORT_SITE)
+    error_page.verify_error_bullets(EXPECTED_TEXTS, POSSIBLE_PERMISSION_MESSAGES)
+
+    # Verify the suggestion link redirects correctly
+    error_page.click_suggestion_and_verify_redirect(REDIRECT_URL)

tests/preferences/test_clear_cookie_data.py

@@ -14,9 +14,8 @@ def test_case():
 WEBSITE_ADDRESS = "https://www.wikipedia.com"
 # WIN_GHA = environ.get("GITHUB_ACTIONS") == "true" and sys.platform.startswith("win")
 
-def _open_clear_cookies_data_dialog(
-    about_prefs: AboutPrefs, ba: BrowserActions
-):
+
+def _open_clear_cookies_data_dialog(about_prefs: AboutPrefs, ba: BrowserActions):
     """
     Open about:preferences#privacy, show the 'Clear Data' dialog, switch into its iframe,
     wait for its option container to be present, read the value, then switch back.