add wait for blocked tracking

Author: sarinali

modules/browser_object.py

@@ -10,3 +10,4 @@
 from modules.browser_object_search_bar_context_menu import *
 from modules.browser_object_tab_context_menu import *
 from modules.browser_object_tabbar import *
+from modules.browser_object_tracker_panel import *

modules/browser_object_tracker_panel.py

@@ -0,0 +1,32 @@
+from modules.browser_object_navigation import Navigation
+from modules.page_base import BasePage
+
+
+class TrackerPanel(BasePage):
+    """
+    BOM for the panel that shows up after clicking the shield
+    """
+
+    URL_TEMPLATE = ""
+    NAV = None
+
+    def wait_for_blocked_tracking_icon(self, nav: Navigation, page: BasePage):
+        """
+        Waits for the shield icon to indicate that cookies/trackers are being blocked by continuously refresing the page
+        """
+        self.driver.set_context(self.driver.CONTEXT_CHROME)
+
+        while 1:
+            nav.get_element("refresh-button").click()
+
+            self.driver.set_context(self.driver.CONTEXT_CONTENT)
+            page.wait_for_page_to_load()
+
+            self.driver.set_context(self.driver.CONTEXT_CHROME)
+            shield_icon = nav.get_element("shield-icon")
+
+            if (
+                shield_icon.get_attribute("data-l10n-id")
+                == "tracking-protection-icon-active-container"
+            ):
+                return

modules/data/navigation.components.json

@@ -189,7 +189,9 @@
     "shield-icon": {
         "selectorData": "tracking-protection-icon-container",
         "strategy": "id",
-        "groups": []
+        "groups": [
+            "doNotCache"
+        ]
     },
 
     "cryptominers": {
@@ -256,5 +258,19 @@
         "selectorData": "protections-popup-category-cryptominers",
         "strategy": "id",
         "groups": []
+    },
+
+    "tracking-cross-site-tracking-items": {
+        "selectorData": "protections-popup-cookiesView-list-section",
+        "strategy": "class",
+        "groups": []
+    },
+
+    "refresh-button": {
+        "selectorData": "reload-button",
+        "strategy": "id",
+        "groups": [
+            "doNotCache"
+        ]
     }
 }

modules/data/tracker_panel.components.json

@@ -0,0 +1,3 @@
+{
+
+}

tests/security_and_privacy/test_third_party_content_blocked_private_browsing.py

@@ -4,13 +4,12 @@
 import pytest
 from selenium.webdriver import Firefox
 
-from modules.browser_object import Navigation, PanelUi, TabBar
+from modules.browser_object import Navigation, PanelUi, TabBar, TrackerPanel
 from modules.page_object import GenericPage
 
-
-@pytest.fixture()
-def add_prefs():
-    return [("browser.contentblocking.category", "standard")]
+# @pytest.fixture()
+# def add_prefs():
+#     return [("browser.contentblocking.category", "standard")]
 
 
 def test_third_party_content_blocked_private_browsing(driver: Firefox):
@@ -19,6 +18,7 @@ def test_third_party_content_blocked_private_browsing(driver: Firefox):
     """
     panel_ui = PanelUi(driver).open()
     nav = Navigation(driver)
+    tracker_panel = TrackerPanel(driver)
     first_tracker_website = GenericPage(
         driver,
         url="https://senglehardt.com/test/trackingprotection/test_pages/tracking_protection.html",
@@ -31,14 +31,18 @@ def test_third_party_content_blocked_private_browsing(driver: Firefox):
     nav.switch_to_new_window()
 
     first_tracker_website.open()
+
+    tracker_panel.wait_for_blocked_tracking_icon(nav, first_tracker_website)
+
+    # first_tracker_website.open()
     driver.set_context(driver.CONTEXT_CHROME)
 
     shield_icon = nav.get_element("shield-icon")
 
-    # this could be labelled differently in different versions
+    # # this could be labelled differently in different versions
     assert (
         shield_icon.get_attribute("data-l10n-id")
-        == "tracking-protection-icon-no-trackers-detected-container"
+        == "tracking-protection-icon-active-container"
     ), "The label detected did not correspond to the expected one: tracking-protection-icon-no-trackers-detected-container"
     nav.open_tracker_panel()