Merge branch 'main' into Hani/url-copy-contains-https

Author: Hani Yacoub

modules/browser_object_tabbar.py

@@ -379,3 +379,43 @@ def select_multiple_tabs_by_indices(
             actions.key_up(Keys.CONTROL).perform()
 
         return selected_tabs
+
+    @BasePage.context_chrome
+    def reopen_tabs_with_shortcut(self, sys_platform: str, count: int) -> None:
+        """Reopen closed tabs using keyboard shortcut Ctrl/Cmd + Shift + T."""
+
+        # Press modifier keys
+        if sys_platform == "Darwin":
+            self.actions.key_down(Keys.COMMAND).key_down(Keys.SHIFT).perform()
+        else:
+            self.actions.key_down(Keys.CONTROL).key_down(Keys.SHIFT).perform()
+
+        # Press 'T' multiple times to reopen tabs
+        for _ in range(count):
+            self.actions.send_keys("t").perform()
+
+        # Release modifier keys
+        if sys_platform == "Darwin":
+            self.actions.key_up(Keys.SHIFT).key_up(Keys.COMMAND).perform()
+        else:
+            self.actions.key_up(Keys.SHIFT).key_up(Keys.CONTROL).perform()
+
+    @BasePage.context_chrome
+    def reload_tab(self, nav, mod_key=None, extra_key=None):
+        """
+        Reloads the current tab using a keyboard shortcut inside Chrome context.
+
+        Args:
+            nav: Navigation object to click before sending keys.
+            mod_key: Modifier key (e.g., Keys.CONTROL, Keys.COMMAND) for Ctrl/Cmd+R.
+            extra_key: Extra key to press (e.g., 'r' for Ctrl/Cmd+R, or Keys.F5 for F5).
+        """
+        nav.click_on("navigation-background-component")
+
+        # Determine which key combo to use
+        if mod_key and extra_key:
+            self.perform_key_combo(mod_key, extra_key)
+        elif extra_key:
+            self.perform_key_combo(extra_key)
+        else:
+            raise ValueError("You must provide extra_key to perform reload.")

modules/page_object_about_pages.py

@@ -12,6 +12,7 @@
 from selenium.webdriver.support import expected_conditions as EC
 
 from modules.page_base import BasePage
+from modules.page_object_generics import GenericPage
 from modules.util import BrowserActions
 
 
@@ -199,6 +200,40 @@ def verify_csv_export(self, downloads_folder: str, filename: str):
         self.wait.until(lambda _: os.path.exists(csv_file))
         return csv_file
 
+    def add_login(self, origin: str, username: str, password: str):
+        """
+        Adds a new saved login entry.
+
+        Args:
+            origin (str): The site URL (e.g., https://example.com)
+            username (str): The username to save
+            password (str): The password to save
+        """
+        self.click_add_login_button()
+        self.create_new_login({
+            "origin": origin,
+            "username": username,
+            "password": password,
+        })
+
+    def export_passwords_csv(self, downloads_folder: str, filename: str):
+        """
+        Export passwords to a CSV file and navigate the save dialog to the target location.
+
+        Args:
+            downloads_folder (str): The folder where the CSV should be saved.
+            filename (str): The name of the CSV file.
+        """
+        # Open about:logins and click export buttons
+        self.open()
+        self.click_on("menu-button")
+        self.click_on("export-passwords-button")
+        self.click_on("continue-export-button")
+
+        # Wait for export dialog and navigate to folder
+        page = GenericPage(self.driver)
+        page.navigate_dialog_to_location(downloads_folder, filename)
+
 
 class AboutPrivatebrowsing(BasePage):
     """

modules/page_object_generics.py

@@ -4,6 +4,7 @@
 from selenium.webdriver.common.by import By
 from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.remote.webelement import WebElement
+from selenium.webdriver.support import expected_conditions as EC
 
 from modules.page_base import BasePage
 
@@ -51,6 +52,53 @@ def navigate_dialog_to_location(
             sleep(1)
             keyboard.tap(Key.enter)
 
+    def wait_for_reload_and_verify_empty_field(self, old_field, field_id: str, wait_time: int = 10):
+        """
+        Wait until the page reloads (staleness of old field) and verify that the
+        new search field is visible and empty.
+
+        Args:
+            old_field: WebElement before reload.
+            field_id (str): ID of the field to locate.
+            wait_time (int): Max wait time in seconds.
+
+        Returns:
+            WebElement: The refreshed search field.
+        """
+
+        # Wait for the old element to be stale (page reload)
+        self.wait.until(EC.staleness_of(old_field))
+
+        # Wait for the new one to appear and be visible
+        new_field = self.wait.until(
+            lambda d: (
+                elem if (elem := d.find_element(By.ID, field_id)).is_displayed() else False
+            )
+        )
+
+        assert new_field.get_attribute("value") == "", "Search field should be empty after reload"
+        return new_field
+
+    def fill_field_and_verify(self, field, text: str, clear_func, assert_nonempty: bool = True):
+        """
+        Clicks the field, clears it, fills with text, and optionally asserts the value.
+
+        Args:
+            field: WebElement to interact with.
+            text: Text to enter.
+            clear_func: Callable that clears and fills the field (e.g., ba.clear_and_fill).
+            assert_nonempty: If True, asserts that field value matches `text`.
+
+        Returns:
+            WebElement: The same field after filling.
+        """
+        field.click()
+        clear_func(field, text, press_enter=False)
+        if assert_nonempty:
+            actual = field.get_attribute("value")
+            assert actual == text, f"Expected field value '{text}', but got '{actual}'"
+        return field
+
 
 class GenericPdf(BasePage):
     """

tests/password_manager/test_add_password_non_ascii_chars.py

@@ -23,16 +23,9 @@ def test_add_password_non_ascii_chars(driver: Firefox):
     # Open about:logins and click on the "Add password" button
     about_logins.open()
     original_logins_amount = len(about_logins.get_elements("login-list-item"))
-    about_logins.click_add_login_button()
 
     # Complete all the fields with valid data and click the "Save" button.
-    about_logins.create_new_login(
-        {
-            "origin": WEBSITE_ADDRESS,
-            "username": USERNAME,
-            "password": PASSWORD,
-        }
-    )
+    about_logins.add_login(WEBSITE_ADDRESS, USERNAME, PASSWORD)
 
     # Check password added in the listbox
     about_logins.wait.until(

tests/password_manager/test_add_password_save_valid_data.py

@@ -21,21 +21,15 @@ def test_add_password_save_valid_data(driver: Firefox):
     """
     C2241112 Verify that a password can be added and saved
     """
-    # instantiate object
+
+    # Instantiate object
     about_logins = AboutLogins(driver)
 
     # Open about:logins and click on the "Add password" button
     about_logins.open()
-    about_logins.click_add_login_button()
 
     # Complete all the fields with valid data and click the "Save" button.
-    about_logins.create_new_login(
-        {
-            "origin": WEBSITE_ADDRESS,
-            "username": USERNAME,
-            "password": PASSWORD,
-        }
-    )
+    about_logins.add_login(WEBSITE_ADDRESS, USERNAME, PASSWORD)
 
     # Check password added in the listbox
     logins = about_logins.get_elements("login-list-item")

tests/password_manager/test_auto_saved_generated_password_context_menu.py

@@ -1,5 +1,3 @@
-from time import sleep
-
 import pytest
 from selenium.webdriver import Firefox
 
@@ -52,8 +50,9 @@ def test_auto_saved_generated_password_context_menu(driver: Firefox):
     )
 
     # Verify the update doorhanger is displayed
-    # with driver.context(driver.CONTEXT_CHROME):
-    sleep(3)
+    nav.expect(
+        lambda _: nav.element_visible("password-notification-key")
+    )
     nav.click_on("password-notification-key")
     autofill_popup_panel.expect(
         lambda _: UPDATE_DOORHANGER_TEXT

tests/password_manager/test_autocomplete_dropdown_is_toggled_for_focused_login_fields_on_page_load.py

@@ -24,6 +24,7 @@ def add_to_prefs_list():
     return [("signon.rememberSignons", True)]
 
 
+@pytest.mark.unstable(reason="Bug 1996241")
 def test_autocomplete_dropdown_is_toggled_for_focused_login_fields_on_page_load(
     driver: Firefox,
 ):
@@ -43,22 +44,8 @@ def test_autocomplete_dropdown_is_toggled_for_focused_login_fields_on_page_load(
 
     # Save 2 set of credentials for the visited site
     about_logins.open()
-    about_logins.click_add_login_button()
-    about_logins.create_new_login(
-        {
-            "origin": BSKY_URL,
-            "username": USERNAME,
-            "password": PASSWORD,
-        }
-    )
-    about_logins.click_add_login_button()
-    about_logins.create_new_login(
-        {
-            "origin": BSKY_URL,
-            "username": USERNAME2,
-            "password": PASSWORD2,
-        }
-    )
+    about_logins.add_login(BSKY_URL, USERNAME, PASSWORD)
+    about_logins.add_login(BSKY_URL, USERNAME2, PASSWORD2)
 
     # Autocomplete dropdown is toggled for focused login fields on page load
     tabs.click_tab_by_index(1)

tests/password_manager/test_can_view_password_when_PP_enabled.py

@@ -28,16 +28,9 @@ def test_password_can_be_shown(driver: Firefox):
 
     # Open about:login and click on the "Add password" button
     about_logins.open()
-    about_logins.click_add_login_button()
 
     # Complete all the fields with valid data and click the "Save" button.
-    about_logins.create_new_login(
-        {
-            "origin": URL_TO_TEST,
-            "username": USERNAME,
-            "password": PASSWORD,
-        }
-    )
+    about_logins.add_login(URL_TO_TEST, USERNAME, PASSWORD)
 
     # Select the "Use a primary password" check box to trigger the "Change Primary Password" window
     about_prefs.open()
@@ -56,7 +49,6 @@ def test_password_can_be_shown(driver: Firefox):
     about_prefs.click_on("submit-password")
 
     # Check that the pop-up appears
-    # with driver.context(driver.CONTEXT_CHROME):
     alert = about_prefs.get_alert()
     alert.accept()
 

tests/password_manager/test_changes_made_in_edit_mode_are_saved.py

@@ -25,14 +25,8 @@ def test_changes_made_in_edit_mode_are_saved(driver: Firefox):
 
     # Open about:logins and add a new login
     about_logins.open()
-    about_logins.click_add_login_button()
-    about_logins.create_new_login(
-        {
-            "origin": URL_TO_TEST,
-            "username": USERNAME,
-            "password": PASSWORD,
-        }
-    )
+    about_logins.add_login(URL_TO_TEST, USERNAME, PASSWORD)
+
     # Click the "Edit" button
     about_logins.element_visible("edit-login")
     about_logins.click_on("edit-login")

tests/password_manager/test_multiple_saved_logins.py

@@ -47,32 +47,11 @@ def test_multiple_saved_logins(driver: Firefox, temp_selectors):
 
     # Save 3 sets of credentials for facebook
     about_logins.open()
-    about_logins.click_add_login_button()
-    about_logins.create_new_login(
-        {
-            "origin": SAUCEDEMO_URL,
-            "username": USERNAME,
-            "password": PASSWORD,
-        }
-    )
+    about_logins.add_login(SAUCEDEMO_URL, USERNAME, PASSWORD)
     time.sleep(0.8)
-    about_logins.click_add_login_button()
-    about_logins.create_new_login(
-        {
-            "origin": SAUCEDEMO_URL,
-            "username": USERNAME2,
-            "password": PASSWORD2,
-        }
-    )
+    about_logins.add_login(SAUCEDEMO_URL, USERNAME2, PASSWORD2)
     time.sleep(0.8)
-    about_logins.click_add_login_button()
-    about_logins.create_new_login(
-        {
-            "origin": SAUCEDEMO_URL,
-            "username": USERNAME3,
-            "password": PASSWORD3,
-        }
-    )
+    about_logins.add_login(SAUCEDEMO_URL, USERNAME3, PASSWORD3)
 
     # Open saucedemo.com
     web_page = GenericPage(driver, url=SAUCEDEMO_URL).open()