mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-10 21:28:04 +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
101 lines
4.2 KiB
JavaScript
101 lines
4.2 KiB
JavaScript
/* Any copyright is dedicated to the Public Domain.
|
|
* http://creativecommons.org/publicdomain/zero/1.0/
|
|
*/
|
|
|
|
/* globals ChromeUtils, Assert, add_task */
|
|
"use strict";
|
|
|
|
// ClientID fails without...
|
|
do_get_profile();
|
|
|
|
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
|
const {TestUtils} = ChromeUtils.import("resource://testing-common/TestUtils.jsm");
|
|
const {ClientID} = ChromeUtils.import("resource://gre/modules/ClientID.jsm");
|
|
const {Discovery} = ChromeUtils.import("resource:///modules/Discovery.jsm");
|
|
const {ContextualIdentityService} = ChromeUtils.import("resource://gre/modules/ContextualIdentityService.jsm");
|
|
|
|
const TAAR_COOKIE_NAME = "taarId";
|
|
|
|
add_task(async function test_discovery() {
|
|
let uri = Services.io.newURI("https://example.com/foobar");
|
|
|
|
// Ensure the prefs we need
|
|
Services.prefs.setBoolPref("browser.discovery.enabled", true);
|
|
Services.prefs.setBoolPref("browser.discovery.containers.enabled", true);
|
|
Services.prefs.setBoolPref("datareporting.healthreport.uploadEnabled", true);
|
|
Services.prefs.setCharPref("browser.discovery.sites", uri.host);
|
|
|
|
registerCleanupFunction(() => {
|
|
Services.prefs.clearUserPref("browser.discovery.enabled");
|
|
Services.prefs.clearUserPref("browser.discovery.containers.enabled");
|
|
Services.prefs.clearUserPref("browser.discovery.sites");
|
|
Services.prefs.clearUserPref("datareporting.healthreport.uploadEnabled");
|
|
});
|
|
|
|
// This is normally initialized by telemetry, force id creation. This results
|
|
// in Discovery setting the cookie.
|
|
await ClientID.getClientID();
|
|
await Discovery.update();
|
|
|
|
ok(Services.cookies.cookieExists(uri.host, "/", TAAR_COOKIE_NAME, {}), "cookie exists");
|
|
ok(!Services.cookies.cookieExists(uri.host, "/", TAAR_COOKIE_NAME, {privateBrowsingId: 1}), "no private cookie exists");
|
|
ContextualIdentityService.getPublicIdentities().forEach(identity => {
|
|
let {userContextId} = identity;
|
|
equal(Services.cookies.cookieExists(uri.host, "/", TAAR_COOKIE_NAME, {userContextId}), identity.public, "cookie exists");
|
|
});
|
|
|
|
// Test the addition of a new container.
|
|
let changed = TestUtils.topicObserved("cookie-changed", (subject, data) => {
|
|
let cookie = subject.QueryInterface(Ci.nsICookie2);
|
|
equal(cookie.name, TAAR_COOKIE_NAME, "taar cookie exists");
|
|
equal(cookie.host, uri.host, "cookie exists for host");
|
|
equal(cookie.originAttributes.userContextId, container.userContextId, "cookie userContextId is correct");
|
|
return true;
|
|
});
|
|
let container = ContextualIdentityService.create("New Container", "Icon", "Color");
|
|
await changed;
|
|
|
|
// Test disabling
|
|
Discovery.enabled = false;
|
|
// Wait for the update to remove the cookie.
|
|
await TestUtils.waitForCondition(() => {
|
|
return !Services.cookies.cookieExists(uri.host, "/", TAAR_COOKIE_NAME, {});
|
|
});
|
|
|
|
ContextualIdentityService.getPublicIdentities().forEach(identity => {
|
|
let {userContextId} = identity;
|
|
ok(!Services.cookies.cookieExists(uri.host, "/", TAAR_COOKIE_NAME, {userContextId}), "no cookie exists");
|
|
});
|
|
|
|
// turn off containers
|
|
Services.prefs.setBoolPref("browser.discovery.containers.enabled", false);
|
|
|
|
Discovery.enabled = true;
|
|
await TestUtils.waitForCondition(() => {
|
|
return Services.cookies.cookieExists(uri.host, "/", TAAR_COOKIE_NAME, {});
|
|
});
|
|
// make sure we did not set cookies on containers
|
|
ContextualIdentityService.getPublicIdentities().forEach(identity => {
|
|
let {userContextId} = identity;
|
|
ok(!Services.cookies.cookieExists(uri.host, "/", TAAR_COOKIE_NAME, {userContextId}), "no cookie exists");
|
|
});
|
|
|
|
// Make sure clientId changes update discovery
|
|
changed = TestUtils.topicObserved("cookie-changed", (subject, data) => {
|
|
if (data !== "added") {
|
|
return false;
|
|
}
|
|
let cookie = subject.QueryInterface(Ci.nsICookie2);
|
|
equal(cookie.name, TAAR_COOKIE_NAME, "taar cookie exists");
|
|
equal(cookie.host, uri.host, "cookie exists for host");
|
|
return true;
|
|
});
|
|
ClientID.resetClientID();
|
|
await changed;
|
|
|
|
// Make sure disabling telemetry disables discovery.
|
|
Services.prefs.setBoolPref("datareporting.healthreport.uploadEnabled", false);
|
|
await TestUtils.waitForCondition(() => {
|
|
return !Services.cookies.cookieExists(uri.host, "/", TAAR_COOKIE_NAME, {});
|
|
});
|
|
});
|