856fa07b17
***
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
48 lines
1.5 KiB
JavaScript
48 lines
1.5 KiB
JavaScript
/* Any copyright is dedicated to the Public Domain.
|
|
* http://creativecommons.org/publicdomain/zero/1.0/ */
|
|
|
|
"use strict";
|
|
|
|
const {UIState} = ChromeUtils.import("resource://services-sync/UIState.jsm");
|
|
|
|
ChromeUtils.defineModuleGetter(this, "fxAccounts",
|
|
"resource://gre/modules/FxAccounts.jsm");
|
|
|
|
var gTestTab;
|
|
var gContentAPI;
|
|
var gContentWindow;
|
|
|
|
function test() {
|
|
UITourTest();
|
|
}
|
|
|
|
const oldState = UIState.get();
|
|
registerCleanupFunction(async function() {
|
|
await signOut();
|
|
gSync.updateAllUI(oldState);
|
|
});
|
|
|
|
var tests = [
|
|
taskify(async function test_highlight_accountStatus_loggedOut() {
|
|
await showMenuPromise("appMenu");
|
|
await showHighlightPromise("accountStatus");
|
|
let highlight = document.getElementById("UITourHighlightContainer");
|
|
is(highlight.getAttribute("targetName"), "accountStatus", "Correct highlight target");
|
|
}),
|
|
|
|
taskify(async function test_highlight_accountStatus_loggedIn() {
|
|
gSync.updateAllUI({ status: UIState.STATUS_SIGNED_IN, lastSync: new Date(), email: "foo@example.com" });
|
|
await showMenuPromise("appMenu");
|
|
await showHighlightPromise("accountStatus");
|
|
let highlight = document.getElementById("UITourHighlightContainer");
|
|
let expectedTarget = "appMenu-fxa-avatar";
|
|
is(highlight.anchorNode.id, expectedTarget, "Anchored on avatar");
|
|
is(highlight.getAttribute("targetName"), "accountStatus", "Correct highlight target");
|
|
}),
|
|
];
|
|
|
|
function signOut() {
|
|
// we always want a "localOnly" signout here...
|
|
return fxAccounts.signOut(true);
|
|
}
|