Merge branch 'main' into philimon/autofill_refactor

Author: philimon-reset

.github/workflows/check-beta.yml

@@ -2,7 +2,7 @@ name: Check new beta version
 
 on:
   schedule:
-    - cron: "12 */1 * * *"
+    - cron: "25 */1 * * *"
 env:
   LATEST: ""
 permissions:

modules/page_object_about_pages.py

@@ -179,14 +179,17 @@ def check_logins_present(
         else:
             assert expected_logins == actual_logins
 
-    def remove_password_csv(self, home_folder):
-        # Delete password.csv, if there is one in test location
-        if self.sys_platform == "Linux":
-            downloads_folder = os.getcwd()
-        else:
-            downloads_folder = os.path.join(home_folder, "Downloads")
-        passwords_csv = os.path.join(downloads_folder, "passwords.csv")
-        for file in os.listdir(downloads_folder):
+    def get_documents_dir(self) -> str:
+        # Return full path to Documents directory
+        home = os.path.expanduser("~")
+        export_dir = os.path.join(home, "Documents")
+        return export_dir
+
+    def remove_password_csv(self):
+        # Delete password.csv, if there is one in the export location
+        documents_dir = self.get_documents_dir()
+        passwords_csv = os.path.join(documents_dir, "passwords.csv")
+        for file in os.listdir(documents_dir):
             delete_files_regex = re.compile(r"\bpasswords.csv\b")
             if delete_files_regex.match(file):
                 os.remove(passwords_csv)

modules/page_object_generics.py

@@ -77,27 +77,29 @@ def add_image(self, image_path: str, sys_platform: str) -> BasePage:
         """Add an image to a pdf file"""
         self.get_element("toolbar-add-image").click()
         self.get_element("toolbar-add-image-confirm").click()
-        sleep(3)
+        sleep(1.5)
         from pynput.keyboard import Controller, Key
 
         keyboard = Controller()
         if sys_platform == "Darwin" or sys_platform == "Linux":
             keyboard.type("/")
-            sleep(3)
+            sleep(1.5)
             keyboard.type(image_path.lstrip("/"))
         else:
-            sleep(2)
+            sleep(1.5)
             keyboard.type(image_path)
         sleep(1)
         keyboard.press(Key.enter)
         keyboard.release(Key.enter)
-        sleep(2)
+        sleep(1)
         keyboard.press(Key.enter)
         keyboard.release(Key.enter)
-        sleep(2)
+        sleep(1.5)
         for _ in range(3):
             keyboard.tap(Key.tab)
+        sleep(0.5)
         keyboard.tap(Key.enter)
+        sleep(1)
         return self
 
     def fill_element(self, element: str, data: str) -> BasePage:

tests/address_bar_and_search/test_preferences_all_toggles_enabled.py

@@ -14,10 +14,6 @@ def test_case():
     return "1618400"
 
 
-@pytest.mark.skipif(
-    sys.platform.lower().startswith("linux"),
-    reason="Test unstable in CI on Linux. see bug https://bugzilla.mozilla.org/show_bug.cgi?id=1951672",
-)
 def test_preferences_all_toggles_enabled(driver: Firefox):
     """
     C1618400: Preferences - All toggles buttons Enabled

tests/password_manager/test_password_csv_correctness.py

@@ -20,47 +20,39 @@ def test_case():
 
 
 @pytest.mark.headed
-@pytest.mark.skipif(MAC_GHA, reason="Test unstable in MacOS Github Actions")
-@pytest.mark.skipif(
-    sys.platform.lower().startswith("linux"),
-    reason="Test unstable in CI on Linux. see bug https://bugzilla.mozilla.org/show_bug.cgi?id=1951666",
-)
 def test_password_csv_correctness(driver_and_saved_logins, home_folder, sys_platform):
     """
-    C2241522: Check that password.csv displays the correct information
+    C2241522: Verify than an exported password.csv file displays the correct information
     """
     # Initializing objects
     (driver, usernames, logins) = driver_and_saved_logins
     about_logins = AboutLogins(driver)
     keyboard = Controller()
 
-    # Ensure the Downloads folder doesn't contain a passwords.csv file
-    about_logins.remove_password_csv(home_folder)
+    # Ensure the export target folder doesn't contain a passwords.csv file
+    about_logins.remove_password_csv()
 
     # Click on buttons to export passwords
     about_logins.open()
     about_logins.click_on("menu-button")
     about_logins.click_on("export-passwords-button")
     about_logins.click_on("continue-export-button")
 
-    # Download the password file
+    # Export the password file
     time.sleep(5)
     keyboard.tap(Key.enter)
 
-    # Verify that the file exists
-    if sys_platform == "Linux":
-        downloads_folder = os.getcwd()
-    else:
-        downloads_folder = os.path.join(home_folder, "Downloads")
-    passwords_csv = os.path.join(downloads_folder, "passwords.csv")
-    about_logins.wait.until(lambda _: os.path.exists(passwords_csv))
+    # Verify the exported csv file is present in the target folder
+    documents_directory = about_logins.get_documents_dir()
+    csv_file = os.path.join(documents_directory, "passwords.csv")
+    about_logins.wait.until(lambda _: os.path.exists(csv_file))
 
-    # Verify the results
+    # Verify the contents of the exported csv file
     guid_pattern = re.compile(
         r"{[0-9a-z]{8}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{12}}"
     )
     time_pattern = re.compile(r"[0-9]{10}")
-    with open(passwords_csv) as pw:
+    with open(csv_file) as pw:
         reader = csv.DictReader(pw)
         actual_logins = {}
         for row in reader:
@@ -74,4 +66,4 @@ def test_password_csv_correctness(driver_and_saved_logins, home_folder, sys_plat
     about_logins.check_logins_present(actual_logins, logins)
 
     # Delete the password.csv created
-    about_logins.remove_password_csv(home_folder)
+    about_logins.remove_password_csv()

tests/password_manager/test_password_csv_export.py

@@ -18,42 +18,34 @@ def test_case():
 
 
 @pytest.mark.headed
-@pytest.mark.skipif(MAC_GHA, reason="Test unstable in MacOS Github Actions")
-@pytest.mark.skipif(
-    sys.platform.lower().startswith("linux"),
-    reason="Test unstable in CI on Linux. see bug https://bugzilla.mozilla.org/show_bug.cgi?id=1951666",
-)
 def test_password_csv_export(
     driver_and_saved_logins, home_folder, sys_platform, opt_ci
 ):
     """
-    C2241521: Check that password.csv can be downloaded from about:logins
+    C2241521: Verify that a password.csv file can be exported from about:logins
     """
     # Initializing objects
     (driver, usernames, logins) = driver_and_saved_logins
     about_logins = AboutLogins(driver)
     keyboard = Controller()
 
-    # Ensure the Downloads folder doesn't contain a passwords.csv file
-    about_logins.remove_password_csv(home_folder)
+    # Ensure the export target folder doesn't contain a passwords.csv file
+    about_logins.remove_password_csv()
 
     # Click on buttons to export passwords
     about_logins.open()
     about_logins.click_on("menu-button")
     about_logins.click_on("export-passwords-button")
     about_logins.click_on("continue-export-button")
 
-    # Download the password file
+    # Export the password file
     time.sleep(5)
     keyboard.tap(Key.enter)
 
-    # Verify that the file exists
-    if sys_platform == "Linux":
-        downloads_folder = os.getcwd()
-    else:
-        downloads_folder = os.path.join(home_folder, "Downloads")
-    passwords_csv = os.path.join(downloads_folder, "passwords.csv")
-    about_logins.wait.until(lambda _: os.path.exists(passwords_csv))
+    # Verify the exported csv file is present in the target folder
+    documents_directory = about_logins.get_documents_dir()
+    csv_file = os.path.join(documents_directory, "passwords.csv")
+    about_logins.wait.until(lambda _: os.path.exists(csv_file))
 
     # Delete the password.csv created
-    about_logins.remove_password_csv(home_folder)
+    about_logins.remove_password_csv()

tests/pdf_viewer/test_add_image_pdf.py

@@ -1,5 +1,5 @@
-import os
 from pathlib import Path
+from time import sleep
 
 import pytest
 from selenium.webdriver import Firefox
@@ -27,6 +27,7 @@ def test_case():
 def add_to_prefs_list():
     return [
         ("browser.ml.enable", True),
+        ("pdfjs.enableAltText", False),
         ("pdfjs.enableUpdatedAddImage", True),
     ]
 
@@ -38,14 +39,14 @@ def test_add_image_pdf(driver: Firefox, sys_platform, pdf_viewer: GenericPdf):
 
     Arguments:
         sys_platform: Current System Platform Type
-        pdf_viewer: instance of GenericPdf with correct path.
+        pdf_viewer: Instance of GenericPdf with correct path.
     """
     context_menu = ContextMenu(driver)
     image_path = Path("data") / IMAGE_FILE_NAME
     pdf_viewer.add_image(str(image_path.absolute()), sys_platform)
 
-    pdf_viewer.element_exists(ADDED_IMAGE_ELEMENT)
     pdf_viewer.element_visible(ADDED_IMAGE_ELEMENT)
+    sleep(0.5)
 
     pdf_viewer.context_click(ADDED_IMAGE_ELEMENT)
     context_menu.click_and_hide_menu(DELETE_MENU_OPTION)

tests/tabs/test_mute_tabs.py

@@ -3,15 +3,26 @@
 import pytest
 from selenium.webdriver import Firefox
 from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
 
 from modules.browser_object import TabBar
 
+PLAY_BUTTON_SELECTOR = ".ytp-play-button"
+COOKIE_CONSENT_SELECTOR = (
+    "button[aria-label^='Accept all'], button[aria-label^='Accept the use']"
+)
+
 
 @pytest.fixture()
 def test_case():
     return "134719"
 
 
+@pytest.fixture()
+def add_to_prefs_list():
+    return [("network.cookie.cookieBehavior", "2")]
+
+
 GHA = environ.get("GITHUB_ACTIONS") == "true"
 
 
@@ -21,8 +32,11 @@ def test_mute_unmute_tab(screenshot, driver: Firefox, video_url: str):
     """C134719, test that tabs can be muted and unmuted"""
     tabs = TabBar(driver)
     driver.get(video_url)
-    play_button = driver.find_element(By.CSS_SELECTOR, ".ytp-play-button")
+    tabs.expect(EC.title_contains("Top 10"))
+
+    play_button = driver.find_element(By.CSS_SELECTOR, PLAY_BUTTON_SELECTOR)
     play_button.click()
+
     with driver.context(driver.CONTEXT_CHROME):
         tabs.expect_tab_sound_status(1, tabs.MEDIA_STATUS.PLAYING)
         tabs.click_tab_mute_button(1)