Merge pull request #585 from mozilla/fix-import-chrome-bookmarks-windows

Fix import chrome bookmarks windows

Author: Tracy-Walker

modules/page_object_prefs.py

@@ -34,7 +34,7 @@ def __init__(self, driver: Firefox, **kwargs):
         super().__init__(driver, **kwargs)
         self.driver = driver
 
-    # number of tabs to reach the country tab
+    # Number of tabs to reach the country tab
     TABS_TO_COUNTRY = 6
     TABS_TO_SAVE_CC = 5
 
@@ -49,7 +49,7 @@ def __init__(self):
     HTTPS_ONLY_STATUS = HttpsOnlyStatus()
 
     # Function Organization
-    ## Search and Settings
+    # Search and Settings
     def search_engine_dropdown(self) -> Dropdown:
         """Returns the Dropdown region for search engine prefs"""
         return Dropdown(
@@ -120,11 +120,11 @@ def select_content_and_action(self, content_type: str, action: str) -> BasePage:
 
     def get_history_menulist(self) -> WebElement:
         """
-        Gets the webelement for the list of history items that appear in about:preferences
+        Gets the web element for the list of history items that appear in about:preferences
         """
         return self.get_element("history_menulist")
 
-    ## Payment and Address Management
+    # Payment and Address Management
     def verify_cc_json(
         self, cc_info_json: dict, credit_card_fill_obj: CreditCardBase
     ) -> BasePage:
@@ -384,7 +384,7 @@ def extract_address_data_from_saved_addresses_entry(
             telephone=util.normalize_regional_phone_numbers(fields.get("tel"), region),
         )
 
-    ## UI Navigation and Iframe Handling
+    # UI Navigation and Iframe Handling
     def get_saved_payments_popup_iframe(self) -> WebElement:
         """
         Returns the iframe object for the dialog panel in the popup
@@ -457,7 +457,7 @@ def get_password_exceptions_popup_iframe(self) -> WebElement:
         iframe = self.get_element("browser-popup")
         return iframe
 
-    ## Data Extraction and Processing
+    # Data Extraction and Processing
     def set_country_autofill_panel(self, country: str) -> BasePage:
         """Sets the country value in the autofill view"""
         select_country = Select(self.driver.find_element(By.ID, "country"))
@@ -530,8 +530,8 @@ def get_manage_data_site_element(self, site: str) -> WebElement:
         element = self.get_element("manage-cookies-site", labels=[site])
         return element
 
-    ## Utility Functions
-    def import_bookmarks(self, browser_name: str) -> BasePage:
+    # Utility Functions
+    def import_bookmarks(self, browser_name: str, platform) -> BasePage:
         """
         Press the import browser data button
         """
@@ -556,6 +556,13 @@ def import_bookmarks(self, browser_name: str) -> BasePage:
             tries += 1
 
         self.click_on("migration-import-button")
+        sleep(1)
+
+        # On Windows, Tab to and use the Skip button
+        if platform.lower().startswith("win"):
+            for _ in range(3):
+                self.actions.send_keys(Keys.TAB).perform()
+            self.actions.send_keys(Keys.RETURN).perform()
 
         # There are two messages that indicate a successful migration
         self.wait.until(

tests/bookmarks_and_history/test_import_bookmarks_chrome.py

@@ -77,7 +77,7 @@ def chrome_bookmarks(driver: Firefox, sys_platform, home_folder, tmp_path):
         logging.warning(e)
         yield None
 
-    # Teardown: We don't actually want to destroy the Chrome setup of local users
+    # Teardown: We don't want to destroy the Chrome setup of local users
     if os.path.exists(bookmarks_target):
         os.remove(bookmarks_target)
     if fake_install:
@@ -91,12 +91,12 @@ def chrome_bookmarks(driver: Firefox, sys_platform, home_folder, tmp_path):
         os.rename(tmp_path / "Bookmarks", bookmarks_target)
 
 
-def test_chrome_bookmarks_imported(chrome_bookmarks, driver: Firefox):
+def test_chrome_bookmarks_imported(chrome_bookmarks, driver: Firefox, sys_platform):
     if not chrome_bookmarks:
         pytest.skip("Google Chrome not installed or directory could not be created")
     about_prefs = AboutPrefs(driver, category="General")
     about_prefs.open()
     about_prefs.click_on("import-browser-data")
-    about_prefs.import_bookmarks("Chrome")
+    about_prefs.import_bookmarks("Chrome", sys_platform)
     toolbar = Navigation(driver)
     toolbar.confirm_bookmark_exists(TEST_PAGE_TITLE)