Merge main

Author: soncuteanca

l10n_CM/constants/etsy/US/etsy_ad.json

@@ -0,0 +1,24 @@
+{
+  "url": "http://127.0.0.1:8080/etsy_ad.html",
+  "field_mapping": {
+    "email": "bb8ddd35-e001-4c77-9329-6e607fbbf6d7",
+    "name": "ecab61c0-d4d3-42ba-be29-886357246718",
+    "street_address": "799835d1-33e8-4cbd-b371-f2bb713c9a68",
+    "address_level_2": "61e0bcf4-066a-4fb8-929a-bf68662ae565",
+    "address_level_1": "105a1f32-58f1-45f0-9d66-36518ad0d497",
+    "postal_code": "fa89157a-6e9b-4496-81b1-c9ba5dac6f07",
+    "country": "6a565409-0f31-4b55-ba48-488832e27c79"
+
+  },
+  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "fields": [
+    "bb8ddd35-e001-4c77-9329-6e607fbbf6d7",
+    "ecab61c0-d4d3-42ba-be29-886357246718",
+    "799835d1-33e8-4cbd-b371-f2bb713c9a68",
+    "61e0bcf4-066a-4fb8-929a-bf68662ae565",
+    "105a1f32-58f1-45f0-9d66-36518ad0d497",
+    "fa89157a-6e9b-4496-81b1-c9ba5dac6f07",
+    "6a565409-0f31-4b55-ba48-488832e27c79"
+
+  ]
+}

l10n_CM/constants/etsy/US/etsy_cc.json

@@ -0,0 +1,18 @@
+{
+  "url": "http://127.0.0.1:8080/etsy_cc.html",
+  "field_mapping": {
+    "name": "399fdc51-6f1f-4c03-9a3d-9bad578189b1",
+    "card_number": "4c7d55ac-0291-4f67-960f-5a6c62876fb7",
+    "expiration_month": "6fb7be76-2f51-4ac5-8011-7eb1c3549f7d",
+    "expiration_year": "dbc812c6-039e-4b03-85f7-888a5483f87a",
+    "cvv": "5eae1ea8-978b-44cf-bf61-2dd029fe11b6"
+  },
+  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "fields": [
+    "399fdc51-6f1f-4c03-9a3d-9bad578189b1",
+    "4c7d55ac-0291-4f67-960f-5a6c62876fb7",
+    "6fb7be76-2f51-4ac5-8011-7eb1c3549f7d",
+    "dbc812c6-039e-4b03-85f7-888a5483f87a",
+    "5eae1ea8-978b-44cf-bf61-2dd029fe11b6"
+  ]
+}

l10n_CM/sites/etsy/US/etsy_ad.html

@@ -300,12 +300,16 @@ def refresh_page(self) -> BasePage:
         self.wait_for_page_to_load()
         return self
 
-    def handle_geolocation_prompt(self, button_type="primary"):
+    def handle_geolocation_prompt(
+        self, button_type="primary", remember_this_decision=False
+    ):
         """
         Handles geolocation prompt by clicking either the 'Allow' or 'Block' button based on the button_type provided
         """
         button_selector = f"popup-notification-{button_type}-button"
         self.element_clickable(button_selector)
+        if remember_this_decision:
+            self.click_on("checkbox-remember-this-decision")
         self.click_on(button_selector)
 
     def open_searchmode_switcher_settings(self):

l10n_CM/sites/etsy/US/etsy_cc.html

@@ -77,5 +77,4 @@
         "strategy": "xpath",
         "groups": []
     }
-    
 }

modules/browser_object_navigation.py

@@ -1,5 +1,6 @@
 import sys
 from os import environ
+from time import sleep
 
 import pytest
 from selenium.webdriver import Firefox
@@ -51,5 +52,13 @@ def test_allow_audio_video_functionality(driver: Firefox):
 
     # Open test website and check the site is loaded and the featured video starts playing with sound
     GenericPage(driver, url=TEST_URL).open()
-    with driver.context(driver.CONTEXT_CHROME):
-        tabs.expect_tab_sound_status(1, tabs.MEDIA_STATUS.PLAYING)
+    max_retries = 3
+    for attempt in range(max_retries):
+        try:
+            with driver.context(driver.CONTEXT_CHROME):
+                tabs.expect_tab_sound_status(1, tabs.MEDIA_STATUS.PLAYING)
+            break  # Success!
+        except AssertionError:
+            sleep(2)
+    else:
+        pytest.fail(f"Tab sound status did not reach PLAYING after {max_retries} retries.")

