Merge pull request #466 from mozilla/tracy/work-on-https-first

Maybe?

Author: Tracy-Walker

l10n_CM/Unified/test_demo_ad_name_org_captured_in_doorhanger_and_stored.py

@@ -5,15 +5,17 @@
 from modules.page_object_about_pages import AboutConfig
 from modules.page_object_autofill import AddressFill
 from modules.page_object_prefs import AboutPrefs
-from modules.util import Utilities, BrowserActions
+from modules.util import BrowserActions, Utilities
 
 
 @pytest.fixture()
 def test_case():
     return "2888701"
 
 
-def test_demo_ad_name_org_captured_in_doorhanger_and_stored(driver: Firefox, region: str):
+def test_demo_ad_name_org_captured_in_doorhanger_and_stored(
+    driver: Firefox, region: str
+):
     """
     C2888701 - Verify name/org fields are captured in the Capture Doorhanger and stored in about:preferences
     """
@@ -55,8 +57,7 @@ def test_demo_ad_name_org_captured_in_doorhanger_and_stored(driver: Firefox, reg
     elements = about_prefs.get_elements("saved-addresses-values")
     expected_values = [expected_name, expected_org]
     found_name_org = any(
-        all(value in element.text for value in expected_values)
-        for element in elements
+        all(value in element.text for value in expected_values) for element in elements
     )
     assert (
         found_name_org

modules/page_object_prefs.py

@@ -394,11 +394,12 @@ def click_popup_panel_button(self, field: str) -> BasePage:
             self.get_element("panel-popup-button", labels=[field]).click()
         return self
 
-    def select_https_only_setting(self, option_id: HttpsOnlyStatus) -> BasePage:
+    def select_https_only_setting(self, option_id: "HttpsOnlyStatus") -> BasePage:
         """
         Click the HTTPS Only option given
         """
         self.find_in_settings("HTTPS")
+        self.element_clickable(option_id)
         self.click_on(option_id)
         self.element_attribute_contains(option_id, "checked", "")
         return self

tests/security_and_privacy/test_https_enabled_private_browsing.py

@@ -14,7 +14,6 @@ def test_case():
 HTTP_SITE = "http://example.com"
 
 
-@pytest.mark.unstable
 def test_https_first_mode_in_private_browsing(driver: Firefox):
     """
     C1362731 Check that https First Mode is properly enabled and working in Private Browsing