formatting + notifcations

Author: sarinali

modules/data/about_prefs.components.json

@@ -250,5 +250,41 @@
         "selectorData": "contentBlockingFingerprintingProtectionCheckbox",
         "strategy": "id",
         "groups": []
+    },
+
+    "notifications-allow-button": {
+        "selectorData": "button[class='popup-notification-primary-button primary footer-button']",
+        "strategy": "css",
+        "groups": []
+    },
+
+    "notifications-block-button": {
+        "selectorData": "button[class='popup-notification-secondary-button footer-button']",
+        "strategy": "css",
+        "groups": []
+    },
+
+    "permissions-notifications-button": {
+        "selectorData": "notificationSettingsButton",
+        "strategy": "id",
+        "groups": []
+    },
+
+    "permissions-notifications-popup-websites": {
+        "selectorData": "permissionsBox",
+        "strategy": "id",
+        "groups": []
+    },
+
+    "permissions-notifications-popup-websites-item": {
+        "selectorData": "richlistitem[origin='{name}']",
+        "strategy": "css",
+        "groups": []
+    },
+
+    "permissions-notifications-popup-websites-item-status": {
+        "selectorData": "website-status",
+        "strategy": "class",
+        "groups": []
     }
 }

modules/data/generic_page.components.json

@@ -3,5 +3,17 @@
         "selectorData": "body",
         "strategy": "tag",
         "groups": []
+    },
+
+    "authorize-notiifcations-button": {
+        "selectorData": "button[onclick='notify.authorize()']",
+        "strategy": "css",
+        "groups": []
+    },
+
+    "show-notifications-button": {
+        "selectorData": "button[onclick='notify.show()']",
+        "strategy": "css",
+        "groups": []
     }
 }

modules/page_object_about_prefs.py

@@ -283,3 +283,9 @@ def get_save_addresses_popup_iframe(self) -> WebElement:
         self.get_element("prefs-button", labels=["Saved addresses"]).click()
         iframe = self.get_element("browser-popup")
         return iframe
+
+    def get_iframe(self) -> WebElement:
+        """
+        Gets the webelement for the iframe that commonly appears in about:preferences
+        """
+        return self.get_element("browser-popup")

modules/util.py

@@ -370,6 +370,22 @@ def assert_json_value(self, json_data, jsonpath_expr, expected_value):
             f"Expected {expected_value}, but got {match[0].value}",
         )
 
+    def trim_url_to_last_slash(self, url: str):
+        """
+        Given a URL, it will create a copy and trim it to the first slash. It does not include the last / after trimming.
+        """
+        # Find the position of the last slash
+        last_slash_index = url.rfind("/")
+
+        # Slice the string up to and including the last slash
+        if last_slash_index != -1:
+            trimmed_url = url[:last_slash_index]
+        else:
+            logging.warn("Couldn't find the last instance of a /.")
+            trimmed_url = url
+
+        return trimmed_url
+
 
 class BrowserActions:
     """

tests/address_bar_and_search/test_google_search_counts_us.py

@@ -1,6 +1,5 @@
 from time import sleep
 
-import pytest
 from selenium.webdriver import Firefox
 
 from modules.browser_object import Navigation

tests/address_bar_and_search/test_sap_google_adclick.py

@@ -1,6 +1,5 @@
 import time
 
-import pytest
 from selenium.webdriver import Firefox
 
 from modules.browser_object_navigation import Navigation

tests/security_and_privacy/conftest.py

@@ -11,4 +11,4 @@ def set_prefs(add_prefs: dict):
     """Set prefs"""
     prefs = []
     prefs.extend(add_prefs)
-    return prefs
+    return prefs

tests/security_and_privacy/test_blocking_cryptominers.py

@@ -2,15 +2,18 @@
 
 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()

tests/security_and_privacy/test_cryptominers_blocked_and_shown_in_info_panel.py

@@ -2,10 +2,12 @@
 
 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 []

tests/security_and_privacy/test_no_trackers_detected.py

@@ -1,9 +1,11 @@
 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 []
@@ -20,4 +22,4 @@ def test_no_trackers_detected(driver: Firefox):
     # 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()
+        assert nav.get_element("no-trackers-detected").is_displayed()