Merge branch 'main' into philimon/autofill_refactor_#2

philimon-reset · philimon-reset · commit b70d6f69e75f · 2025-04-10T22:52:50.000+02:00
diff --git a/.cron.yml b/.cron.yml
@@ -1,43 +1,41 @@
 ---
-
 jobs:
   - name: new-beta-qa
     job:
       type: decision-task
       treeherder-symbol: STARb
       target-tasks-method: new_beta_qa
     when:
-      - {hour: 0, minute: 15}
-      - {hour: 1, minute: 15}
-      - {hour: 2, minute: 15}
-      - {hour: 3, minute: 15}
-      - {hour: 4, minute: 15}
-      - {hour: 5, minute: 15}
-      - {hour: 6, minute: 15}
-      - {hour: 7, minute: 15}
-      - {hour: 8, minute: 15}
-      - {hour: 9, minute: 15}
-      - {hour: 10, minute: 15}
-      - {hour: 11, minute: 15}
-      - {hour: 12, minute: 15}
-      - {hour: 13, minute: 45}
-      - {hour: 14, minute: 15}
-      - {hour: 15, minute: 15}
-      - {hour: 16, minute: 15}
-      - {hour: 17, minute: 15}
-      - {hour: 18, minute: 15}
-      - {hour: 19, minute: 15}
-      - {hour: 20, minute: 15}
-      - {hour: 21, minute: 15}
-      - {hour: 22, minute: 15}
-      - {hour: 23, minute: 15}
+      - { hour: 0, minute: 15 }
+      - { hour: 1, minute: 15 }
+      - { hour: 2, minute: 15 }
+      - { hour: 3, minute: 15 }
+      - { hour: 4, minute: 15 }
+      - { hour: 5, minute: 15 }
+      - { hour: 6, minute: 15 }
+      - { hour: 7, minute: 15 }
+      - { hour: 8, minute: 15 }
+      - { hour: 9, minute: 15 }
+      - { hour: 10, minute: 15 }
+      - { hour: 11, minute: 15 }
+      - { hour: 12, minute: 15 }
+      - { hour: 13, minute: 15 }
+      - { hour: 14, minute: 15 }
+      - { hour: 15, minute: 15 }
+      - { hour: 16, minute: 15 }
+      - { hour: 17, minute: 15 }
+      - { hour: 18, minute: 15 }
+      - { hour: 19, minute: 15 }
+      - { hour: 20, minute: 15 }
+      - { hour: 21, minute: 15 }
+      - { hour: 22, minute: 15 }
+      - { hour: 23, minute: 15 }
 
   - name: new-devedition-qa
     job:
       type: decision-task
       treeherder-symbol: STARd
       target-tasks-method: new_devedition_qa
     when:
-      - {hour: 11, minute: 15}
-      - {hour: 19, minute: 30}
-      - {hour: 23, minute: 15}
+      - { hour: 11, minute: 15 }
+      - { hour: 23, minute: 15 }
diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml
@@ -187,7 +187,6 @@ jobs:
     needs:
       - Smoke-Windows
       - Smoke-MacOS
