stabilize autofill tests (#837)

* stabilize autofill tests

* add selectors

* Anca/ Stabilization on allow audio-video (#834)

* Stabilization on allow audio-video

* Remove unused imports

* Skip test on Win with a clear reason

* Hani/ Refactor tabs batch 2 (#824)

* Refactor tabs batch 2

* Skip a test

* fix test open new via hyperlink

* replace more-information with learn-more

---------

Co-authored-by: Hani Yacoub <[email protected]>

* Update example.com hyperlink (#835)

Fixes several tests that access the example.com page hyperlink

* Vs/Add tests for seach modes persistance with @bing  (#838)

* stabilize autofill tests

* add selectors

* Tracy/ Skip new failing tests (#839)

* stabilize autofill tests

* add selectors

* modify one selector

* check running version is actually correct

* attempt to force CI machine to see payment/address buttons in prefs

* get loc of installed win fx

* just test the version for now

* test quotes for exec

* test quotes for exec

* test win path again

* test win path again

* test win path again

* test win path again

* test win path again

* test win path again

* add log to see binary location

* see full capabilities object

* see full capabilities object

* remove lines

* test win path again, sleep

* test win path again, sleep

* test win path again

* test win path again

* test win path again

* try to force a write of fx location

* try to force a write of fx location

* attempt to disable Se driver mgmt

* attempt to disable Se driver mgmt

* attempt to disable Se driver mgmt

* attempt to run again

* remove debug

* remove debug

---------

Co-authored-by: soncuteanca <[email protected]>
Co-authored-by: Hani Yacoub <[email protected]>
Co-authored-by: Hani Yacoub <[email protected]>
Co-authored-by: Tracy <[email protected]>
Co-authored-by: vsangereanMOZ <[email protected]>
Co-authored-by: Philimon Derib Ayalew <[email protected]>

Author: 7 people

.github/workflows/smoke.yml

@@ -107,7 +107,7 @@ jobs:
           $env:FX_EXECUTABLE = "C:\Program Files\Custom Firefox\firefox.exe"
           Start-Process -FilePath $env:FX_EXECUTABLE -ArgumentList "--version" -Wait -NoNewWindow
           pipenv run python choose_ci_set.py
-          pipenv run pytest $(cat selected_tests)
+          pipenv run pytest --geckodriver geckodriver.exe $(cat selected_tests)
           $env:TEST_EXIT_CODE = $LASTEXITCODE
           mv artifacts artifacts-win || true
           exit $env:TEST_EXIT_CODE
@@ -120,7 +120,7 @@ jobs:
           mv ./ci_pyproject_headed.toml ./pyproject.toml;
           $env:FX_EXECUTABLE = "C:\Program Files\Custom Firefox\firefox.exe"
           pipenv run python choose_ci_set.py
-          pipenv run pytest $(cat selected_tests)
+          pipenv run pytest --geckodriver geckodriver.exe $(cat selected_tests)
           $env:TEST_EXIT_CODE = $LASTEXITCODE
           rm artifacts/assets -r -Force
           Get-ChildItem -Path "artifacts" | ForEach-Object {

SELECTOR_INFO.md

@@ -495,14 +495,14 @@ Path to .json: modules/data/about_prefs.components.json
 ```
 ```
 Selector Name: save-and-fill-addresses
-Selector Data: "checkbox[label='Save and fill addresses']"
+Selector Data: "[data-l10n-id='autofill-addresses-checkbox-message']"
 Description: Label for Autofill > Save and fill addresses option
 Location: about:preferences#privacy
 Path to .json: modules/data/about_prefs.components.json
 ```
 ```
 Selector Name: save-and-fill-payment-methods
-Selector Data: "checkbox[label='Save and fill payment methods']"
+Selector Data: "[data-l10n-id='autofill-payment-methods-checkbox-message-2']"
 Description: Label for Autofill > Save and fill payment methods option
 Location: about:preferences#privacy
 Path to .json: modules/data/about_prefs.components.json
@@ -515,6 +515,20 @@ Location: about:preferences#privacy
 Path to .json: modules/data/about_prefs.components.json
 ```
 ```
+Selector Name: saved-payments-button
+Selector Data: "[data-l10n-id='autofill-payment-methods-manage-payments-button']"
+Description: Embedded button/label for "Manage Saved Payments"
+Location: about:preferences#privacy
+Path to .json: modules/data/about_prefs.components.json
+```
+```
+Selector Name: saved-addresses-button
+Selector Data: "[data-l10n-id='autofill-addresses-manage-addresses-button']"
+Description: Embedded button/label for "Manage Addresses and more..."
+Location: about:preferences#privacy
+Path to .json: modules/data/about_prefs.components.json
+```
+```
 Selector Name: import-browser-data
 Selector Data: "button[id='data-migration']"
 Description: Import Browser Data > Import Data button
@@ -845,7 +859,7 @@ Path to .json: modules/data/about_prefs.components.json
 ```
 ```
 Selector Name: cookies-privacy-label
-Selector Data: "description[data-l10n-id='sitedata-delete-on-close-private-browsing2']"
+Selector Data: "[data-l10n-id='sitedata-delete-on-close-private-browsing3']"
 Description: Message in Cookies and Site data when History is not remembered
 Location: about:preferences#privacy
 Path to .json: modules/data/about_prefs.components.json

conftest.py

@@ -8,12 +8,14 @@
 from subprocess import check_output, run
 from typing import Callable, List, Tuple, Union
 
+# import psutil
 import pytest
 from PIL import Image, ImageGrab
 from selenium.common.exceptions import TimeoutException, WebDriverException
 from selenium.webdriver import Firefox
 from selenium.webdriver.common.by import By
 from selenium.webdriver.firefox.options import Options
+from selenium.webdriver.firefox.service import Service
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import WebDriverWait
 
@@ -132,6 +134,13 @@ def pytest_addoption(parser):
         help="Path to Fx executable. Will overwrite --fx-channel.",
     )
 
+    parser.addoption(
+        "--geckodriver",
+        action="store",
+        default="",
+        help="Path to geckodriver.",
+    )
+
     parser.addoption(
         "--run-headless",
         action="store_true",
@@ -216,12 +225,17 @@ def sys_platform():
     return platform.system()
 
 
+@pytest.fixture(scope="session")
+def geckodriver(request):
+    return request.config.getoption("--geckodriver")
+
+
 @pytest.fixture()
 def downloads_folder(sys_platform):
     """Return the downloads folder location for this OS"""
     if sys_platform == "Windows":
         user = os.environ.get("USERNAME")
-        return f"C:\\Users\\{user}\\Downloads"
+        return rf"C:\Users\{user}\Downloads"
     elif sys_platform == "Darwin":  # MacOS
         user = os.environ.get("USER")
         return f"/Users/{user}/Downloads"
@@ -242,11 +256,11 @@ def fx_executable(request, sys_platform):
     location = ""
     if sys_platform == "Windows":
         if version == "Firefox":
-            location = "C:\\Program Files\\Mozilla Firefox\\firefox.exe"
+            location = r"C:\Program Files\Mozilla Firefox\firefox.exe"
         elif version == "Nightly":
-            location = "C:\\Program Files\\Firefox Nightly\\firefox.exe"
+            location = r"C:\Program Files\Firefox Nightly\firefox.exe"
         elif version == "Custom":
-            location = "C:\\Program Files\\Custom Firefox\\firefox.exe"
+            location = r"C:\Program Files\Custom Firefox\firefox.exe"
     elif sys_platform == "Darwin":
         if version == "Firefox":
             location = "/Applications/Firefox.app/Contents/MacOS/firefox"
@@ -392,6 +406,7 @@ def hard_quit():
 @pytest.fixture(autouse=True)
 def driver(
     fx_executable: str,
+    geckodriver: str,
     opt_headless: bool,
     opt_implicit_timeout: int,
     prefs_list: List[Tuple],
@@ -457,7 +472,15 @@ def driver(
             options.profile = profile_path
         for opt, value in prefs_list:
             options.set_preference(opt, value)
-        driver = Firefox(options=options)
+        if geckodriver:
+            service = Service(executable_path=geckodriver)
+            driver = Firefox(service=service, options=options)
+        else:
+            driver = Firefox(options=options)
+        # Uncomment below to find Fx process info
+        # for proc in psutil.process_iter(["name", "exe", "cmdline"]):
+        #    if proc.info["name"] and "firefox" in proc.info["name"].lower():
+        #        print(proc.info)
         separator = "x"
         if separator not in opt_window_size:
             if "by" in opt_window_size:

modules/data/about_prefs.components.json

@@ -45,12 +45,12 @@
     "groups": []
   },
   "save-and-fill-addresses": {
-    "selectorData": "checkbox[label='Save and fill addresses']",
+    "selectorData": "[data-l10n-id='autofill-addresses-checkbox-message']",
     "strategy": "css",
     "groups": []
   },
   "save-and-fill-payment-methods": {
-    "selectorData": "checkbox[label='Save and fill payment methods']",
+    "selectorData": "[data-l10n-id='autofill-payment-methods-checkbox-message-2']",
     "strategy": "css",
     "groups": []
   },
@@ -59,6 +59,16 @@
     "strategy": "css",
     "groups": []
   },
+  "saved-payments-button": {
+    "selectorData": "[data-l10n-id='autofill-payment-methods-manage-payments-button']",
+    "strategy": "css",
+    "groups": []
+  },
+  "saved-addresses-button": {
+    "selectorData": "[data-l10n-id='autofill-addresses-manage-addresses-button']",
+    "strategy": "css",
+    "groups": []
+  },
   "import-browser-data": {
     "selectorData": "button[id='data-migration']",
     "strategy": "css",
@@ -307,7 +317,7 @@
     "groups": []
   },
   "cookies-privacy-label": {
-    "selectorData": "description[data-l10n-id='sitedata-delete-on-close-private-browsing2']",
+    "selectorData": "[data-l10n-id='sitedata-delete-on-close-private-browsing3']",
     "strategy": "css",
     "groups": []
   },

modules/page_object_prefs.py

@@ -204,12 +204,6 @@ def verify_cc_edit_saved_payments_profile(
                 assert field_value != expected_cvv, "CVV is displayed."
         return self
 
-    def get_saved_payments_popup(self) -> WebElement:
-        """
-        Open saved payments dialog panel
-        """
-        return self.get_element("prefs-button", labels=["Saved payment methods"])
-
     def click_edit_on_dialog_element(self):
         """
         Click on edit button on dialog panel
@@ -283,7 +277,11 @@ def add_entry_to_saved_payments(self, cc_data: CreditCardBase):
     def close_dialog_box(self):
         """Close dialog box for saved addresses or payments."""
         self.element_clickable("panel-popup-button", labels=["close-button"])
-        self.get_element("panel-popup-button", labels=["close-button"]).click()
+        self.click_on("panel-popup-button", labels=["close-button"])
+        if self.get_element(
+            "panel-popup-button", labels=["close-button"]
+        ).is_displayed():
+            self.click_on("panel-popup-button", labels=["close-button"])
         return self
 
     def update_cc_field_panel(self, field_name: str, value: str | int) -> BasePage:
@@ -317,12 +315,6 @@ def update_cc_field_panel(self, field_name: str, value: str | int) -> BasePage:
         self.get_element("save-button").click()
         return self
 
-    def get_saved_addresses_popup(self) -> WebElement:
-        """
-        Returns saved addresses button element
-        """
-        return self.get_element("prefs-button", labels=["Saved addresses"])
-
     def open_and_switch_to_saved_addresses_popup(self) -> BasePage:
         """
         Open and Switch to saved addresses popup frame.
@@ -420,7 +412,8 @@ def get_saved_payments_popup_iframe(self) -> WebElement:
         """
         Returns the iframe object for the dialog panel in the popup
         """
-        self.get_saved_payments_popup().click()
+        self.find_in_settings("pay")
+        self.click_on("saved-payments-button")
         iframe = self.get_element("browser-popup")
         return iframe
 
@@ -444,7 +437,8 @@ def get_saved_addresses_popup_iframe(self) -> WebElement:
         """
         Returns the iframe object for the dialog panel in the popup
         """
-        self.get_saved_addresses_popup().click()
+        self.find_in_settings("pay")
+        self.click_on("saved-addresses-button")
         iframe = self.get_element("browser-popup")
         return iframe
 

tests/form_autofill/conftest.py

@@ -19,6 +19,8 @@ def prefs_list(add_to_prefs_list: dict):
     prefs = [
         ("extensions.formautofill.creditCards.reauth.optout", False),
         ("extensions.formautofill.reauth.enabled", False),
+        ("extensions.formautofill.addresses.enabled", True),
+        ("extensions.formautofill.creditCards.enabled", True),
     ]
     prefs.extend(add_to_prefs_list)
     return prefs

tests/meta/test_version.py

@@ -1,12 +1,19 @@
+import json
 import logging
 from subprocess import check_output
 
 
-def test_version(opt_ci, fx_executable):
+def test_version(driver, opt_ci, fx_executable):
     """Get the Fx version"""
 
     version = check_output([fx_executable, "--version"]).decode()
+    assert driver.capabilities["browserVersion"] in version
     logging.info(version)
+    logging.warning(f"Fx version {driver.capabilities}")
+    driver.get("chrome://browser/content/aboutDialog.xhtml")
+    ver_label = driver.find_element("id", "version")
+    ver_info = json.loads(ver_label.get_attribute("data-l10n-args"))
+    assert ver_info.get("version") in version
     if opt_ci:
         with open("artifacts/fx_version", "w") as fh:
             fh.write(version)

tests/security_and_privacy/test_never_remember_browsing_history.py

@@ -38,7 +38,7 @@ def test_never_remember_browsing_history_settings(driver: Firefox):
 
     # perform all about:preferences#privacy assertions according to testrail
     cookies_label = about_prefs.get_element("cookies-privacy-label")
-    assert cookies_label.get_attribute("innerHTML") == COOKIE_LABEL_TEXT
+    assert cookies_label.get_attribute("message") == COOKIE_LABEL_TEXT
 
     delete_cookies_checkbox = about_prefs.get_element("cookies-delete-on-close")
     assert delete_cookies_checkbox.get_attribute("checked") == "true"