Merge pull request #613 from mozilla/philimon/fix_fingerprint_test

Philimon/Fix_edit_cc_profile_and_fingerprinter_tests

Author: philimon-reset

.github/workflows/l10n.yml

@@ -3,7 +3,6 @@ name: L10N Test Execution
 
 run-name: ${{ github.actor }} is running l10n tests
 on:
-  pull_request:
   workflow_call:
     inputs:
       channel:
@@ -30,7 +29,7 @@ env:
 
 jobs:
   L10N-MacOS:
-    if: ${{ inputs.job_to_run == 'L10N-MacOS' || github.event_name == 'pull_request' || inputs.mac_installer_link }}
+    if: ${{ inputs.job_to_run == 'L10N-MacOS' || inputs.mac_installer_link }}
     runs-on: macos-latest
     steps:
       - name: Create app token

SELECTOR_INFO.md

@@ -662,6 +662,13 @@ Location: about:preferences#privacy
 Path to .json: modules/data/about_prefs.components.json
 ```
 ```
+Selector Name: custom-tracker-options-parent
+Selector Data: "contentBlockingOptionCustom"
+Description: Parent Element in custom tracker blocking checkboxes
+Location: about:preferences#privacy
+Path to .json: modules/data/about_prefs.components.json
+```
+```
 Selector Name: cookies-checkbox
 Selector Data: "contentBlockingBlockCookiesCheckbox"
 Description: In Enhanced Tracking Protection, the check-box for Cookies

modules/data/about_prefs.components.json

@@ -13,6 +13,11 @@
       "searchEngineDropdown"
     ]
   },
+  "custom-tracker-options-parent": {
+    "selectorData": "contentBlockingOptionCustom",
+    "strategy": "id",
+    "groups": []
+  },
   "search-engine-dropmarker": {
     "selectorData": "dropmarker",
     "strategy": "tag",

modules/page_object_prefs.py

@@ -1,3 +1,5 @@
+import datetime
+import logging
 import re
 from time import sleep
 from typing import List
@@ -118,6 +120,19 @@ def select_content_and_action(self, content_type: str, action: str) -> BasePage:
         self.wait.until(lambda _: el.get_attribute("label") == action)
         return self
 
+    def select_trackers_to_block(self, *options):
+        """Select the trackers to block in the about:preferences page. Unchecks all first."""
+        self.click_on("custom-radio")
+        checkboxes = self.get_element("custom-tracker-options-parent").find_elements(
+            By.TAG_NAME, "checkbox"
+        )
+        for checkbox in checkboxes:
+            if checkbox.is_selected():
+                checkbox.click()
+        for option in options:
+            self.click_on(option)
+        return self
+
     def get_history_menulist(self) -> WebElement:
         """
         Gets the web element for the list of history items that appear in about:preferences
@@ -289,9 +304,16 @@ def update_cc_field_panel(self, field_name: str, value: str | int) -> BasePage:
             )
         self.switch_to_edit_saved_payments_popup_iframe()
         value_field = self.find_element(By.ID, fields[field_name])
-        if value_field.tag_name != "select":
+        if value.isdigit():
+            value = int(value)
+        if field_name == "expiration_year":
+            value -= (datetime.datetime.now().year % 100) + 1
+
+        if value_field.tag_name == "select":
+            Select(value_field).select_by_index(value)
+        else:
             value_field.clear()
-        value_field.send_keys(value)
+            value_field.send_keys(value)
         self.get_element("save-button").click()
         return self
 

tests/security_and_privacy/conftest.py

@@ -1,5 +1,8 @@
 import pytest
 
+from modules.browser_object_navigation import Navigation
+from modules.page_object_prefs import AboutPrefs
+
 
 @pytest.fixture()
 def suite_id():
@@ -17,3 +20,13 @@ def prefs_list(add_to_prefs_list: dict):
 @pytest.fixture()
 def add_to_prefs_list():
     return []
+
+
+@pytest.fixture()
+def nav(driver):
+    return Navigation(driver)
+
+
+@pytest.fixture()
+def about_prefs_privacy(driver):
+    return AboutPrefs(driver, category="privacy")

tests/security_and_privacy/test_blocking_fingerprinters.py

@@ -2,6 +2,8 @@
 from selenium.webdriver import Firefox
 
 from modules.browser_object_navigation import Navigation
+from modules.browser_object_tracker_panel import TrackerPanel
+from modules.page_object_generics import GenericPage
 from modules.page_object_prefs import AboutPrefs
 
 
@@ -15,25 +17,25 @@ def test_case():
 )
 
 
-def test_blocking_fingerprinter(driver: Firefox):
+def test_blocking_fingerprinter(
+    driver: Firefox, nav: Navigation, about_prefs_privacy: AboutPrefs
+):
     """
     C446404: Blocking Fingerprinters
     """
     # instantiate objects
-    nav = Navigation(driver)
-    about_prefs = AboutPrefs(driver, category="privacy")
-    about_prefs.open()
+    about_prefs_privacy.open()
+    tracker_panel = TrackerPanel(driver)
+    tracking_page = GenericPage(driver, url=FINGERPRINTERS_URL)
 
     # Select custom option and keep just known fingerprinters checked
-    about_prefs.get_element("custom-radio").click()
-    about_prefs.get_element("cookies-checkbox").click()
-    about_prefs.get_element("tracking-checkbox").click()
-    about_prefs.get_element("cryptominers-checkbox").click()
-    about_prefs.get_element("suspected-fingerprints-checkbox").click()
+    about_prefs_privacy.select_trackers_to_block("known-fingerprints-checkbox")
 
     # Access url and click on the shield icon and verify that known fingerprinters are blocked
-    driver.get(FINGERPRINTERS_URL)
-    nav.click_on("shield-icon")
+    tracking_page.open()
+    tracker_panel.wait_for_blocked_tracking_icon(nav, tracking_page)
+
+    nav.open_tracker_panel()
     nav.element_visible("known-fingerprints")
 
     # Click on fingerprinters and check if subpanel is correctly displayed