Merge pull request #540 from mozilla/tracy/refix_csv_tests

Rollback to Downloads as default export directory

Author: Tracy-Walker

modules/page_object_about_pages.py

@@ -179,17 +179,17 @@ def check_logins_present(
         else:
             assert expected_logins == actual_logins
 
-    def get_documents_dir(self) -> str:
+    def get_downloads_dir(self) -> str:
         # Return full path to Documents directory
         home = os.path.expanduser("~")
-        export_dir = os.path.join(home, "Documents")
+        export_dir = os.path.join(home, "Downloads")
         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):
+        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")
             if delete_files_regex.match(file):
                 os.remove(passwords_csv)

tests/downloads/test_add_zip_type.py

@@ -16,7 +16,6 @@ def test_case():
 
 
 ZIP_URL = "https://github.com/microsoft/api-guidelines"
-ANGLE_BRACKET_SVG_PATH = "m11.28 3.22 4.25 4.25a.75.75 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734L13.94 8l-3.72-3.72a.749.749 0 0 1 .326-1.275.749.749 0 0 1 .734.215Zm-6.56 0a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L2.06 8l3.72 3.72a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L.47 8.53a.75.75 0 0 1 0-1.06Z"
 
 
 @pytest.fixture()

tests/password_manager/test_password_csv_correctness.py

@@ -1,9 +1,7 @@
 import csv
 import os
 import re
-import sys
 import time
-from os import environ
 
 import pytest
 from pynput.keyboard import Controller, Key
@@ -16,11 +14,10 @@ def test_case():
     return "2241522"
 
 
-MAC_GHA = environ.get("GITHUB_ACTIONS") == "true" and sys.platform.startswith("darwin")
-
-
 @pytest.mark.headed
-def test_password_csv_correctness(driver_and_saved_logins, home_folder, sys_platform):
+def test_password_csv_correctness(
+    driver_and_saved_logins, downloads_folder, sys_platform
+):
     """
     C2241522: Verify than an exported password.csv file displays the correct information
     """
@@ -43,8 +40,7 @@ def test_password_csv_correctness(driver_and_saved_logins, home_folder, sys_plat
     keyboard.tap(Key.enter)
 
     # 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")
+    csv_file = os.path.join(downloads_folder, "passwords.csv")
     about_logins.wait.until(lambda _: os.path.exists(csv_file))
 
     # Verify the contents of the exported csv file

tests/password_manager/test_password_csv_export.py

@@ -1,7 +1,5 @@
 import os
-import sys
 import time
-from os import environ
 
 import pytest
 from pynput.keyboard import Controller, Key
@@ -14,12 +12,9 @@ def test_case():
     return "2241521"
 
 
-MAC_GHA = environ.get("GITHUB_ACTIONS") == "true" and sys.platform.startswith("darwin")
-
-
 @pytest.mark.headed
 def test_password_csv_export(
-    driver_and_saved_logins, home_folder, sys_platform, opt_ci
+    driver_and_saved_logins, downloads_folder, sys_platform, opt_ci
 ):
     """
     C2241521: Verify that a password.csv file can be exported from about:logins
@@ -43,8 +38,7 @@ def test_password_csv_export(
     keyboard.tap(Key.enter)
 
     # 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")
+    csv_file = os.path.join(downloads_folder, "passwords.csv")
     about_logins.wait.until(lambda _: os.path.exists(csv_file))
 
     # Delete the password.csv created