Merge branch 'main' into Hani/cm-johnlewis-gb

Author: Hani Yacoub

l10n_CM/constants/cultbeauty/GB/cultbeauty_ad.json

@@ -0,0 +1,21 @@
+{
+ "url": "http://127.0.0.1:8080/cultbeauty_ad.html",
+ "field_mapping": {
+    "name": "a2230da4-744f-41b8-b2a3-686741e94715",
+    "street_address": "7ec63af6-73de-4b4d-98c7-7af4239defde",
+    "postal_code": "b4ba6987-de2d-49be-a1f5-1d983cf1525e",
+    "address_level_2": "ef22ba0f-7275-4086-af6e-6ef43cac4c25",
+    "telephone": "731ec27e-9e60-4fbe-858f-de1d8c168b3d",
+    "country": "7a482a0f-85c5-4b73-ac52-639ad8038635"
+ },
+
+ "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+ "fields": [
+    "a2230da4-744f-41b8-b2a3-686741e94715",
+    "7ec63af6-73de-4b4d-98c7-7af4239defde",
+    "b4ba6987-de2d-49be-a1f5-1d983cf1525e",
+    "ef22ba0f-7275-4086-af6e-6ef43cac4c25",
+    "731ec27e-9e60-4fbe-858f-de1d8c168b3d",
+    "7a482a0f-85c5-4b73-ac52-639ad8038635"
+ ]
+}

l10n_CM/constants/cultbeauty/GB/cultbeauty_cc.json

@@ -0,0 +1,19 @@
+{
+  "url": "http://127.0.0.1:8080/cultbeauty_cc.html",
+  "field_mapping": {
+    "card_number": "1ae2f87d-489b-412e-8ae9-b6b7e2860b3c",
+    "name": "dcacdef7-e39f-4c8c-a9df-aa03173c89aa",
+    "expiration_month": "43a870b8-62fa-4cdd-a5ee-f7c0832ca4ff",
+    "expiration_year": "fda74455-fcc3-4129-8431-a0cbadb79dab",
+    "cvv": "d1a43343-2491-4510-b779-54ff1961ef77"
+  },
+
+  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "fields": [
+    "1ae2f87d-489b-412e-8ae9-b6b7e2860b3c",
+    "dcacdef7-e39f-4c8c-a9df-aa03173c89aa",
+    "43a870b8-62fa-4cdd-a5ee-f7c0832ca4ff",
+    "fda74455-fcc3-4129-8431-a0cbadb79dab",
+    "d1a43343-2491-4510-b779-54ff1961ef77"
+  ]
+}

l10n_CM/region/GB.json

@@ -1,6 +1,7 @@
 {
   "region": "GB",
   "sites": [
+    "cultbeauty",
     "assos",
     "demo",
     "diy",

l10n_CM/run_l10n.py

@@ -34,6 +34,7 @@
     "cdiscount",
     "ceneo",
     "cocolita",
+    "cultbeauty",
     "cupshe",
     "decathlon",
     "demo",

l10n_CM/sites/cultbeauty/GB/cultbeauty_ad.html

@@ -307,6 +307,18 @@ def refresh_page(self) -> BasePage:
         self.wait_for_page_to_load()
         return self
 
+    @BasePage.context_chrome
+    def hard_reload_with_key_combo(self) -> BasePage:
+        """
+        Use Cmd/Ctrl + Shift + R to hard reload the page and overide cache.
+        """
+        if self.sys_platform() == "Darwin":
+            mod_key = Keys.COMMAND
+        else:
+            mod_key = Keys.CONTROL
+        self.perform_key_combo(mod_key, Keys.SHIFT, "r")
+        return self
+
     def handle_geolocation_prompt(
         self, button_type="primary", remember_this_decision=False
     ):

l10n_CM/sites/cultbeauty/GB/cultbeauty_cc.html

@@ -0,0 +1,58 @@
+import pytest
+from selenium.common.exceptions import NoSuchElementException
+from selenium.webdriver import Firefox
+from selenium.webdriver.common.by import By
+
+from modules.browser_object import TabBar
+from modules.browser_object_navigation import Navigation
+
+
+@pytest.fixture()
+def test_case():
+    return "134642"
+
+
+TEST_URL = "https://postman-echo.com/headers"
+
+
+def test_reload_overiding_cache_keys(driver: Firefox, sys_platform: str):
+    """
+    C134642 - Verify that tabs can be hard reloaded (overriding cache) using keyboard shortcut CTRL/CMD + SHIFT + R.
+    """
+
+    browser = TabBar(driver)
+    nav = Navigation(driver)
+
+    # New tab + navigate
+    browser.new_tab_by_button()
+    driver.switch_to.window(driver.window_handles[-1])
+    driver.get(TEST_URL)
+
+    # Hard reload using helper function for action CTRL/CMD + SHIFT + "r"
+    nav.hard_reload_with_key_combo()
+
+    # Verify cache is not being used by checking for http request headers
+    # Header "if-none-match" should not be sent
+    try:
+        etag = driver.find_element(By.ID, "/headers/if-none-match").get_attribute(
+            "innerText"
+        )
+        assert False, f"Unexpected If-None-Match present: {etag!r}"
+    except NoSuchElementException:
+        pass
+
+    # Header "pragma" should be sent with with value "no-cache"
+    pragma_text = driver.find_element(By.ID, "/headers/pragma").get_attribute(
+        "innerText"
+    )
+    assert "no-cache" in pragma_text, (
+        f"Expected 'no-cache' in pragma; got: {pragma_text!r}"
+    )
+
+    # Header "cache-control" should be sent with with value "no-cache"
+    cache_control_text = driver.find_element(
+        By.ID, "/headers/cache-control"
+    ).get_attribute("innerText")
+    assert "no-cache" in cache_control_text, (
+        f"Expected 'no-cache' in cache-control; got: {cache_control_text!r}"
+    )