mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-11 05:39:41 +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
205 lines
7.6 KiB
JavaScript
205 lines
7.6 KiB
JavaScript
add_task(async function() {
|
|
info("Starting subResources test");
|
|
|
|
await SpecialPowers.flushPrefEnv();
|
|
await SpecialPowers.pushPrefEnv({"set": [
|
|
["browser.contentblocking.allowlist.annotations.enabled", true],
|
|
["browser.contentblocking.allowlist.storage.enabled", true],
|
|
["network.cookie.cookieBehavior", Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER],
|
|
["privacy.trackingprotection.enabled", false],
|
|
["privacy.trackingprotection.pbmode.enabled", false],
|
|
["privacy.trackingprotection.annotate_channels", true],
|
|
["privacy.restrict3rdpartystorage.userInteractionRequiredForHosts", "tracking.example.com,tracking.example.org"],
|
|
]});
|
|
|
|
await UrlClassifierTestUtils.addTestTrackers();
|
|
|
|
info("Creating a new tab");
|
|
let tab = BrowserTestUtils.addTab(gBrowser, TEST_TOP_PAGE);
|
|
gBrowser.selectedTab = tab;
|
|
|
|
let browser = gBrowser.getBrowserForTab(tab);
|
|
await BrowserTestUtils.browserLoaded(browser);
|
|
|
|
info("Loading tracking scripts and tracking images");
|
|
await ContentTask.spawn(browser, null, async function() {
|
|
// Let's load the script twice here.
|
|
{
|
|
let src = content.document.createElement("script");
|
|
let p = new content.Promise(resolve => { src.onload = resolve; });
|
|
content.document.body.appendChild(src);
|
|
src.src = "https://tracking.example.org/browser/toolkit/components/antitracking/test/browser/subResources.sjs?what=script";
|
|
await p;
|
|
}
|
|
{
|
|
let src = content.document.createElement("script");
|
|
let p = new content.Promise(resolve => { src.onload = resolve; });
|
|
content.document.body.appendChild(src);
|
|
src.src = "https://tracking.example.org/browser/toolkit/components/antitracking/test/browser/subResources.sjs?what=script";
|
|
await p;
|
|
}
|
|
|
|
// Let's load an image twice here.
|
|
{
|
|
let img = content.document.createElement("img");
|
|
let p = new content.Promise(resolve => { img.onload = resolve; });
|
|
content.document.body.appendChild(img);
|
|
img.src = "https://tracking.example.org/browser/toolkit/components/antitracking/test/browser/subResources.sjs?what=image";
|
|
await p;
|
|
}
|
|
{
|
|
let img = content.document.createElement("img");
|
|
let p = new content.Promise(resolve => { img.onload = resolve; });
|
|
content.document.body.appendChild(img);
|
|
img.src = "https://tracking.example.org/browser/toolkit/components/antitracking/test/browser/subResources.sjs?what=image";
|
|
await p;
|
|
}
|
|
});
|
|
|
|
await fetch("https://tracking.example.org/browser/toolkit/components/antitracking/test/browser/subResources.sjs?result&what=image")
|
|
.then(r => r.text())
|
|
.then(text => {
|
|
is(text, 0, "Cookies received for images");
|
|
});
|
|
|
|
await fetch("https://tracking.example.org/browser/toolkit/components/antitracking/test/browser/subResources.sjs?result&what=script")
|
|
.then(r => r.text())
|
|
.then(text => {
|
|
is(text, 0, "Cookies received for scripts");
|
|
});
|
|
|
|
info("Creating a 3rd party content");
|
|
await ContentTask.spawn(browser,
|
|
{ page: TEST_3RD_PARTY_PAGE_WO,
|
|
blockingCallback: (async _ => {}).toString(),
|
|
nonBlockingCallback: (async _ => {}).toString(),
|
|
},
|
|
async function(obj) {
|
|
await new content.Promise(resolve => {
|
|
let ifr = content.document.createElement("iframe");
|
|
ifr.onload = function() {
|
|
info("Sending code to the 3rd party content");
|
|
ifr.contentWindow.postMessage(obj, "*");
|
|
};
|
|
|
|
content.addEventListener("message", function msg(event) {
|
|
if (event.data.type == "finish") {
|
|
content.removeEventListener("message", msg);
|
|
resolve();
|
|
return;
|
|
}
|
|
|
|
if (event.data.type == "ok") {
|
|
ok(event.data.what, event.data.msg);
|
|
return;
|
|
}
|
|
|
|
if (event.data.type == "info") {
|
|
info(event.data.msg);
|
|
return;
|
|
}
|
|
|
|
ok(false, "Unknown message");
|
|
});
|
|
|
|
content.document.body.appendChild(ifr);
|
|
ifr.src = obj.page;
|
|
});
|
|
});
|
|
|
|
info("Loading tracking scripts and tracking images again");
|
|
await ContentTask.spawn(browser, null, async function() {
|
|
// Let's load the script twice here.
|
|
{
|
|
let src = content.document.createElement("script");
|
|
let p = new content.Promise(resolve => { src.onload = resolve; });
|
|
content.document.body.appendChild(src);
|
|
src.src = "https://tracking.example.org/browser/toolkit/components/antitracking/test/browser/subResources.sjs?what=script";
|
|
await p;
|
|
}
|
|
{
|
|
let src = content.document.createElement("script");
|
|
let p = new content.Promise(resolve => { src.onload = resolve; });
|
|
content.document.body.appendChild(src);
|
|
src.src = "https://tracking.example.org/browser/toolkit/components/antitracking/test/browser/subResources.sjs?what=script";
|
|
await p;
|
|
}
|
|
|
|
// Let's load an image twice here.
|
|
{
|
|
let img = content.document.createElement("img");
|
|
let p = new content.Promise(resolve => { img.onload = resolve; });
|
|
content.document.body.appendChild(img);
|
|
img.src = "https://tracking.example.org/browser/toolkit/components/antitracking/test/browser/subResources.sjs?what=image";
|
|
await p;
|
|
}
|
|
{
|
|
let img = content.document.createElement("img");
|
|
let p = new content.Promise(resolve => { img.onload = resolve; });
|
|
content.document.body.appendChild(img);
|
|
img.src = "https://tracking.example.org/browser/toolkit/components/antitracking/test/browser/subResources.sjs?what=image";
|
|
await p;
|
|
}
|
|
});
|
|
|
|
await fetch("https://tracking.example.org/browser/toolkit/components/antitracking/test/browser/subResources.sjs?result&what=image")
|
|
.then(r => r.text())
|
|
.then(text => {
|
|
is(text, 1, "One cookie received for images.");
|
|
});
|
|
|
|
await fetch("https://tracking.example.org/browser/toolkit/components/antitracking/test/browser/subResources.sjs?result&what=script")
|
|
.then(r => r.text())
|
|
.then(text => {
|
|
is(text, 1, "One cookie received received for scripts.");
|
|
});
|
|
|
|
let expectTrackerBlocked = (item, blocked) => {
|
|
is(item[0], Ci.nsIWebProgressListener.STATE_COOKIES_BLOCKED_TRACKER,
|
|
"Correct blocking type reported");
|
|
is(item[1], blocked,
|
|
"Correct blocking status reported");
|
|
ok(item[2] >= 1,
|
|
"Correct repeat count reported");
|
|
};
|
|
|
|
let expectTrackerFound = item => {
|
|
is(item[0], Ci.nsIWebProgressListener.STATE_LOADED_TRACKING_CONTENT,
|
|
"Correct blocking type reported");
|
|
is(item[1], true,
|
|
"Correct blocking status reported");
|
|
ok(item[2] >= 1,
|
|
"Correct repeat count reported");
|
|
};
|
|
|
|
let expectCookiesLoaded = item => {
|
|
is(item[0], Ci.nsIWebProgressListener.STATE_COOKIES_LOADED,
|
|
"Correct blocking type reported");
|
|
is(item[1], true,
|
|
"Correct blocking status reported");
|
|
ok(item[2] >= 1,
|
|
"Correct repeat count reported");
|
|
};
|
|
|
|
let log = JSON.parse(await browser.getContentBlockingLog());
|
|
for (let trackerOrigin in log) {
|
|
is(trackerOrigin + "/", TEST_3RD_PARTY_DOMAIN, "Correct tracker origin must be reported");
|
|
let originLog = log[trackerOrigin];
|
|
is(originLog.length, 4, "We should have 4 entries in the compressed log");
|
|
expectTrackerFound(originLog[0]);
|
|
expectCookiesLoaded(originLog[1]);
|
|
expectTrackerBlocked(originLog[2], true);
|
|
expectTrackerBlocked(originLog[3], false);
|
|
}
|
|
|
|
info("Removing the tab");
|
|
BrowserTestUtils.removeTab(tab);
|
|
});
|
|
|
|
add_task(async function() {
|
|
info("Cleaning up.");
|
|
await new Promise(resolve => {
|
|
Services.clearData.deleteData(Ci.nsIClearDataService.CLEAR_ALL, value => resolve());
|
|
});
|
|
});
|
|
|