Merge branch 'main' into anca/cm-ebay-at

philimon-reset · web-flow · commit f7d31be03c1e · 2025-08-26T17:04:10.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-
+/.vscode/
 /venv/
 .env
 .report.json
diff --git a/SELECTOR_INFO.md b/SELECTOR_INFO.md
@@ -1775,6 +1775,13 @@ Location: Toolbar - any bookmark context menu
 Path to .json: modules/data/context_menu.components.json
 ```
 ```
+Selector Name: context-menu-toolbar-open-in-new-tab
+Selector Data: selectorData": "placesContext_open:newtab"
+Description: Context menu option from a Toolbar bookmark
+Location: Toolbar - any bookmark context menu
+Path to .json: modules/data/context_menu.components.json
+```
+```
 Selector Name: context-menu-toolbar-open-all-bookmarks
 Selector Data: placesContext_openBookmarkContainer:tabs
 Description: Open all bookmarks from the context menu option from a Toolbar bookmark
diff --git a/l10n_CM/constants/mediamarkt/AT/mediamarkt_ad.json b/l10n_CM/constants/mediamarkt/AT/mediamarkt_ad.json
@@ -0,0 +1,19 @@
+{
+ "url": "http://127.0.0.1:8080/mediamarkt_ad.html",
+ "field_mapping": {
+    "given_name": "eb82fd1f-6ebc-4e00-91b0-b33126e3ef51",
+    "family_name": "5f200911-7e5f-4d9a-9d75-8cc496b455a7",
+    "street_address": "81b35c70-5949-4b70-afc8-030bdc2d9128",
+    "email": "ddde9f4b-5d3d-4346-bb45-1df768613507",
+    "telephone": "721fc82e-817e-4bff-8b5d-e4360eee4724"
+
+ },
+ "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+ "fields": [
+    "eb82fd1f-6ebc-4e00-91b0-b33126e3ef51",
+    "5f200911-7e5f-4d9a-9d75-8cc496b455a7",
+    "81b35c70-5949-4b70-afc8-030bdc2d9128",
+    "ddde9f4b-5d3d-4346-bb45-1df768613507",
+    "721fc82e-817e-4bff-8b5d-e4360eee4724"
+ ]
+}
diff --git a/l10n_CM/constants/mediamarkt/AT/mediamarkt_cc.json b/l10n_CM/constants/mediamarkt/AT/mediamarkt_cc.json
@@ -0,0 +1,16 @@
+{
+  "url": "http://127.0.0.1:8080/mediamarkt_cc.html",
+  "field_mapping": {
+    "card_number": "1d77675c-2591-4e83-b5b5-286b1196d918",
+    "expiration_date": "811f3be9-b204-469f-aff5-294aa91fb232",
+    "name": "cdf66cc6-01cb-4f0d-b905-fc4bd37c51e1",
+    "cvv": "839f304f-4191-4bb7-b3bc-75d9d2314715"
+  },
+  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "fields": [
+    "1d77675c-2591-4e83-b5b5-286b1196d918",
+    "811f3be9-b204-469f-aff5-294aa91fb232",
+    "cdf66cc6-01cb-4f0d-b905-fc4bd37c51e1",
+    "839f304f-4191-4bb7-b3bc-75d9d2314715"
+  ]
+}
diff --git a/l10n_CM/region/AT.json b/l10n_CM/region/AT.json
@@ -2,7 +2,8 @@
   "region": "AT",
   "sites": [
     "demo",
-    "ebay"
+    "ebay",
+    "mediamarkt"
   ],
   "tests": [
   ]
diff --git a/l10n_CM/run_l10n.py b/l10n_CM/run_l10n.py
@@ -26,7 +26,6 @@
     "bijoubrigitte",
     "brico",
     "burtsbees",
-    "burtsbeescalvinklein",
     "calvinklein",
     "canadatire",
     "cdiscount",
