Bug 1723496: Update tests within caps/ to work with https-first enabl…

…ed r=nika Differential Revision: https://phabricator.services.mozilla.com/D121529
iaxat · Aug 12, 2021 · 55f1807 · 55f1807
1 parent 663dd64
commit 55f1807
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/caps/tests/mochitest/browser_checkloaduri.js b/caps/tests/mochitest/browser_checkloaduri.js
@@ -293,6 +293,13 @@ function testURL(
 }
 
 add_task(async function() {
+  // In this test we want to verify both http and https load
+  // restrictions, hence we explicitly switch off the https-first
+  // upgrading mechanism.
+  await SpecialPowers.pushPrefEnv({
+    set: [["dom.security.https_first", false]],
+  });
+
   await kAboutPagesRegistered;
   let baseFlags = ssm.STANDARD | ssm.DONT_REPORT_ERRORS;
   for (let [sourceString, targetsAndExpectations] of URLs) {

diff --git a/caps/tests/unit/test_precursor_principal.js b/caps/tests/unit/test_precursor_principal.js
@@ -95,6 +95,9 @@ server.registerPathHandler("/client_replace", (request, response) => {
 });
 
 add_task(async function sandboxed_precursor() {
+  // Bug 1725345: Make XPCShellContentUtils.createHttpServer support https
+  Services.prefs.setBoolPref("dom.security.https_first", false);
+
   let extension = await ExtensionTestUtils.loadExtension({
     manifest: {
       permissions: ["webRequest", "webRequestBlocking", "<all_urls>"],
@@ -253,4 +256,5 @@ add_task(async function sandboxed_precursor() {
 
     await page.close();
   }
+  Services.prefs.clearUserPref("dom.security.https_first");
 });