repair issues with save dialogs (#555)

* repair issues with save dialogs

* remove debug

* lint

Author: ben-c-at-moz

l10n_CM/Unified/test_demo_cc_2_preview.py

@@ -3,7 +3,7 @@
 
 from modules.browser_object_autofill_popup import AutofillPopup
 from modules.page_object import AboutPrefs, CreditCardFill
-from modules.util import BrowserActions, Utilities
+from modules.util import Utilities
 
 
 @pytest.fixture()

l10n_CM/Unified/test_demo_cc_3_autofill.py

@@ -2,7 +2,7 @@
 from selenium.webdriver import Firefox
 
 from modules.browser_object_autofill_popup import AutofillPopup
-from modules.page_object import AboutPrefs, CreditCardFill
+from modules.page_object import CreditCardFill
 from modules.util import Utilities
 
 

modules/data/generic_pdf.components.json

@@ -152,7 +152,7 @@
     },
 
     "added-goomy-image": {
-        "selectorData": "canvas[aria-label='goomy.png']",
+        "selectorData": "[data-l10n-id='pdfjs-editor-stamp-editor'][aria-description='goomy.png']",
         "strategy": "css",
         "groups": []
     }

modules/page_object_about_pages.py

@@ -1,7 +1,6 @@
 import logging
 import os
 import re
-import sys
 
 from pypom import Page
 from selenium.common.exceptions import (
@@ -179,15 +178,8 @@ def check_logins_present(
         else:
             assert expected_logins == actual_logins
 
-    def get_downloads_dir(self) -> str:
-        # Return full path to Documents directory
-        home = os.path.expanduser("~")
-        export_dir = os.path.join(home, "Downloads")
-        return export_dir
-
-    def remove_password_csv(self):
+    def remove_password_csv(self, downloads_dir):
         # Delete password.csv, if there is one in the export location
-        downloads_dir = self.get_downloads_dir()
         passwords_csv = os.path.join(downloads_dir, "passwords.csv")
         for file in os.listdir(downloads_dir):
             delete_files_regex = re.compile(r"\bpasswords.csv\b")

modules/page_object_generics.py

@@ -15,6 +15,23 @@ class GenericPage(BasePage):
 
     URL_TEMPLATE = "{url}"
 
+    def navigate_dialog_to_location(self, location: str) -> BasePage:
+        sleep(1.5)
+        from pynput.keyboard import Controller, Key
+
+        keyboard = Controller()
+        if self.sys_platform() == "Darwin" or self.sys_platform() == "Linux":
+            keyboard.type("/")
+            sleep(1.5)
+            keyboard.type(location.lstrip("/"))
+        else:
+            sleep(1.5)
+            keyboard.type(location)
+        sleep(1)
+        keyboard.press(Key.enter)
+        sleep(1)
+        keyboard.press(Key.enter)
+
 
 class GenericPdf(BasePage):
     """

modules/util.py

@@ -24,7 +24,6 @@
 from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.remote.shadowroot import ShadowRoot
 from selenium.webdriver.remote.webelement import WebElement
-from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.wait import WebDriverWait
 
 from modules.classes.autofill_base import AutofillAddressBase
@@ -225,7 +224,7 @@ def create_localized_faker(self, country_code: str):
             faker.add_provider(internet)
             faker.add_provider(misc)
             return faker, True
-        except AttributeError as e:
+        except AttributeError:
             logging.error(
                 f"Invalid locale `{locale}`. Faker instance could not be created."
             )

tests/form_autofill/test_enable_disable_autofill.py

@@ -1,7 +1,6 @@
 import pytest
 from selenium.webdriver import Firefox
 
-from modules.browser_object import Navigation
 from modules.browser_object_autofill_popup import AutofillPopup
 from modules.page_object import AboutPrefs
 from modules.page_object_autofill import AddressFill

tests/password_manager/test_password_csv_correctness.py

@@ -4,9 +4,8 @@
 import time
 
 import pytest
-from pynput.keyboard import Controller, Key
 
-from modules.page_object import AboutLogins
+from modules.page_object import AboutLogins, GenericPage
 
 
 @pytest.fixture()
@@ -24,10 +23,10 @@ def test_password_csv_correctness(
     # Initializing objects
     (driver, usernames, logins) = driver_and_saved_logins
     about_logins = AboutLogins(driver)
-    keyboard = Controller()
+    page = GenericPage(driver)
 
     # Ensure the export target folder doesn't contain a passwords.csv file
-    about_logins.remove_password_csv()
+    about_logins.remove_password_csv(downloads_folder)
 
     # Click on buttons to export passwords
     about_logins.open()
@@ -36,8 +35,8 @@ def test_password_csv_correctness(
     about_logins.click_on("continue-export-button")
 
     # Export the password file
-    time.sleep(5)
-    keyboard.tap(Key.enter)
+    time.sleep(3)
+    page.navigate_dialog_to_location(downloads_folder)
 
     # Verify the exported csv file is present in the target folder
     csv_file = os.path.join(downloads_folder, "passwords.csv")
@@ -62,4 +61,4 @@ def test_password_csv_correctness(
     about_logins.check_logins_present(actual_logins, logins)
 
     # Delete the password.csv created
-    about_logins.remove_password_csv()
+    about_logins.remove_password_csv(downloads_folder)

tests/password_manager/test_password_csv_export.py

@@ -4,7 +4,7 @@
 import pytest
 from pynput.keyboard import Controller, Key
 
-from modules.page_object import AboutLogins
+from modules.page_object import AboutLogins, GenericPage
 
 
 @pytest.fixture()
@@ -22,10 +22,11 @@ def test_password_csv_export(
     # Initializing objects
     (driver, usernames, logins) = driver_and_saved_logins
     about_logins = AboutLogins(driver)
+    page = GenericPage(driver)
     keyboard = Controller()
 
     # Ensure the export target folder doesn't contain a passwords.csv file
-    about_logins.remove_password_csv()
+    about_logins.remove_password_csv(downloads_folder)
 
     # Click on buttons to export passwords
     about_logins.open()
@@ -34,12 +35,14 @@ def test_password_csv_export(
     about_logins.click_on("continue-export-button")
 
     # Export the password file
-    time.sleep(5)
+    time.sleep(3)
+    page.navigate_dialog_to_location(downloads_folder)
+
     keyboard.tap(Key.enter)
 
     # Verify the exported csv file is present in the target folder
     csv_file = os.path.join(downloads_folder, "passwords.csv")
     about_logins.wait.until(lambda _: os.path.exists(csv_file))
 
     # Delete the password.csv created
-    about_logins.remove_password_csv()
+    about_logins.remove_password_csv(downloads_folder)

tests/pdf_viewer/test_download_triggered_on_content_disposition_attachment.py

@@ -4,7 +4,7 @@
 from selenium.webdriver import Firefox
 
 from modules.browser_object import Navigation, TabBar
-from modules.page_object import AboutPrefs, GenericPdf
+from modules.page_object import AboutPrefs
 from modules.util import BrowserActions