mrege changes in

Author: sarinali

modules/data/about_prefs.components.json

@@ -240,6 +240,18 @@
         "groups": []
     },
 
+    "cookies-manage-data": {
+        "selectorData": "siteDataSettings",
+        "strategy": "id",
+        "groups": []
+    },
+
+    "cookies-manage-data-sitelist": {
+        "selectorData": "sitesList",
+        "strategy": "id",
+        "groups": []
+    },
+
     "tracking-checkbox": {
         "selectorData": "contentBlockingTrackingProtectionCheckbox",
         "strategy": "id",

modules/data/generic_page.components.json

@@ -23,6 +23,18 @@
         "groups": []
     },
 
+    "wiki-search-bar": {
+        "selectorData": "searchInput",
+        "strategy": "id",
+        "groups": []
+    },
+
+    "wiki-search-button": {
+        "selectorData": "button[class='cdx-button cdx-button--action-default cdx-button--weight-normal cdx-button--size-medium cdx-button--framed cdx-search-input__end-button']",
+        "strategy": "css",
+        "groups": []
+    },
+
     "simulated-tracker-block-status": {
         "selectorData": "blacklisted-blocked",
         "strategy": "id",

modules/data/login_autofill.components.json

@@ -29,5 +29,23 @@
         "groups": [
             "doNotCache"
         ]
+    },
+
+    "username-login-field": {
+        "selectorData": "/html/body/div[1]/form[2]/input[1]",
+        "strategy": "xpath",
+        "groups": []
+    },
+
+    "password-login-field": {
+        "selectorData": "/html/body/div[1]/form[2]/input[2]",
+        "strategy": "xpath",
+        "groups": []
+    },
+
+    "submit-button-login": {
+        "selectorData": "/html/body/div[1]/form[2]/input[3]",
+        "strategy": "xpath",
+        "groups": []
     }
 }

modules/page_base.py

@@ -541,6 +541,19 @@ def get_all_children(
             children = element.find_elements(By.XPATH, "./*")
         return children
 
+    def wait_for_no_children(
+        self, parent: Union[str, tuple, WebElement], labels=[]
+    ) -> Page:
+        """
+        Waits for 0 children under the given parent, the wait is instant (note, this changes the driver implicit wait and changes it back)
+        """
+        driver_wait = self.driver.timeouts.implicit_wait
+        self.driver.implicitly_wait(0)
+        try:
+            assert len(self.get_all_children(self.fetch(parent, labels))) == 0
+        finally:
+            self.driver.implicitly_wait(driver_wait)
+
     def wait_for_num_tabs(self, num_tabs: int) -> Page:
         """
         Waits for the driver.window_handles to be updated accordingly with the number of tabs requested

modules/page_object_autofill_login.py

@@ -21,20 +21,15 @@ def __init__(self, parent: "LoginAutofill") -> None:
 
         def fill_username(self, username: str) -> None:
             if self.username_field is None:
-                username_fields = self.parent.get_elements("username-field")
-                self.username_field = username_fields[1]
+                self.username_field = self.parent.get_element("username-login-field")
             self.username_field.send_keys(username)
 
         def fill_password(self, password: str) -> None:
             if self.password_field is None:
-                password_fields = self.parent.get_elements(
-                    "input-field", labels=["current-password"]
-                )
-                self.password_field = password_fields[0]
+                self.password_field = self.parent.get_element("password-login-field")
             self.password_field.send_keys(password)
 
         def submit(self) -> None:
             if self.submit_button is None:
-                submit_buttons = self.parent.get_elements("submit-form")
-                self.submit_button = submit_buttons[0]
+                self.submit_button = self.parent.get_element("submit-button-login")
             self.submit_button.click()

tests/security_and_privacy/test_cookies_not_saved_private_browsing.py

@@ -0,0 +1,43 @@
+from selenium.webdriver import Firefox
+
+from modules.browser_object import Navigation, PanelUi
+from modules.page_object import AboutPrefs, GenericPage
+from modules.util import BrowserActions
+
+
+def test_cookies_not_saved_private_browsing(driver: Firefox):
+    """
+    C101677: ensure that cookies are not saved after using private browsing
+    """
+    # instantiate objs
+    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"
+    )
+    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()
+
+    # close the page and switch to first tab
+    driver.close()
+    driver.switch_to.window(driver.window_handles[0])
+    about_prefs.open()
+
+    # get the cookies
+    about_prefs.get_element("cookies-manage-data").click()
+    iframe = about_prefs.get_iframe()
+    ba.switch_to_iframe_context(iframe)
+
+    # wait for no children listed in the cookies menu
+    about_prefs.wait_for_no_children("cookies-manage-data-sitelist")