Replace method with fixture

Author: soncuteanca

modules/browser_object_navigation.py

@@ -188,6 +188,6 @@ def open_tracker_panel(self) -> BasePage:
         """
         Clicks the shield icon and opens the panel associated with it
         """
-        self.set_chrome_context()
-        self.get_element("shield-icon").click()
-        return self
+        with self.driver.context(self.context_id):
+            self.get_element("shield-icon").click()
+            return self

modules/page_object_about_prefs.py

@@ -322,40 +322,3 @@ def get_iframe(self) -> WebElement:
         Gets the webelement for the iframe that commonly appears in about:preferences
         """
         return self.get_element("browser-popup")
-
-    def set_etp_custom_mode(self) -> BasePage:
-        """Select the Custom mode in Enhanced Tracking Protection section"""
-        self.get_element("custom-radio").click()
-        return self
-
-    def set_etp_custom_mode_options(self, options_to_check: List[str]) -> BasePage:
-        """
-        Configures the Custom mode settings in the Enhanced Tracking Protection (ETP) section by selecting
-        specified options.
-
-        This method first ensures that the browser is set to Custom mode. It then deselects all available
-        tracking protection options (there are checked by default) and selectively re-checks only those specified in the
-        `options_to_check` list (multiple values can be checked at once).
-        """
-        self.set_etp_custom_mode()
-        checkbox_mapping = {
-            "cookies": self.get_element("cookies-checkbox"),
-            "tracking": self.get_element("tracking-checkbox"),
-            "cryptominers": self.get_element("cryptominers-checkbox"),
-            "known_fingerprints": self.get_element("known-fingerprints-checkbox"),
-            "suspected_fingerprints": self.get_element(
-                "suspected-fingerprints-checkbox"
-            ),
-        }
-
-        # Uncheck all options first
-        for checkbox in checkbox_mapping.values():
-            if checkbox.is_selected():
-                checkbox.click()
-
-        # Check only the specified options
-        for option in options_to_check:
-            checkbox = checkbox_mapping.get(option)
-            if checkbox and not checkbox.is_selected():
-                checkbox.click()
-        return self

tests/security_and_privacy/test_tracking_content_custom_mode.py

@@ -1,3 +1,6 @@
+from time import sleep
+
+import pytest
 from selenium.webdriver import Firefox
 
 from modules.browser_object_navigation import Navigation
@@ -7,20 +10,34 @@
 Tracker_URL = "https://senglehardt.com/test/trackingprotection/test_pages/tracking_protection.html"
 
 
+@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),
+    ]
+
+
 def test_blocked_tracking_content(driver: Firefox):
     """
     C446405.1: Ensure that ETP Custom mode with option Tracking Content -> In all windows set blocks tracking content
     """
 
     nav = Navigation(driver)
-    about_prefs = AboutPrefs(driver, category="privacy").open()
     tracker_panel = TrackerPanel(driver)
-
-    about_prefs.set_etp_custom_mode_options(["tracking"])
+    about_prefs = AboutPrefs(driver, category="privacy").open()
+    about_prefs.get_element("tracking-checkbox").click()
     about_prefs.get_element("tracking-in-all-windows").click()
+    sleep(2)
 
     driver.get(Tracker_URL)
     nav.open_tracker_panel()
+
+    driver.set_context(driver.CONTEXT_CHROME)
+
     tracker_panel.get_element("tracker-tracking-content").click()
     tracker_subview_title = tracker_panel.get_element("tracking-subview")
     assert tracker_subview_title.get_attribute("title") == "Tracking Content Blocked"
@@ -33,13 +50,16 @@ def test_allowed_tracking_content(driver: Firefox):
     """
 
     nav = Navigation(driver)
-    about_prefs = AboutPrefs(driver, category="privacy").open()
     tracker_panel = TrackerPanel(driver)
-
-    about_prefs.set_etp_custom_mode_options(["tracking"])
+    about_prefs = AboutPrefs(driver, category="privacy").open()
+    about_prefs.get_element("tracking-checkbox").click()
+    sleep(2)
 
     driver.get(Tracker_URL)
     nav.open_tracker_panel()
+
+    driver.set_context(driver.CONTEXT_CHROME)
+
     tracker_panel.get_element("tracker-tracking-content").click()
     tracker_subview_title = tracker_panel.get_element("tracking-subview")
     assert (