Merge pull request #526 from mozilla/vs/fix-theme-devedition

vs/fix devedition theme

Author: vsangereanMOZ

modules/page_object_prefs.py

@@ -523,6 +523,13 @@ def activate_theme(
             else:
                 return background_color
 
+    def is_devedition(self):
+        active_theme_el = self.driver.find_element(
+            By.CSS_SELECTOR, ".card.addon[active] h3.addon-name"
+        )
+        active_theme_name = active_theme_el.text.lower()
+        return "dark" in active_theme_name or "developer edition" in active_theme_name
+
     def enabled_theme_matches(self, expected_theme: str) -> bool:
         """
         Check the enabled theme name against any string.

tests/theme_and_toolbar/test_customize_themes_and_redirect.py

@@ -40,6 +40,19 @@ def test_open_addons(driver: Firefox, theme_name: str):
     nav = Navigation(driver)
     abt_addons = AboutAddons(driver).open()
     abt_addons.choose_sidebar_option("theme")
+
+    # Dynamically detect if running Developer Edition
+    if abt_addons.is_devedition():
+        # Adjust expectations for Developer Edition
+        if theme_name == "firefox-compact-dark_mozilla_org-heading":
+            # Already default on Developer Edition; skip activation/assertion
+            pytest.skip("Compact Dark is default on DevEdition, skipping.")
+    else:
+        # Adjust expectations for standard Firefox
+        if theme_name == "firefox-compact-light_mozilla_org-heading":
+            # Already default on Firefox standard; skip activation/assertion
+            pytest.skip("Compact Light is default on Firefox, skipping.")
+
     abt_addons.activate_theme(nav, theme_name, themes[theme_name])