resolve conflicts

Author: Hani Yacoub

modules/data/navigation.components.json

@@ -197,4 +197,5 @@
         "strategy": "css",
         "groups": []
     }
+
 }

tests/security_and_privacy/conftest.py

@@ -3,13 +3,12 @@
 
 @pytest.fixture()
 def suite_id():
-    return ("X", "Security and Privacy")
+    return ("5833", "Security and Privacy")
 
 
 @pytest.fixture()
-def set_prefs(add_prefs=None):
+def set_prefs(add_prefs: dict):
     """Set prefs"""
     prefs = []
-    if add_prefs is not None:
-        prefs.extend(add_prefs)
+    prefs.extend(add_prefs)
     return prefs

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()