Merge pull request #113 from mozilla/as/https-first-mode-private-browsing

As/https first mode in private browsing

Author: soncuteanca

tests/address_bar_and_search/test_google_withads_url_bar_us.py

@@ -1,4 +1,4 @@
-import time
+from time import sleep
 
 import pytest
 from selenium.webdriver import Firefox
@@ -23,9 +23,9 @@ def test_google_withads_url_bar_us(driver: Firefox):
     util = Utilities()
 
     nav.search("iphone")
-    time.sleep(5)
+    sleep(5)
     about_telemetry = AboutTelemetry(driver).open()
-    time.sleep(5)
+    sleep(5)
 
     # Click on Raw JSON, switch tab and click on Raw Data
     about_telemetry.get_element("category-raw").click()

tests/address_bar_and_search/test_sap_google_adclick.py

@@ -1,4 +1,4 @@
-import time
+from time import sleep
 
 import pytest
 from selenium.webdriver import Firefox
@@ -25,11 +25,11 @@ def test_sap_google_adclick(driver: Firefox):
     # search and click on an ad
     nav.search("iphone")
     nav.get_element("search-result").click()
-    time.sleep(2)
+    sleep(2)
 
     # Click on Raw JSON, switch tab and click on Raw Data
     about_telemetry = AboutTelemetry(driver).open()
-    time.sleep(2)
+    sleep(2)
     about_telemetry.get_element("category-raw").click()
     about_telemetry.switch_to_new_tab()
     about_telemetry.get_element("rawdata-tab").click()

tests/security_and_privacy/test_https_enabled_private_browsing.py

@@ -0,0 +1,28 @@
+import pytest
+from selenium.webdriver import Firefox
+from selenium.webdriver.support.wait import WebDriverWait
+
+HTTP_URL = "http://example.com"
+
+
+@pytest.fixture()
+def add_prefs():
+    return [
+        ("browser.privatebrowsing.autostart", True),
+        ("dom.security.https_first_pbm", True),
+    ]
+
+
+def test_https_first_mode_in_private_browsing(driver: Firefox):
+    """
+    C1362731 Check that https First Mode is properly enabled and working in Private Browsing
+    """
+
+    # Navigate to the HTTP URL
+    driver.get(HTTP_URL)
+
+    # Wait for the URL to be redirected to HTTPS
+    assert WebDriverWait(driver, 10).until(
+        lambda d: d.current_url.startswith("https://"),
+        message=f"Final URL should use HTTPS, but was: {driver.current_url}",
+    )