mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-09 21:00:42 +02:00
***
Bug 1514594: Part 3a - Change ChromeUtils.import to return an exports object; not pollute global. r=mccr8
This changes the behavior of ChromeUtils.import() to return an exports object,
rather than a module global, in all cases except when `null` is passed as a
second argument, and changes the default behavior not to pollute the global
scope with the module's exports. Thus, the following code written for the old
model:
ChromeUtils.import("resource://gre/modules/Services.jsm");
is approximately the same as the following, in the new model:
var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
Since the two behaviors are mutually incompatible, this patch will land with a
scripted rewrite to update all existing callers to use the new model rather
than the old.
***
Bug 1514594: Part 3b - Mass rewrite all JS code to use the new ChromeUtils.import API. rs=Gijs
This was done using the followng script:
https://bitbucket.org/kmaglione/m-c-rewrites/src/tip/processors/cu-import-exports.jsm
***
Bug 1514594: Part 3c - Update ESLint plugin for ChromeUtils.import API changes. r=Standard8
Differential Revision: https://phabricator.services.mozilla.com/D16747
***
Bug 1514594: Part 3d - Remove/fix hundreds of duplicate imports from sync tests. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16748
***
Bug 1514594: Part 3e - Remove no-op ChromeUtils.import() calls. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16749
***
Bug 1514594: Part 3f.1 - Cleanup various test corner cases after mass rewrite. r=Gijs
***
Bug 1514594: Part 3f.2 - Cleanup various non-test corner cases after mass rewrite. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16750
--HG--
extra : rebase_source : 359574ee3064c90f33bf36c2ebe3159a24cc8895
extra : histedit_source : b93c8f42808b1599f9122d7842d2c0b3e656a594%2C64a3a4e3359dc889e2ab2b49461bab9e27fc10a7
80 lines
2.1 KiB
JavaScript
80 lines
2.1 KiB
JavaScript
"use strict";
|
|
|
|
var {WebRequest} = ChromeUtils.import("resource://gre/modules/WebRequest.jsm");
|
|
|
|
const BASE = "http://example.com/browser/toolkit/modules/tests/browser";
|
|
const URL = BASE + "/WebRequest_dynamic.sjs";
|
|
|
|
var countBefore = 0;
|
|
var countAfter = 0;
|
|
|
|
function onBeforeSendHeaders(details) {
|
|
if (details.url != URL) {
|
|
return undefined;
|
|
}
|
|
|
|
countBefore++;
|
|
|
|
info(`onBeforeSendHeaders ${details.url}`);
|
|
let found = false;
|
|
let headers = [];
|
|
for (let {name, value} of details.requestHeaders) {
|
|
info(`Saw header ${name} '${value}'`);
|
|
if (name == "Cookie") {
|
|
is(value, "foopy=1", "Cookie is correct");
|
|
headers.push({name, value: "blinky=1"});
|
|
found = true;
|
|
} else {
|
|
headers.push({name, value});
|
|
}
|
|
}
|
|
ok(found, "Saw cookie header");
|
|
|
|
return {requestHeaders: headers};
|
|
}
|
|
|
|
function onResponseStarted(details) {
|
|
if (details.url != URL) {
|
|
return;
|
|
}
|
|
|
|
countAfter++;
|
|
|
|
info(`onResponseStarted ${details.url}`);
|
|
let found = false;
|
|
for (let {name, value} of details.responseHeaders) {
|
|
info(`Saw header ${name} '${value}'`);
|
|
if (name == "Set-Cookie") {
|
|
is(value, "dinky=1", "Cookie is correct");
|
|
found = true;
|
|
}
|
|
}
|
|
ok(found, "Saw cookie header");
|
|
}
|
|
|
|
add_task(async function filter_urls() {
|
|
// First load the URL so that we set cookie foopy=1.
|
|
gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser, URL);
|
|
await waitForLoad();
|
|
gBrowser.removeCurrentTab();
|
|
|
|
// Now load with WebRequest set up.
|
|
WebRequest.onBeforeSendHeaders.addListener(onBeforeSendHeaders, null, ["blocking"]);
|
|
WebRequest.onResponseStarted.addListener(onResponseStarted, null);
|
|
|
|
gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser, URL);
|
|
|
|
await waitForLoad();
|
|
|
|
gBrowser.removeCurrentTab();
|
|
|
|
WebRequest.onBeforeSendHeaders.removeListener(onBeforeSendHeaders);
|
|
WebRequest.onResponseStarted.removeListener(onResponseStarted);
|
|
|
|
is(countBefore, 1, "onBeforeSendHeaders hit once");
|
|
is(countAfter, 1, "onResponseStarted hit once");
|
|
});
|
|
|
|
function waitForLoad(browser = gBrowser.selectedBrowser) {
|
|
return BrowserTestUtils.browserLoaded(browser);
|
|
}
|