Add refactored test 1756722

Author: soncuteanca

modules/browser_object_navigation.py

@@ -1,7 +1,8 @@
 import logging
+import re
 from typing import Literal
 
-from selenium.common.exceptions import TimeoutException
+from selenium.common.exceptions import StaleElementReferenceException, TimeoutException
 from selenium.webdriver import ActionChains, Firefox
 from selenium.webdriver.common.by import By
 from selenium.webdriver.common.keys import Keys
@@ -290,27 +291,40 @@ def click_file_download_warning_panel(self) -> BasePage:
         self.click_on("file-download-warning-button")
         return self
 
-    def wait_for_item_to_download(self, filename: str) -> BasePage:
+    @BasePage.context_chrome
+    def wait_for_download_elements(self) -> BasePage:
         """
-        Check the downloads tool in the toolbar to wait for a given file to download
+        Wait for download elements to be present.
         """
-        original_timeout = self.driver.timeouts.implicit_wait
-        try:
-            # Whatever our timeout, we want to lengthen it because downloads
-            self.driver.implicitly_wait(original_timeout * 2)
-            self.element_visible("downloads-item-by-file", labels=[filename])
-            self.expect_not(
-                EC.element_attribute_to_include(
-                    self.get_selector("downloads-button"), "animate"
-                )
-            )
-            with self.driver.context(self.context_id):
-                self.driver.execute_script(
-                    "arguments[0].setAttribute('hidden', true)",
-                    self.get_element("downloads-button"),
-                )
-        finally:
-            self.driver.implicitly_wait(original_timeout)
+        self.element_visible("download-target-element")
+        return self
+
+    @BasePage.context_chrome
+    def verify_download_name(self, expected_pattern: str) -> BasePage:
+        """
+        Verify download name matches expected pattern.
+        Argument:
+            expected_pattern: Regex pattern to match against download name
+        """
+        download_name = self.get_element("download-target-element")
+        download_value = download_name.get_attribute("value")
+        assert re.match(expected_pattern, download_value), (
+            f"The download name is incorrect: {download_value}"
+        )
+        return self
+
+    @BasePage.context_chrome
+    def wait_for_download_completion(self) -> BasePage:
+        """Wait until the most recent download reaches 100% progress."""
+
+        def _download_complete(_):
+            try:
+                element = self.get_element("download-progress-element")
+                return element.get_attribute("value") == "100"
+            except StaleElementReferenceException:
+                return False
+
+        self.wait.until(_download_complete)
         return self
 
     @BasePage.context_chrome

modules/data/navigation.components.json

@@ -405,6 +405,24 @@
         "groups": []
     },
 
+    "download-target-element": {
+        "selectorData": "downloadTarget",
+        "strategy": "class",
+        "groups": []
+    },
+
+    "download-progress-element": {
+        "selectorData": "downloadProgress",
+        "strategy": "class",
+        "groups": []
+    },
+
+    "download-details-element": {
+        "selectorData": "downloadDetailsNormal",
+        "strategy": "class",
+        "groups": []
+    },
+
     "bookmark-in-bar": {
         "selectorData": "toolbarbutton.bookmark-item",
         "strategy": "css",

tests/downloads/test_mixed_content_download_via_https.py

@@ -1,13 +1,7 @@
-import re
-from time import sleep
-
 import pytest
-from selenium.common.exceptions import StaleElementReferenceException
 from selenium.webdriver import Firefox
-from selenium.webdriver.common.by import By
-from selenium.webdriver.support import expected_conditions as EC
-from selenium.webdriver.support.wait import WebDriverWait
 
+from modules.browser_object import Navigation
 from modules.page_object import GenericPage
 
 
@@ -31,42 +25,19 @@ def test_mixed_content_download_via_https(driver: Firefox, delete_files):
     """
     C1756722: Verify that the user can download mixed content via HTTPS
     """
-
+    # Initialize objects
     web_page = GenericPage(driver, url=MIXED_CONTENT_DOWNLOAD_URL)
+    nav = Navigation(driver)
 
-    # Wait up to 30 seconds for test website to wake up and download the content
+    # Wait for the test website to wake up and download the content
     web_page.open()
-    with driver.context(driver.CONTEXT_CHROME):
-        WebDriverWait(driver, 30).until(EC.title_contains("File Examples"))
-
-    with driver.context(driver.CONTEXT_CHROME):
-        download_name = WebDriverWait(driver, 10).until(
-            EC.presence_of_element_located((By.CLASS_NAME, "downloadTarget"))
-        )
-
-        download_status = WebDriverWait(driver, 10).until(
-            EC.presence_of_element_located((By.CLASS_NAME, "downloadProgress"))
-        )
+    web_page.wait.until(lambda _: web_page.title_contains("File Examples"))
 
-        # Verify that the desired download target element is present directly, no extra steps needed.
-        download_value = download_name.get_attribute("value")
-        assert re.match(r"file-sample_100kB(\(\d+\)).odt$", download_value), (
-            f"The download name is incorrect: {download_value}"
-        )
+    # Wait for download elements to appear
+    nav.wait_for_download_elements()
 
-        # Verify that the download progress has reached 100%, which indicates that the download is complete.
-        i = 1
-        while True:
-            try:
-                download_value = download_status.get_attribute("value")
-                if download_value == "100":
-                    break
-            except StaleElementReferenceException:
-                pass
+    # Verify download name matches expected pattern
+    nav.verify_download_name(r"file-sample_100kB(\(\d+\))?.odt$")
 
-            if i > MAX_CHECKS:
-                raise TimeoutError(
-                    "Download progress did not reach 100% within reasonable time."
-                )
-            sleep(1)
-            i = +1
+    # Wait for download completion
+    nav.wait_for_download_completion()