diff --git a/l10n_CM/sites/mediamarkt/AT/mediamarkt_ad.html b/l10n_CM/sites/mediamarkt/AT/mediamarkt_ad.html
diff --git a/l10n_CM/sites/mediamarkt/AT/mediamarkt_cc.html b/l10n_CM/sites/mediamarkt/AT/mediamarkt_cc.html
diff --git a/modules/browser_object_navigation.py b/modules/browser_object_navigation.py
@@ -569,6 +569,23 @@ def open_bookmark_from_toolbar(self, bookmark_title: str) -> BasePage:
         self.panel_ui.click_on("bookmark-by-title", labels=[bookmark_title])
         return self
 
+    @BasePage.context_chrome
+    def open_bookmark_in_new_tab_via_context_menu(
+        self, bookmark_title: str
+    ) -> BasePage:
+        """
+        Right-click bookmark and opens it in a new tab via context menu
+
+        Argument:
+            bookmark_title: The title of the bookmark to open
+        """
+        # Right-click the bookmark and open it in new tabe via context menu item
+        self.panel_ui.element_clickable("bookmark-by-title", labels=[bookmark_title])
+        self.panel_ui.context_click("bookmark-by-title", labels=[bookmark_title])
+        self.context_menu.click_on("context-menu-toolbar-open-in-new-tab")
+
+        return self
+
     @BasePage.context_chrome
     def open_bookmark_in_new_window_via_context_menu(
         self, bookmark_title: str
diff --git a/modules/data/context_menu.components.json b/modules/data/context_menu.components.json
@@ -115,6 +115,12 @@
         "groups": []
     },
 
