Merge pull request #137 from mozilla/hy/blocking_fingerprinters

hy/Test blocking fingerprinters

Author: sv-hyacoub

modules/data/about_prefs.components.json

@@ -258,6 +258,12 @@
         "groups": []
     },
 
+    "cryptominers-checkbox": {
+        "selectorData": "contentBlockingCryptominersCheckbox",
+        "strategy": "id",
+        "groups": []
+    },
+
     "known-fingerprints-checkbox": {
         "selectorData": "contentBlockingFingerprintersCheckbox",
         "strategy": "id",

modules/data/google_search.components.json

@@ -2,6 +2,8 @@
     "search-bar-textarea": {
         "selectorData": "textarea[aria-label='Search']",
         "strategy": "css",
-        "groups": []
+        "groups": [
+            "requiredForPage"
+        ]
     }
 }

modules/data/navigation.components.json

@@ -242,5 +242,17 @@
         "groups": [
             "doNotCache"
         ]
+    },
+
+    "known-fingerprints": {
+        "selectorData": ".protections-popup-category.subviewbutton.subviewbutton-iconic.blocked.subviewbutton-nav",
+        "strategy": "css",
+        "groups": []
+    },
+
+    "fingerprints-blocked-subpanel": {
+        "selectorData": "protections-popup-fingerprintersView",
+        "strategy": "id",
+        "groups": []
     }
 }

modules/page_object_google_search.py

@@ -1,3 +1,4 @@
+from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.remote.webelement import WebElement
 
 from modules.page_base import BasePage
@@ -17,6 +18,13 @@ def type_in_search_bar(self, text: str) -> BasePage:
         search_bar = self.get_search_bar_element()
         search_bar.send_keys(text)
 
+    def press_enter_search_bar(self) -> BasePage:
+        """
+        Sends Enter into the search bar
+        """
+        search_bar = self.get_search_bar_element()
+        search_bar.send_keys(Keys.ENTER)
+
     def get_search_bar_element(self) -> WebElement:
         """
         Finds the search bar element and returns it as a WebElement

tests/security_and_privacy/test_blocking_fingerprinters.py

@@ -0,0 +1,36 @@
+from time import sleep
+
+from selenium.webdriver import Firefox
+
+from modules.browser_object_navigation import Navigation
+from modules.page_object_about_prefs import AboutPrefs
+
+FINGERPRINTERS_URL = (
+    "https://senglehardt.com/test/trackingprotection/test_pages/fingerprinting.html"
+)
+
+
+def test_blocking_fingerprinter(driver: Firefox):
+    """
+    C446404: Blocking Fingerprinters
+    """
+    # instantiate objects
+    nav = Navigation(driver).open()
+    about_prefs = AboutPrefs(driver, category="privacy").open()
+
+    # Select custom option and keep just known fingerprinters checked
+    about_prefs.get_element("custom-radio").click()
+    about_prefs.get_element("cookies-checkbox").click()
+    about_prefs.get_element("tracking-checkbox").click()
+    about_prefs.get_element("cryptominers-checkbox").click()
+    about_prefs.get_element("suspected-fingerprints-checkbox").click()
+    sleep(2)
+
+    # Access url and click on the shield icon and verify that known fingerprinters are blocked
+    driver.get(FINGERPRINTERS_URL)
+    with driver.context(driver.CONTEXT_CHROME):
+        nav.get_element("shield-icon").click()
+        assert nav.get_element("known-fingerprints").is_displayed()
+        # Click on fingerprinters and check if subpanel is correctly displayed
+        nav.get_element("known-fingerprints").click()
+        assert nav.get_element("fingerprints-blocked-subpanel").is_displayed()

tests/security_and_privacy/test_cookies_not_saved_private_browsing.py

@@ -1,10 +1,12 @@
+import pytest
 from selenium.webdriver import Firefox
 
 from modules.browser_object import Navigation, PanelUi
-from modules.page_object import AboutPrefs, GenericPage
+from modules.page_object import AboutPrefs, GenericPage, GoogleSearch
 from modules.util import BrowserActions
 
 
+@pytest.mark.unstable
 def test_cookies_not_saved_private_browsing(driver: Firefox):
     """
     C101677: ensure that cookies are not saved after using private browsing
@@ -13,21 +15,18 @@ def test_cookies_not_saved_private_browsing(driver: Firefox):
     about_prefs = AboutPrefs(driver, category="privacy")
     panel_ui = PanelUi(driver).open()
     nav = Navigation(driver)
-    wiki_page = GenericPage(
-        driver, url="https://ro.wikipedia.org/wiki/Pagina_principal%C4%83"
-    )
+    google_search = GoogleSearch(driver)
     ba = BrowserActions(driver)
 
     # open new private window
     panel_ui.open_private_window()
     nav.switch_to_new_window()
 
-    # open the wiki page and perform a search
-    wiki_page.open()
-    wiki_search_bar = wiki_page.get_element("wiki-search-bar")
-    wiki_search_bar.send_keys("hello")
-    wiki_page.get_element("wiki-search-button").click()
-    wiki_page.wait_for_page_to_load()
+    # open the google page and perform a search
+    google_search.open()
+    google_search.type_in_search_bar("hello")
+    google_search.press_enter_search_bar()
+    google_search.wait_for_page_to_load()
 
     # close the page and switch to first tab
     driver.close()