merge main in

Author: sarinali

modules/data/about_prefs.components.json

@@ -222,6 +222,36 @@
         "groups": []
     },
 
+    "custom-radio": {
+        "selectorData": "customRadio",
+        "strategy": "id",
+        "groups": []
+    },
+
+    "cookies-checkbox": {
+        "selectorData": "contentBlockingBlockCookiesCheckbox",
+        "strategy": "id",
+        "groups": []
+    },
+
+    "tracking-checkbox": {
+        "selectorData": "contentBlockingTrackingProtectionCheckbox",
+        "strategy": "id",
+        "groups": []
+    },
+
+    "known-fingerprints-checkbox": {
+        "selectorData": "contentBlockingFingerprintersCheckbox",
+        "strategy": "id",
+        "groups": []
+    },
+
+    "suspected-fingerprints-checkbox": {
+        "selectorData": "contentBlockingFingerprintingProtectionCheckbox",
+        "strategy": "id",
+        "groups": []
+    },
+
     "language-dropdown": {
         "selectorData": "primaryBrowserLocale",
         "strategy": "id",

modules/data/navigation.components.json

@@ -184,5 +184,23 @@
         "selectorData": "//div[@data-text-ad]//a",
         "strategy": "xpath",
         "groups": []
+    },
+
+    "shield-icon": {
+        "selectorData": "tracking-protection-icon-container",
+        "strategy": "id",
+        "groups": []
+    },
+
+    "cryptominers": {
+        "selectorData": ".protections-popup-category.subviewbutton.subviewbutton-iconic.subviewbutton-nav.blocked",
+        "strategy": "css",
+        "groups": []
+    },
+
+    "no-trackers-detected": {
+        "selectorData": "protections-popup-no-trackers-found-description",
+        "strategy": "id",
+        "groups": []
     }
 }

tests/address_bar_and_search/test_google_search_counts_us.py

@@ -8,8 +8,6 @@
 from modules.util import Utilities
 
 
-# unstable: for some reason cannot pass in Taskcluster Linux VM
-@pytest.mark.unstable
 def test_google_search_counts_us(driver: Firefox):
     """
     C1365026, Test Google Search counts - urlbar US
@@ -18,10 +16,11 @@ def test_google_search_counts_us(driver: Firefox):
     nav = Navigation(driver).open()
     nav.search("festival")
     sleep(5)
-    about_telemetry = AboutTelemetry(driver).open()
     u = Utilities()
 
     # Click on Raw JSON, switch tab and click on Raw Data
+    about_telemetry = AboutTelemetry(driver).open()
+    sleep(2)
     about_telemetry.get_element("category-raw").click()
     about_telemetry.switch_tab()
     about_telemetry.get_element("rawdata-tab").click()

tests/security_and_privacy/conftest.py

@@ -0,0 +1,14 @@
+import pytest
+
+
+@pytest.fixture()
+def suite_id():
+    return ("5833", "Security and Privacy")
+
+
+@pytest.fixture()
+def set_prefs(add_prefs: dict):
+    """Set prefs"""
+    prefs = []
+    prefs.extend(add_prefs)
+    return prefs

tests/security_and_privacy/test_blocking_cryptominers.py

@@ -0,0 +1,31 @@
+from time import sleep
+
+import pytest
+from selenium.webdriver import Firefox
+from modules.browser_object_navigation import Navigation
+from modules.page_object_about_prefs import AboutPrefs
+
+CRYPTOMINERS_URL = "https://senglehardt.com/test/trackingprotection/test_pages/fingerprinting_and_cryptomining.html"
+
+@pytest.fixture()
+def add_prefs():
+    return []
+
+def test_blocking_cryptominers(driver: Firefox):
+    # instantiate objects
+    nav = Navigation(driver).open()
+    about_prefs = AboutPrefs(driver, category="privacy").open()
+
+    # Select custom option and keep just cryptominers 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("known-fingerprints-checkbox").click()
+    about_prefs.get_element("suspected-fingerprints-checkbox").click()
+    sleep(2)
+
+    # Access url and click on the shield icon and verify that cryptominers are blocked
+    driver.get(CRYPTOMINERS_URL)
+    with driver.context(driver.CONTEXT_CHROME):
+        nav.get_element("shield-icon").click()
+        assert nav.get_element("cryptominers").is_displayed()

tests/security_and_privacy/test_cryptominers_blocked_and_shown_in_info_panel.py

@@ -0,0 +1,26 @@
+from time import sleep
+
+import pytest
+from selenium.webdriver import Firefox
+from modules.browser_object_navigation import Navigation
+
+CRYPTOMINERS_URL = "https://senglehardt.com/test/trackingprotection/test_pages/fingerprinting_and_cryptomining.html"
+
+@pytest.fixture()
+def add_prefs():
+    return []
+
+
+def test_cryptominers_blocked_and_shown_in_info_panel(driver: Firefox):
+    """
+    C450232: Cryptominers are blocked and shown in Standard mode in the Information pannel
+    """
+    # Access URL, needed sleep otherwise cryptomining will be displayed as unblocked
+    nav = Navigation(driver)
+    sleep(4)
+    driver.get(CRYPTOMINERS_URL)
+
+    # Click on the shield icon and verify that cryptominers are blocked
+    with driver.context(driver.CONTEXT_CHROME):
+        nav.get_element("shield-icon").click()
+        assert nav.get_element("cryptominers").is_displayed()

tests/security_and_privacy/test_no_trackers_detected.py

@@ -0,0 +1,23 @@
+import pytest
+from selenium.webdriver import Firefox
+from modules.browser_object_navigation import Navigation
+
+NOTRACKERS_URL = "http://example.com/"
+
+@pytest.fixture()
+def add_prefs():
+    return []
+
+
+def test_no_trackers_detected(driver: Firefox):
+    """
+    C446391 No trackers are detected
+    """
+    # instantiate object and access url
+    nav = Navigation(driver)
+    driver.get(NOTRACKERS_URL)
+
+    # Click on the shield icon and verify that trackers are detected
+    with driver.context(driver.CONTEXT_CHROME):
+        nav.get_element("shield-icon").click()
+        assert nav.get_element("no-trackers-detected").is_displayed()

tests/sync_and_fxa/test_existing_fxa.py

@@ -20,10 +20,14 @@ def fxa_test_account():
     return ("[email protected]", "Test123???")
 
 
-@pytest.mark.unstable
 def test_sync_existing_fxa(
-    driver: Firefox, fxa_test_account: Tuple[str, str], restmail_session, get_otp_code
+    driver: Firefox,
+    fxa_test_account: Tuple[str, str],
+    restmail_session,
+    get_otp_code,
+    screenshot,
 ):
+    """C131098: User is able to log in with existing FxAccount"""
     (username, password) = fxa_test_account
     panel_ui = PanelUi(driver)
     panel_ui.click_sync_sign_in_button()
@@ -40,4 +44,6 @@ def test_sync_existing_fxa(
         fxa.fill_otp_code(otp)
     except (NoSuchElementException, TimeoutException):
         pass
+    with driver.context(driver.CONTEXT_CHROME):
+        screenshot("test_sync_existing_fxa_chrome")
     panel_ui.confirm_sync_in_progress()