Merge main

Author: soncuteanca

.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
 

modules/testrail.py

@@ -160,6 +160,10 @@ def get_test_case(self, case_id):
         """Get a given Test Case"""
         return self.client.send_get(f"get_case/{case_id}")
 
+    def get_suites(self, project_id):
+        """Get all suites for project"""
+        return self.client.send_get(f"get_suites/{project_id}")
+
     def update_cases_in_suite(self, suite_id, case_ids, **kwargs):
         """Given a suite and a list of test cases, update all listed
         test cases according to keyword args"""

modules/testrail_scripts/testrail_script_set_all_subs_to_functional.py

@@ -0,0 +1,110 @@
+import logging
+
+from dotenv import load_dotenv
+
+from modules.testrail_integration import testrail_init
+
+# Load environment variables from .env file
+load_dotenv()
+
+# Configuration Constants
+PROJECT_ID = 17  # The ID of the TestRail project to work with
+SUITE_NAMES = ["Fakespot Shopping Sidebar"]  # List of suite names to process
+
+CUSTOM_SUB_TEST_SUITES = [1]  # Value to set for the 'custom_sub_test_suites' field
+DRY_RUN = True  # If True, only log actions without making changes
+
+
+def get_all_cases_from_suite(tr, project_id, suite_id):
+    """
+    Fetch all test cases from a given TestRail suite using pagination.
+
+    Args:
+        tr: TestRail API client instance.
+        project_id (int): The ID of the TestRail project.
+        suite_id (int): The ID of the suite to fetch cases from.
+
+    Returns:
+        list: A list of test case dictionaries.
+    """
+    all_cases = []  # List to store all fetched test cases
+    offset = 0  # Starting point for pagination
+    limit = 240  # Maximum number of cases to fetch in each API call
+
+    while True:
+        # Build the API endpoint with pagination parameters
+        endpoint = (
+            f"get_cases/{project_id}&suite_id={suite_id}&limit={limit}&offset={offset}"
+        )
+        response = tr.client.send_get(endpoint)  # Send API request to TestRail
+        cases = response.get("cases", [])  # Extract the list of test cases
+
+        if not cases:
+            # If no more cases are found, break the loop
+            break
+
+        # Add the fetched cases to the complete list
+        all_cases.extend(cases)
+
+        if len(cases) < limit:
+            # If the number of fetched cases is less than the limit, we are at the last page
+            break
+
+        # Increment offset to fetch the next batch of cases
+        offset += limit
+
+    # Log the total number of fetched cases
+    logging.info(f"Total cases fetched from suite {suite_id}: {len(all_cases)}")
+    return all_cases
+
+
+if __name__ == "__main__":
+    # Initialize logging to display info messages
+    logging.basicConfig(level=logging.INFO)
+
+    # Initialize the TestRail API client
+    tr = testrail_init()
+
+    # Fetch suite IDs matching the given suite names
+    suites = tr.get_suites(PROJECT_ID)
+    suite_ids = [suite["id"] for suite in suites if suite["name"] in SUITE_NAMES]
+    logging.info(f"Found suites: {suite_ids}")
+
+    # Fetch all test cases from the selected suites
+    all_cases = []  # List to store all fetched test cases
+    for suite_id in suite_ids:
+        # Fetch and add cases from each suite
+        cases = get_all_cases_from_suite(tr, PROJECT_ID, suite_id)
+        all_cases.extend(cases)
+
+    # Log the total number of test cases found
+    logging.info(f"Total test cases found for selected suites: {len(all_cases)}")
+
+    updated_count = 0  # Counter for the number of cases updated
+
+    # Iterate over each test case to display and update the 'custom_sub_test_suites' field
+    for case in all_cases:
+        # Get the current value of the 'custom_sub_test_suites' field
+        current_value = case.get("custom_sub_test_suites", "Not Set")
+        logging.info(f"Case ID {case['id']} current value: {current_value}")
+
+        if not DRY_RUN:
+            # If not in dry run mode, perform the update
+            result = tr.update_case_field(
+                case["id"], "custom_sub_test_suites", CUSTOM_SUB_TEST_SUITES
+            )
+            logging.info(
+                f"Updated case {case['id']} to '{CUSTOM_SUB_TEST_SUITES}', Result: {result}"
+            )
+        else:
+            # In dry run mode, just log the intended change without making it
+            logging.info(
+                f"[DRY RUN] Would update case {case['id']} from '{current_value}' to '{CUSTOM_SUB_TEST_SUITES}'."
+            )
+
+        updated_count += 1  # Increment the updated count
+
+    # Log the total number of cases updated or to be updated
+    logging.info(
+        f"Total cases {'updated' if not DRY_RUN else 'to be updated'}: {updated_count}"
+    )

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