+    "context-menu-toolbar-open-in-new-tab": {
+        "selectorData": "placesContext_open:newtab",
+        "strategy": "id",
+        "groups": ["doNotCache"]
+    },
+
     "context-menu-open-link-in-new-window": {
         "selectorData": "context-openlink",
         "strategy": "id",
diff --git a/modules/page_object_autofill.py b/modules/page_object_autofill.py
@@ -510,23 +510,6 @@ def verify_autofill_data_on_hover(
                 is_present = any(
                     [value in val for val in autofill_data.__dict__.values()]
                 )
-                # Special handling for Austrian phone numbers with duplicated country code
-                if not is_present and field == "tel" and region == "AT":
-                    # Check if this is the Austrian phone duplication issue
-                    # Browser provides duplicated country code (e.g., '43439839147007'), test data has correct format (e.g., '439839147007')
-                    if value.startswith("4343") and len(value) > 12:
-                        # Try to find a match by removing the duplicated '43'
-                        corrected_value = "43" + value[4:]
-                        is_present = any(
-                            [
-                                corrected_value in val
-                                for val in autofill_data.__dict__.values()
-                            ]
-                        )
-                        if is_present:
-                            logging.info(
-                                f"Fixed Austrian phone duplication: {value} -> {corrected_value}"
-                            )
                 assert is_present, (
                     f"Mismatched data: {(field, value)} not in {autofill_data.__dict__.values()}."
                 )
diff --git a/modules/util.py b/modules/util.py
@@ -112,6 +112,19 @@ def __init__(self):
             "Belgium": "België",
             "Austria": "Österreich",
         }
+        # Country code mapping for different regions
+        self.country_codes = {
+            "US": "1",
+            "CA": "1",
+            "FR": "33",
+            "DE": "49",
+            "GB": "44",
+            "IT": "39",
+            "PL": "48",
+            "ES": "34",
+            "BE": "32",
+            "AT": "43",
+        }
 
         self.fake = None
         self.locale = None
@@ -556,23 +569,18 @@ def normalize_regional_phone_numbers(self, phone: str, region: str) -> str:
         str
             The normalized phone number in the format <country-code><number>.
         """
+        # Handle leading zero in local numbers before country code is removed
+        if region not in ["US", "CA"] and phone.startswith("0"):
+            # Remove the leading zero
+            phone = phone[1:]
 
-        # Country code mapping for different regions
-        country_codes = {
-            "US": "1",
-            "CA": "1",
-            "FR": "33",
-            "DE": "49",
-            "GB": "44",
-            "IT": "39",
-            "PL": "48",
-            "ES": "34",
-            "BE": "32",
-            "AT": "43",
-        }
+        # Fix Austrian phone number duplication issue before processing
+        if region == "AT" and "4343" in phone:
+            # Remove the duplicated country code
+            phone = phone.replace("4343", "43")
 
         # If phone is already normalized, return as it is
-        expected_country_code = country_codes.get(region)
+        expected_country_code = self.country_codes.get(region)
         if (
             expected_country_code
             and phone.isdigit()
@@ -581,18 +589,13 @@ def normalize_regional_phone_numbers(self, phone: str, region: str) -> str:
         ):
             return phone
 
-        # Fix Austrian phone number duplication issue before processing
-        if region == "AT" and "4343" in phone:
-            # Remove the duplicated country code
-            phone = phone.replace("4343", "43")
-
         # Sub out anything that matches this regex statement with an empty string to get rid of extensions in generated phone numbers
         phone = re.sub(r"\s*(?:x|ext)\s*\d*$", "", phone, flags=re.IGNORECASE)
         # Sub out anything that is not a digit with the empty string to ensure the phone number is formatted with no spaces or special characters
         digits = re.sub(r"\D", "", phone)
 
         # Determine country code
-        country_code = country_codes.get(
+        country_code = self.country_codes.get(
             region, "1"
         )  # Default to "1" (US/CA) if the region is unknown
         # handle leading zeros
@@ -603,7 +606,7 @@ def normalize_regional_phone_numbers(self, phone: str, region: str) -> str:
             # Remove country code from the local number
             local_number = digits[len(country_code) :]
 
-        # Handle leading zero in local numbers
+        # Handle leading zero in local numbers after country code is removed
         if region not in ["US", "CA"] and local_number.startswith("0"):
             # Remove the leading zero
             local_number = local_number[1:]
@@ -614,7 +617,9 @@ def normalize_regional_phone_numbers(self, phone: str, region: str) -> str:
             return ""
 
         # Return formatted phone number with correct country code
-        return f"{country_code}{local_number}"
+        result = f"{country_code}{local_number}"
+        logging.info(f"Phone normalization result: {phone} -> {result}")
+        return result
 
 
 class BrowserActions:
diff --git a/tests/bookmarks_and_history/test_open_bookmark_in_new_tab.py b/tests/bookmarks_and_history/test_open_bookmark_in_new_tab.py
@@ -0,0 +1,43 @@
+import pytest
+from selenium.webdriver import Firefox
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
+
+from modules.browser_object import Navigation, TabBar
+from modules.page_object_generics import GenericPage
+
+
+@pytest.fixture()
+def test_case():
+    return "134460"
+
+
+BOOKMARK_URL = "https://www.youtube.com/"
+BOOKMARK_TITLE = "YouTube"
+
+
+def test_open_bookmark_in_new_tab(driver: Firefox):
+    """
+    C134460: Verify that New Tabs can be opened by right clicking and selecting new tab from the bookmarks.
+    """
+
+    # Instantiate objects
+    nav = Navigation(driver)
+    tabs = TabBar(driver)
+    page = GenericPage(driver, url=BOOKMARK_URL)
+
+    # Bookmark the test page via star button
+    page.open()
+    nav.add_bookmark_via_star_icon()
+
+    # In a new tab, right-click the bookmarked page in the toolbar and select Open in New Tab from the context menu
+    tabs.new_tab_by_button()
+    nav.open_bookmark_in_new_tab_via_context_menu(BOOKMARK_TITLE)
+
+    # Verify that the test page is opened in a new normal tab
+    tabs.wait_for_num_tabs(3)
+    driver.switch_to.window(driver.window_handles[-1])
+
+    WebDriverWait(driver, 5).until(EC.url_contains("youtube"))
+    assert "youtube" in driver.current_url
+    page.url_contains("youtube")

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-`
	`1`	`+/.vscode/`
`2`	`2`	`/venv/`
`3`	`3`	`.env`
`4`	`4`	`.report.json`