Merge branch 'main' into as/blocking-tracking-content

Author: soncuteanca

modules/data/about_prefs.components.json

@@ -240,6 +240,12 @@
         "groups": []
     },
 
+    "cookies-second-menu-item": {
+        "selectorData": "isolateCookiesSocialMedia",
+        "strategy": "id",
+        "groups": []
+    },
+
     "cookies-manage-data": {
         "selectorData": "siteDataSettings",
         "strategy": "id",

modules/data/tracker_panel.components.json

@@ -67,5 +67,17 @@
          "selectorData": "protections-popup-trackersView",
          "strategy": "id",
          "groups": []
-     }
+     },
+  
+    "social-media-tracker-content": {
+        "selectorData": "protections-popup-category-socialblock",
+        "strategy": "id",
+        "groups": []
+    },
+
+    "social-media-subview": {
+        "selectorData": "protections-popup-socialblockView",
+        "strategy": "id",
+        "groups": []
+    }
 }

tests/security_and_privacy/test_blocking_social_media_trackers.py

@@ -0,0 +1,46 @@
+import pytest
+from selenium.webdriver import Firefox
+
+from modules.browser_object_navigation import Navigation
+from modules.browser_object_tracker_panel import TrackerPanel
+from modules.page_object_about_prefs import AboutPrefs
+
+SOCIAL_MEDIA_TRACKERS_URL = "https://panopticlick.eff.org/"
+# SOCIAL_MEDIA_TRACKERS_URL = "https://www.facebook.com/"  # alternative site
+
+
+@pytest.fixture()
+def add_prefs():
+    return [
+        ("network.cookie.cookieBehavior", 0),
+        ("privacy.trackingprotection.pbmode.enabled", False),
+        ("privacy.trackingprotection.cryptomining.enabled", False),
+        ("privacy.trackingprotection.fingerprinting.enabled", False),
+        ("privacy.fingerprintingProtection.pbmode", False),
+    ]
+
+
+@pytest.mark.xfail  # blocked by bug 1866005
+def test_blocking_social_media_trackers(driver: Firefox):
+    """
+    C446406: Ensure that ETP Custom mode with the option "Cross-site tracking cookies, and isolate other
+    cross-site cookies" set in the Cookies section blocks social media trackers.
+    """
+    nav = Navigation(driver)
+    tracker_panel = TrackerPanel(driver)
+    about_prefs = AboutPrefs(driver, category="privacy").open()
+
+    about_prefs.get_element("cookies-checkbox")
+    about_prefs.get_element("cookies-second-menu-item").click()
+
+    driver.get(SOCIAL_MEDIA_TRACKERS_URL)
+    nav.open_tracker_panel()
+
+    driver.set_context(driver.CONTEXT_CHROME)
+
+    tracker_panel.get_element("social-media-tracker-content").click()
+    social_media_subview_title = tracker_panel.get_element("social-media-subview")
+    assert (
+        social_media_subview_title.get_attribute("title")
+        == "Social Media Trackers Blocked"
+    )

tests/security_and_privacy/test_cookies_not_saved_private_browsing.py

@@ -2,7 +2,7 @@
 from selenium.webdriver import Firefox
 
 from modules.browser_object import Navigation, PanelUi
-from modules.page_object import AboutPrefs, GenericPage, GoogleSearch
+from modules.page_object import AboutPrefs, GoogleSearch
 from modules.util import BrowserActions