Bug 1403508 - Change browser_WebRequest_ancestors.js so it doesn't matter if we fetch a favicon. r=mixedpuppy draft
authorMarco Bonardo <mbonardo@mozilla.com>
Thu, 28 Sep 2017 16:20:01 +0200
changeset 672128 7281fdabe5d7263e91d3122fe2db199e2daa6a61
parent 672127 1ca4910915c26ee538d66e4a07d447e453c88d22
child 672135 e5831e5caa035aa3d5873a580794c69e06b37979
push id82159
push usermak77@bonardo.net
push dateThu, 28 Sep 2017 19:22:03 +0000
reviewersmixedpuppy
bugs1403508
milestone58.0a1
Bug 1403508 - Change browser_WebRequest_ancestors.js so it doesn't matter if we fetch a favicon. r=mixedpuppy MozReview-Commit-ID: 8vUnhgfLyBE
toolkit/modules/tests/browser/browser_WebRequest_ancestors.js
--- a/toolkit/modules/tests/browser/browser_WebRequest_ancestors.js
+++ b/toolkit/modules/tests/browser/browser_WebRequest_ancestors.js
@@ -10,19 +10,20 @@ var {PromiseUtils} = Cu.import("resource
 add_task(async function test_ancestors_exist() {
   let deferred = PromiseUtils.defer();
   function onBeforeRequest(details) {
     info(`onBeforeRequest ${details.url}`);
     ok(typeof details.frameAncestors === "object", `ancestors exists [${typeof details.frameAncestors}]`);
     deferred.resolve();
   }
 
-  WebRequest.onBeforeRequest.addListener(onBeforeRequest, {urls: new MatchPatternSet(["http://mochi.test/*"])}, ["blocking"]);
+  // Filter on a path to ensure the root favicon request doesn't confuse the test.
+  WebRequest.onBeforeRequest.addListener(onBeforeRequest, {urls: new MatchPatternSet(["http://mochi.test/test/*"])}, ["blocking"]);
 
-  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "http://mochi.test:8888/");
+  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "http://mochi.test:8888/test/");
   await deferred.promise;
   await BrowserTestUtils.removeTab(tab);
 
   WebRequest.onBeforeRequest.removeListener(onBeforeRequest);
 });
 
 add_task(async function test_ancestors_null() {
   let deferred = PromiseUtils.defer();
@@ -42,13 +43,13 @@ add_task(async function test_ancestors_n
       xhr.onload = () => { resolve(xhr.responseText); };
       xhr.onerror = () => { reject(xhr.status); };
       // use a different contextId to avoid auth cache.
       xhr.setOriginAttributes({userContextId: 1});
       xhr.send();
     });
   }
 
-  await fetch("http://mochi.test:8888/");
+  await fetch("http://mochi.test:8888/test/");
   await deferred.promise;
 
   WebRequest.onBeforeRequest.removeListener(onBeforeRequest);
 });