Merge branch 'main' into sl/notifications-set-change

Author: ben-c-at-moz

modules/data/about_prefs.components.json

@@ -263,6 +263,20 @@
         "strategy": "css",
         "groups": []
     },
+      
+    "cookies-shadow-root": {
+        "selectorData": "dialog[buttons='accept,cancel']",
+        "strategy": "css",
+        "groups": [
+            "doNotCache"
+        ]
+    },
+
+    "clear-data-dialog-options": {
+        "selectorData": "hbox.checkbox-label-box",
+        "strategy": "css",
+        "groups": []
+    },
 
     "permissions-notifications-button": {
         "selectorData": "notificationSettingsButton",
@@ -288,6 +302,15 @@
         "groups": []
     },
 
+    "clear-data-accept-button": {
+        "selectorData": "[class='button-text'][value='Clear']",
+        "strategy": "css",
+        "shadowParent": "cookies-shadow-root",
+        "groups": [
+            "doNotCache"
+        ]
+    },
+
     "language-dropdown": {
         "selectorData": "primaryBrowserLocale",
         "strategy": "id",

modules/page_object_about_prefs.py

@@ -10,7 +10,7 @@
 from modules.classes.autofill_base import AutofillAddressBase
 from modules.classes.credit_card import CreditCardBase
 from modules.page_base import BasePage
-from modules.util import PomUtils
+from modules.util import BrowserActions, PomUtils
 
 
 class AboutPrefs(BasePage):
@@ -289,8 +289,35 @@ def get_save_addresses_popup_iframe(self) -> WebElement:
         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")
+
+    
+    def get_clear_cookie_data_value(self) -> int:
+        """
+        With the 'Clear browsing data and cookies' popup open,
+        returns the <memory used> value of the option for 'Cookies and site data (<memory used>)'.
+        The <memory used> value for no cookies is '0 bytes', otherwise values are '### MB', or '### KB'
+        """
+        # Find the dialog option elements containing the checkbox label
+        options = self.get_elements("clear-data-dialog-options")
+
+        # Extract the text from the label the second option
+        second_option = options[1]
+        label_text = second_option.text
+        print(f"The text of the option is: {label_text}")
+
+        # Use a regular expression to find the memory usage
+        match = re.search(r"\d+", label_text)
+
+        if match:
+            number_str = match.group()  # Extract the matched number as a string
+            number = int(number_str)  # Convert the number to an integer
+            print(f"The extracted value is: {number}")
+            return number
+        else:
+            print("No number found in the string")

tests/preferences/test_clear_cookie_data.py

@@ -0,0 +1,38 @@
+from selenium.webdriver import Firefox
+
+from modules.page_object import AboutPrefs
+from modules.util import BrowserActions
+
+
+def test_clear_cookie_data(driver: Firefox):
+    """
+    C143627: Cookies and site data can be cleared via the "Clear Data" panel
+    """
+    # Instantiate objects
+    about_prefs = AboutPrefs(driver, category="privacy")
+    ba = BrowserActions(driver)
+
+    def open_clear_cookies_data_dialog():
+        about_prefs.open()
+        clear_data_popup = about_prefs.press_button_get_popup_dialog_iframe(
+            "Clear Data…"
+        )
+        ba.switch_to_iframe_context(clear_data_popup)
+
+    # Visit a site to get a cookie added to saved data
+    driver.get("https://www.mozilla.org")
+
+    # Navigate to the clear data dialog of about:preferences#privacy
+    open_clear_cookies_data_dialog()
+
+    # Check for a non-zero value of the 'Cookies and site data' option
+    cookie_value = about_prefs.get_clear_cookie_data_value()
+    assert cookie_value is not 0
+
+    # Then clear the cookies and site data
+    about_prefs.get_element("clear-data-accept-button").click()
+
+    # Finally, check the value of the dialog option, it should be 0
+    open_clear_cookies_data_dialog()
+    cookie_value2 = about_prefs.get_clear_cookie_data_value()
+    assert cookie_value2 is 0