modules/data/generic_page.components.json

@@ -27,75 +27,64 @@ def add_to_prefs_list():
 TEST_URL = "https://www.w3schools.com/html/html5_geolocation.asp"
 
 
-def handle_cookie_banner(driver, web_page):
-    """
-    Address the cookie banner manually if appears, as the cookie banner dismissal preference is not effective in this
-    context
-    """
-    try:
-        driver.switch_to.window(driver.window_handles[-1])
-        web_page.find_element(By.ID, "accept-choices").click()
-    except NoSuchElementException:
-        # If the cookie banner is not found, continue with the test
-        pass
-
-
-def click_geolocation_button_trigger(web_page):
-    """
-    Clicks the 'Try It' button inside the webpage to trigger the geolocation prompt
-    """
-    geolocation_button_selector = (
-        "button.w3-btn.w3-blue.w3-round[onclick='getLocation()']"
-    )
-    web_page.find_element(By.CSS_SELECTOR, geolocation_button_selector).click()
-
-
-def is_location_marker_displayed(web_page):
-    """
-    Checks if the location marker ('You are here!') is displayed on the web page inside the map.
-    """
-    location_marker = web_page.find_elements(
-        By.CSS_SELECTOR, "div[aria-label='You are here!'][role='img']"
-    )
-
-    if location_marker:  # Check if the marker exists
-        return location_marker[0].is_displayed()
-    else:
-        return False
-
-
-def test_allow_permission_on_geolocation_via_w3c_api(driver: Firefox):
+@pytest.fixture()
+def temp_selectors():
+    return {
+        "accept-choices": {
+            "selectorData": "accept-choices",
+            "strategy": "id",
+            "groups": [],
+        },
+        "geolocation-button-selector": {
+            "selectorData": "button.w3-btn",
+            "strategy": "css",
+            "groups": ["doNotCache"],
+        },
+        "location-marker": {
+            "selectorData": "mapholder",
+            "strategy": "id",
+            "groups": ["doNotCache"],
+        },
+    }
+
+
+def test_allow_permission_on_geolocation_via_w3c_api(driver: Firefox, temp_selectors):
     """
     C15186 - Verify that geolocation is successfully shared when the user allows permission via the W3C Geolocation API
     """
 
     # Instantiate Objects
     nav = Navigation(driver)
     web_page = GenericPage(driver, url=TEST_URL).open()
+    web_page.elements |= temp_selectors
     tabs = TabBar(driver)
 
     # Wait for the page to fully load and manually address the cookie banner if appears
     nav.wait_for_page_to_load()
-    handle_cookie_banner(driver, web_page)
+    cookie_element = web_page.get_elements("accept-choices")
+    if cookie_element:
+        cookie_element[0].click()
 
     # Click the 'Try It' button and Allow the location sharing
-    click_geolocation_button_trigger(web_page)
+    web_page.click_on("geolocation-button-selector")
     nav.handle_geolocation_prompt(button_type="primary")
 
-    # Assert that the location marker is displayed
-    assert is_location_marker_displayed(web_page)
+    # Check that the location marker is displayed
+    # if map is displayed, style attribute will be available
+    web_page.element_visible("location-marker")
+    assert web_page.get_element("location-marker").get_attribute("style")
 
     # Open a new tab, because refresh will keep the allow state of the location for one hour or until the tab is closed
     tabs.open_web_page_in_new_tab(web_page, num_tabs=2)
 
     # Click the 'Try It' button and Allow the location sharing while choose the option Remember this decision
-    click_geolocation_button_trigger(web_page)
-    nav.element_clickable("checkbox-remember-this-decision")
-    nav.click_on("checkbox-remember-this-decision")
-    nav.handle_geolocation_prompt(button_type="primary")
+    web_page.click_on("geolocation-button-selector")
+    nav.handle_geolocation_prompt(button_type="primary", remember_this_decision=True)
 
-    # Assert that the location marker is displayed again
-    assert is_location_marker_displayed(web_page)
+    # Check that the location marker is displayed
+    # if map is displayed, style attribute will be available
+    web_page.element_visible("location-marker")
+    assert web_page.get_element("location-marker").get_attribute("style")
 
     # Assert that the permission icon is displayed in address bar when in a new tab
     tabs.open_web_page_in_new_tab(web_page, num_tabs=3)
