Merge pull request #737 from mozilla/philimon/l10n_reporting

philimon/l10n_reporting_fix_again

Author: philimon-reset

SELECTOR_INFO.md

@@ -3022,7 +3022,7 @@ Path to .json: modules/data/navigation.components.json
 ```
 ```
 Selector Name: searchmode-switcher-settings
-Selector Data: searchmode-switcher-popup-search-settings-button
+Selector Data: menuitem[data-l10n-id='urlbar-searchmode-popup-search-settings-menuitem']
 Description: Search settings button in the searchmode switcher dropdown
 Location: Address bar
 Path to .json: modules/data/navigation.components.json

ci_l10n_pyproject_headed.toml

@@ -267,6 +267,12 @@ def open_tracker_panel(self) -> BasePage:
         self.get_element("shield-icon").click()
         return self
 
+    @BasePage.context_chrome
+    def click_file_download_warning_panel(self) -> BasePage:
+        """ exit file download warning panel if present """
+        self.element_clickable("file-download-warning-button")
+        self.click_on("file-download-warning-button")
+        return self
     def wait_for_item_to_download(self, filename: str) -> BasePage:
         """
         Check the downloads tool in the toolbar to wait for a given file to download

modules/browser_object_navigation.py

@@ -393,6 +393,18 @@
         "groups": []
     },
 
+    "file-download-warning-panel": {
+        "selectorData": "downloadsPanel-privateBrowsing",
+        "strategy": "id",
+        "groups": []
+    },
+
+    "file-download-warning-button": {
+        "selectorData": "button[data-l10n-id='downloads-private-browsing-accept-button']",
+        "strategy": "css",
+        "groups": []
+    },
+
     "bookmark-in-bar": {
         "selectorData": "toolbarbutton.bookmark-item",
         "strategy": "css",
@@ -552,8 +564,8 @@
     },
 
     "searchmode-switcher-settings": {
-        "selectorData": "searchmode-switcher-popup-search-settings-button",
-        "strategy": "id",
+        "selectorData": "menuitem[data-l10n-id='urlbar-searchmode-popup-search-settings-menuitem']",
+        "strategy": "css",
         "groups": []
     },
 

modules/data/navigation.components.json

@@ -189,12 +189,21 @@ def reportable(platform_to_test=None):
     if os.environ.get("FX_L10N"):
         beta_version = int(minor_num.split("b")[-1])
         distributed_mappings = select_l10n_mappings(beta_version)
-        expected_mappings = len(distributed_mappings)
+        expected_mappings = sum(map(lambda x: len(x), distributed_mappings.values()))
         covered_mappings = 0
         # keeping this logic to still see how many mappings are reported.
         for entry in plan_entries:
             if entry.get("name") in distributed_mappings:
-                covered_mappings += 1
+                site = entry.get("name")
+                for run_ in entry.get("runs"):
+                    if run_.get("config"):
+                        run_region, run_platform = run_.get("config").split("-")
+                        if (
+                            run_region in distributed_mappings[site]
+                            and platform in run_platform
+                        ):
+                            logging.warning(f"Already reported: {site} {run_region},{run_platform}")
+                            covered_mappings += 1
         logging.warning(
             f"Potentially matching run found for {platform}, may be reportable. (Found {covered_mappings} site/region mappings reported, expected {expected_mappings}.)"
         )

modules/testrail_integration.py

@@ -59,11 +59,16 @@ def test_downloads_from_private_not_leaked(driver: Firefox, delete_files, screen
         and el.is_displayed()
     ]
     # first link is large, skip it
+    panel_skipped = False
     for link in valid_links[1 : (NUM_LINKS + 1)]:
         target = link.get_attribute("href")
         logging.info(f"Downloading target {target}:")
         logging.info(link.text)
         link.click()
+        if not panel_skipped:
+            # skip download warning panel once.
+            nav.click_file_download_warning_panel()
+            panel_skipped = True
         nav.wait_for_item_to_download(target.split("/")[-1])
 
     # Check that everything looks good in About:Downloads