-    if: ${{ always() && github.event_name == 'pull_request' }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
diff --git a/ci_pyproject.toml b/ci_pyproject.toml
@@ -16,7 +16,7 @@ markers = [
 testpaths = [
     "tests"
 ]
-addopts = "-vs --ci --run-headless --json-report --reruns 3 --reruns-delay 3 -m 'not incident and not unstable and not headed' --html=artifacts/report.html"
+addopts = "-vs --ci --run-headless --json-report --json-report-file artifacts/report.json --reruns 3 --reruns-delay 3 -m 'not incident and not unstable and not headed' --html=artifacts/report.html"
 
 [tool.ruff]
 target-version = "py310"
diff --git a/ci_pyproject_headed.toml b/ci_pyproject_headed.toml
@@ -16,7 +16,7 @@ markers = [
 testpaths = [
     "tests"
 ]
-addopts = "-vs --ci --json-report --reruns 3 --reruns-delay 2 -m 'not incident and not unstable and headed' --html=artifacts/report_headed.html"
+addopts = "-vs --ci --json-report --json-report-file artifacts/report_headed.json --reruns 3 --reruns-delay 2 -m 'not incident and not unstable and headed' --html=artifacts/report_headed.html"
 
 [tool.ruff]
 target-version = "py310"
diff --git a/l10n_CM/Unified/test_demo_cc_2_preview.py b/l10n_CM/Unified/test_demo_cc_2_preview.py
@@ -3,7 +3,7 @@
 
 from modules.browser_object_autofill_popup import AutofillPopup
 from modules.page_object import AboutPrefs, CreditCardFill
-from modules.util import BrowserActions, Utilities
+from modules.util import Utilities
 
 
 @pytest.fixture()
diff --git a/l10n_CM/Unified/test_demo_cc_3_autofill.py b/l10n_CM/Unified/test_demo_cc_3_autofill.py
@@ -2,7 +2,7 @@
 from selenium.webdriver import Firefox
 
 from modules.browser_object_autofill_popup import AutofillPopup
-from modules.page_object import AboutPrefs, CreditCardFill
+from modules.page_object import CreditCardFill
 from modules.util import Utilities
 
 
diff --git a/modules/data/generic_pdf.components.json b/modules/data/generic_pdf.components.json
@@ -152,7 +152,7 @@
     },
 
     "added-goomy-image": {
-        "selectorData": "canvas[aria-label='goomy.png']",
+        "selectorData": "[data-l10n-id='pdfjs-editor-stamp-editor'][aria-description='goomy.png']",
         "strategy": "css",
         "groups": []
     }
diff --git a/modules/page_object_about_pages.py b/modules/page_object_about_pages.py
@@ -1,7 +1,6 @@
 import logging
 import os
 import re
-import sys
 
 from pypom import Page
 from selenium.common.exceptions import (
@@ -179,15 +178,8 @@ def check_logins_present(
         else:
             assert expected_logins == actual_logins
 
-    def get_downloads_dir(self) -> str:
-        # Return full path to Documents directory
-        home = os.path.expanduser("~")
-        export_dir = os.path.join(home, "Downloads")
-        return export_dir
-
-    def remove_password_csv(self):
+    def remove_password_csv(self, downloads_dir):
         # Delete password.csv, if there is one in the export location
-        downloads_dir = self.get_downloads_dir()
         passwords_csv = os.path.join(downloads_dir, "passwords.csv")
         for file in os.listdir(downloads_dir):
             delete_files_regex = re.compile(r"\bpasswords.csv\b")
diff --git a/modules/page_object_generics.py b/modules/page_object_generics.py
@@ -15,6 +15,23 @@ class GenericPage(BasePage):
 
     URL_TEMPLATE = "{url}"
 
+    def navigate_dialog_to_location(self, location: str) -> BasePage:
+        sleep(1.5)
+        from pynput.keyboard import Controller, Key
+
+        keyboard = Controller()
+        if self.sys_platform() == "Darwin" or self.sys_platform() == "Linux":
+            keyboard.type("/")
+            sleep(1.5)
+            keyboard.type(location.lstrip("/"))
+        else:
+            sleep(1.5)
+            keyboard.type(location)
+        sleep(1)
+        keyboard.press(Key.enter)
+        sleep(1)
+        keyboard.press(Key.enter)
+
 
 class GenericPdf(BasePage):
     """
diff --git a/modules/testrail.py b/modules/testrail.py
@@ -173,7 +173,7 @@ def update_test_case(self, case_id, **kwargs):
         """Given a test case id, update according to keyword args"""
         if not kwargs:
             return None
-        return self.client.send_post(f"update_case/{case_id}", **kwargs)
+        return self.client.send_post(f"update_case/{case_id}", kwargs)
 
     def create_test_run_on_plan_entry(
         self, plan_id, entry_id, config_ids, description=None, case_ids=None
diff --git a/modules/util.py b/modules/util.py
@@ -24,7 +24,6 @@
 from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.remote.shadowroot import ShadowRoot
 from selenium.webdriver.remote.webelement import WebElement
-from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.wait import WebDriverWait
 
 from modules.classes.autofill_base import AutofillAddressBase
@@ -225,7 +224,7 @@ def create_localized_faker(self, country_code: str):
             faker.add_provider(internet)
             faker.add_provider(misc)
             return faker, True
-        except AttributeError as e:
+        except AttributeError:
             logging.error(
                 f"Invalid locale `{locale}`. Faker instance could not be created."
             )
diff --git a/tests/form_autofill/test_enable_disable_autofill.py b/tests/form_autofill/test_enable_disable_autofill.py
@@ -1,7 +1,6 @@
 import pytest
 from selenium.webdriver import Firefox
 
-from modules.browser_object import Navigation
 from modules.browser_object_autofill_popup import AutofillPopup
 from modules.page_object import AboutPrefs
 from modules.page_object_autofill import AddressFill
diff --git a/tests/password_manager/test_password_csv_correctness.py b/tests/password_manager/test_password_csv_correctness.py
@@ -4,9 +4,8 @@
 import time
 
 import pytest
-from pynput.keyboard import Controller, Key
 
-from modules.page_object import AboutLogins
+from modules.page_object import AboutLogins, GenericPage
 
 
 @pytest.fixture()
@@ -24,10 +23,10 @@ def test_password_csv_correctness(
     # Initializing objects
     (driver, usernames, logins) = driver_and_saved_logins
     about_logins = AboutLogins(driver)
-    keyboard = Controller()
+    page = GenericPage(driver)
 
     # Ensure the export target folder doesn't contain a passwords.csv file
-    about_logins.remove_password_csv()
+    about_logins.remove_password_csv(downloads_folder)
 
     # Click on buttons to export passwords
     about_logins.open()
@@ -36,8 +35,8 @@ def test_password_csv_correctness(
     about_logins.click_on("continue-export-button")
 
     # Export the password file
-    time.sleep(5)
-    keyboard.tap(Key.enter)
+    time.sleep(3)
+    page.navigate_dialog_to_location(downloads_folder)
 
     # Verify the exported csv file is present in the target folder
     csv_file = os.path.join(downloads_folder, "passwords.csv")
@@ -62,4 +61,4 @@ def test_password_csv_correctness(
     about_logins.check_logins_present(actual_logins, logins)
 
     # Delete the password.csv created
-    about_logins.remove_password_csv()
+    about_logins.remove_password_csv(downloads_folder)
diff --git a/tests/password_manager/test_password_csv_export.py b/tests/password_manager/test_password_csv_export.py
@@ -4,7 +4,7 @@
 import pytest
 from pynput.keyboard import Controller, Key
 
-from modules.page_object import AboutLogins
+from modules.page_object import AboutLogins, GenericPage
 
 
 @pytest.fixture()
@@ -22,10 +22,11 @@ def test_password_csv_export(
     # Initializing objects
     (driver, usernames, logins) = driver_and_saved_logins
     about_logins = AboutLogins(driver)
+    page = GenericPage(driver)
     keyboard = Controller()
 
     # Ensure the export target folder doesn't contain a passwords.csv file
-    about_logins.remove_password_csv()
+    about_logins.remove_password_csv(downloads_folder)
 
     # Click on buttons to export passwords
     about_logins.open()
@@ -34,12 +35,14 @@ def test_password_csv_export(
     about_logins.click_on("continue-export-button")
 
     # Export the password file
-    time.sleep(5)
+    time.sleep(3)
+    page.navigate_dialog_to_location(downloads_folder)
+
     keyboard.tap(Key.enter)
 
     # Verify the exported csv file is present in the target folder
     csv_file = os.path.join(downloads_folder, "passwords.csv")
     about_logins.wait.until(lambda _: os.path.exists(csv_file))
 
     # Delete the password.csv created
-    about_logins.remove_password_csv()
+    about_logins.remove_password_csv(downloads_folder)
diff --git a/tests/pdf_viewer/test_download_triggered_on_content_disposition_attachment.py b/tests/pdf_viewer/test_download_triggered_on_content_disposition_attachment.py
@@ -4,7 +4,7 @@
 from selenium.webdriver import Firefox
 
 from modules.browser_object import Navigation, TabBar
-from modules.page_object import AboutPrefs, GenericPdf
+from modules.page_object import AboutPrefs
 from modules.util import BrowserActions
 
 

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ markers = [`
`16`	`16`	`testpaths = [`
`17`	`17`	`"tests"`
`18`	`18`	`]`
`19`		`-addopts = "-vs --ci --run-headless --json-report --reruns 3 --reruns-delay 3 -m 'not incident and not unstable and not headed' --html=artifacts/report.html"`
	`19`	`+addopts = "-vs --ci --run-headless --json-report --json-report-file artifacts/report.json --reruns 3 --reruns-delay 3 -m 'not incident and not unstable and not headed' --html=artifacts/report.html"`
`20`	`20`
`21`	`21`	`[tool.ruff]`
`22`	`22`	`target-version = "py310"`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@`
`152`	`152`	`},`
`153`	`153`
`154`	`154`	`"added-goomy-image": {`
`155`		`- "selectorData": "canvas[aria-label='goomy.png']",`
	`155`	`+ "selectorData": "[data-l10n-id='pdfjs-editor-stamp-editor'][aria-description='goomy.png']",`
`156`	`156`	`"strategy": "css",`
`157`	`157`	`"groups": []`
`158`	`158`	`}`