@@ -104,39 +93,42 @@ def test_allow_permission_on_geolocation_via_w3c_api(driver: Firefox):
         assert permission_icon.is_displayed()
 
 
-def test_block_permission_on_geolocation_via_w3c_api(driver: Firefox):
+def test_block_permission_on_geolocation_via_w3c_api(driver: Firefox, temp_selectors):
     """
     C15186 - Verify that geolocation is not shared when the user blocks permission via the W3C Geolocation API
     """
 
     # Instantiate Objects
     nav = Navigation(driver)
     web_page = GenericPage(driver, url=TEST_URL).open()
+    web_page.elements |= temp_selectors
     tabs = TabBar(driver)
 
     # Wait for the page to fully load and manually address the cookie banner if appears
     nav.wait_for_page_to_load()
-    handle_cookie_banner(driver, web_page)
+    cookie_element = web_page.get_elements("accept-choices")
+    if cookie_element:
+        cookie_element[0].click()
 
     # Click the 'Try It' button and Block the location sharing
-    click_geolocation_button_trigger(web_page)
+    web_page.click_on("geolocation-button-selector")
     nav.handle_geolocation_prompt(button_type="secondary")
 
-    # Assert that the location marker is not displayed
-    assert not is_location_marker_displayed(web_page)
+    # Check that the location marker is displayed
+    # if map is not displayed, style attribute will not be available
+    assert not web_page.get_element("location-marker").get_attribute("style")
 
     # Click the 'Try It' button and Block the location sharing while choose the option Remember this decision
-    nav.refresh_page()
-    click_geolocation_button_trigger(web_page)
-    nav.element_clickable("checkbox-remember-this-decision")
-    nav.click_on("checkbox-remember-this-decision")
-    nav.handle_geolocation_prompt(button_type="secondary")
+    tabs.open_web_page_in_new_tab(web_page, num_tabs=2)
+    web_page.click_on("geolocation-button-selector")
+    nav.handle_geolocation_prompt(button_type="secondary", remember_this_decision=True)
 
-    # Assert that the location marker is not displayed
-    assert not is_location_marker_displayed(web_page)
+    # Check that the location marker is displayed
+    # if map is not displayed, style attribute will not be available
+    assert not web_page.get_element("location-marker").get_attribute("style")
 
     # Assert that the permission icon is displayed in address bar when in a new tab
-    tabs.open_web_page_in_new_tab(web_page, num_tabs=2)
+    tabs.open_web_page_in_new_tab(web_page, num_tabs=3)
     with driver.context(driver.CONTEXT_CHROME):
         permission_icon = nav.get_element("permissions-location-icon")
         assert permission_icon.is_displayed()

tests/audio_video/test_allow_audio_video_functionality.py

@@ -1,7 +1,10 @@
+import time
+
 import pytest
 from selenium.webdriver import Firefox
 
 from modules.browser_object_navigation import Navigation
+from modules.browser_object_tabbar import TabBar
 from modules.browser_object_tracker_panel import TrackerPanel
 from modules.page_object_generics import GenericPage
 from modules.page_object_prefs import AboutPrefs
@@ -23,21 +26,30 @@ def test_blocking_fingerprinter(
     """
     C446404: Blocking Fingerprinters
     """
-    # instantiate objects
+    # Instantiate objects
     about_prefs_privacy.open()
     tracker_panel = TrackerPanel(driver)
     tracking_page = GenericPage(driver, url=FINGERPRINTERS_URL)
+    tabs = TabBar(driver)
 
     # Select custom option and keep just known fingerprinters checked
     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
+    # Switch to and new tab and access url snd verify the shield icon
+    tabs.new_tab_by_button()
+    tabs.wait_for_num_tabs(2)
+    tabs.switch_to_new_tab()
+
     tracking_page.open()
     tracker_panel.wait_for_blocked_tracking_icon(nav, tracking_page)
 
+    # Open the tracker panel and verify fingerprinters are visible
     nav.open_tracker_panel()
-    nav.element_visible("known-fingerprints")
 
-    # Click on fingerprinters and check if subpanel is correctly displayed
-    nav.click_on("known-fingerprints")
+    time.sleep(3)  # no wait condition do the trick, bug 1974080
+
+    # Click on fingerprinters
+    tracker_panel.click_on("tracking-finger-prints")
+
+    # Check if the subpanel is displayed with the expected title
     nav.element_visible("fingerprints-blocked-subpanel")