forked from mirrors/gecko-dev
e930b89c34
***
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
92 lines
2.8 KiB
JavaScript
92 lines
2.8 KiB
JavaScript
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*/
|
|
"use strict";
|
|
|
|
let syncService = {};
|
|
ChromeUtils.import("resource://services-sync/service.js", syncService);
|
|
const service = syncService.Service;
|
|
const {UIState} = ChromeUtils.import("resource://services-sync/UIState.jsm");
|
|
|
|
let getState;
|
|
let originalSync;
|
|
let syncWasCalled = false;
|
|
|
|
// TODO: This test should probably be re-written, we don't really test much here.
|
|
add_task(async function testSyncRemoteTabsButtonFunctionality() {
|
|
info("Test the Sync Remote Tabs button in the panel");
|
|
storeInitialValues();
|
|
mockFunctions();
|
|
|
|
// Force UI update.
|
|
Services.obs.notifyObservers(null, UIState.ON_UPDATE);
|
|
|
|
// add the sync remote tabs button to the panel
|
|
CustomizableUI.addWidgetToArea("sync-button", CustomizableUI.AREA_FIXED_OVERFLOW_PANEL);
|
|
|
|
await waitForOverflowButtonShown();
|
|
|
|
// check the button's functionality
|
|
await document.getElementById("nav-bar").overflowable.show();
|
|
info("The panel menu was opened");
|
|
|
|
let syncRemoteTabsBtn = document.getElementById("sync-button");
|
|
let remoteTabsPanel = document.getElementById("PanelUI-remotetabs");
|
|
let viewShown = BrowserTestUtils.waitForEvent(remoteTabsPanel, "ViewShown");
|
|
ok(syncRemoteTabsBtn, "The sync remote tabs button was added to the Panel Menu");
|
|
// click the button - the panel should open.
|
|
syncRemoteTabsBtn.click();
|
|
await viewShown;
|
|
ok(remoteTabsPanel.getAttribute("visible"), "Sync Panel is in view");
|
|
|
|
// Find and click the "setup" button.
|
|
let syncNowButton = document.getElementById("PanelUI-remotetabs-syncnow");
|
|
syncNowButton.click();
|
|
info("The sync now button was clicked");
|
|
|
|
await waitForCondition(() => syncWasCalled);
|
|
|
|
// We need to stop the Syncing animation manually otherwise the button
|
|
// will be disabled at the beginning of a next test.
|
|
gSync._onActivityStop();
|
|
});
|
|
|
|
add_task(async function asyncCleanup() {
|
|
// reset the panel UI to the default state
|
|
await resetCustomization();
|
|
ok(CustomizableUI.inDefaultState, "The panel UI is in default state again.");
|
|
|
|
if (isOverflowOpen()) {
|
|
let panelHidePromise = promiseOverflowHidden(window);
|
|
PanelUI.overflowPanel.hidePopup();
|
|
await panelHidePromise;
|
|
}
|
|
|
|
restoreValues();
|
|
});
|
|
|
|
function mockFunctions() {
|
|
// mock UIState.get()
|
|
UIState.get = () => ({
|
|
status: UIState.STATUS_SIGNED_IN,
|
|
lastSync: new Date(),
|
|
email: "user@mozilla.com",
|
|
});
|
|
|
|
service.sync = mocked_sync;
|
|
}
|
|
|
|
function mocked_sync() {
|
|
syncWasCalled = true;
|
|
}
|
|
|
|
function restoreValues() {
|
|
UIState.get = getState;
|
|
service.sync = originalSync;
|
|
}
|
|
|
|
function storeInitialValues() {
|
|
getState = UIState.get;
|
|
originalSync = service.sync;
|
|
}
|