Merge pull request #519 from mozilla/philimon/default_profile_fix

philimon/default_profile_fix

Author: philimon-reset

tests/profile/conftest.py

@@ -1,4 +1,7 @@
 import pytest
+from selenium.webdriver import Firefox
+
+from modules.page_object_about_pages import AboutProfiles
 
 
 @pytest.fixture()
@@ -14,6 +17,12 @@ def prefs_list(add_to_prefs_list: dict):
     return prefs
 
 
+@pytest.fixture()
+def about_profiles(driver: Firefox):
+    ap = AboutProfiles(driver)
+    yield ap
+
+
 @pytest.fixture()
 def add_to_prefs_list():
     return []

tests/profile/test_set_default_profile.py

@@ -77,11 +77,16 @@ def create_profiles(profile_paths, sys_platform):
         os.remove(profile_file)
 
 
-def test_set_default_profile(driver: Firefox, opt_ci):
+def test_set_default_profile(
+    driver: Firefox, opt_ci: bool, about_profiles: AboutProfiles
+):
     """
-    C130792: Set the default profile through the firefox browser
+    C130792: Set the default profile through the firefox
+
+    Arguments:
+        about_profiles: AboutProfiles page object model.
+        opt_ci: Boolean to verify if test is run in ci.
     """
-    about_profiles = AboutProfiles(driver)
 
     # Get the profiles container, extract all relevant children under it.
     about_profiles.open()
@@ -105,28 +110,29 @@ def test_set_default_profile(driver: Firefox, opt_ci):
             logging.info(f"Found the default profile at {i}!")
             cur_default = i
             break
+    test_profile_idx = 0 if cur_default != 0 else cur_default + 1
 
     # Set test profile as the default and verify the rows
     logging.info("Preparing to set test profile to the default.")
     about_profiles.get_element(
         "profile-container-item-button",
-        parent_element=profiles[-1],
+        parent_element=profiles[test_profile_idx],
         labels=["profiles-set-as-default"],
     ).click()
 
     # Refetch data to ensure no stale elements
     profiles = about_profiles.get_all_children("profile-container")
-
-    table_rows = about_profiles.get_element(
+    test_profile_rows = about_profiles.get_element(
         "profile-container-item-table-row",
         multiple=True,
-        parent_element=profiles[-1],
+        parent_element=profiles[test_profile_idx],
+    )
+    default_profile_information = about_profiles.get_element(
+        "profile-container-item-table-row-value", parent_element=test_profile_rows[0]
     )
+
     about_profiles.wait.until(
-        lambda _: about_profiles.get_element(
-            "profile-container-item-table-row-value", parent_element=table_rows[0]
-        ).get_attribute("innerHTML")
-        == "yes"
+        lambda _: default_profile_information.get_attribute("innerHTML") == "yes"
     )
     logging.info("Verified that test profile was set to the default.")