mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-10 05:08:36 +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
217 lines
6.8 KiB
JavaScript
217 lines
6.8 KiB
JavaScript
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
|
|
/* vim: set sts=2 sw=2 et tw=80: */
|
|
"use strict";
|
|
|
|
PromiseTestUtils.whitelistRejectionsGlobally(/Message manager disconnected/);
|
|
|
|
const {MockRegistrar} = ChromeUtils.import("resource://testing-common/MockRegistrar.jsm");
|
|
|
|
let idleService = {
|
|
_observers: new Set(),
|
|
_activity: {
|
|
addCalls: [],
|
|
removeCalls: [],
|
|
observerFires: [],
|
|
},
|
|
_reset: function() {
|
|
this._observers.clear();
|
|
this._activity.addCalls = [];
|
|
this._activity.removeCalls = [];
|
|
this._activity.observerFires = [];
|
|
},
|
|
_fireObservers: function(state) {
|
|
for (let observer of this._observers.values()) {
|
|
observer.observe(observer, state, null);
|
|
this._activity.observerFires.push(state);
|
|
}
|
|
},
|
|
QueryInterface: ChromeUtils.generateQI([Ci.nsIIdleService]),
|
|
idleTime: 19999,
|
|
addIdleObserver: function(observer, time) {
|
|
this._observers.add(observer);
|
|
this._activity.addCalls.push(time);
|
|
},
|
|
removeIdleObserver: function(observer, time) {
|
|
this._observers.delete(observer);
|
|
this._activity.removeCalls.push(time);
|
|
},
|
|
};
|
|
|
|
function checkActivity(expectedActivity) {
|
|
let {expectedAdd, expectedRemove, expectedFires} = expectedActivity;
|
|
let {addCalls, removeCalls, observerFires} = idleService._activity;
|
|
equal(expectedAdd.length, addCalls.length, "idleService.addIdleObserver was called the expected number of times");
|
|
equal(expectedRemove.length, removeCalls.length, "idleService.removeIdleObserver was called the expected number of times");
|
|
equal(expectedFires.length, observerFires.length, "idle observer was fired the expected number of times");
|
|
deepEqual(addCalls, expectedAdd, "expected interval passed to idleService.addIdleObserver");
|
|
deepEqual(removeCalls, expectedRemove, "expected interval passed to idleService.removeIdleObserver");
|
|
deepEqual(observerFires, expectedFires, "expected topic passed to idle observer");
|
|
}
|
|
|
|
add_task(async function setup() {
|
|
let fakeIdleService = MockRegistrar.register("@mozilla.org/widget/idleservice;1", idleService);
|
|
registerCleanupFunction(() => {
|
|
MockRegistrar.unregister(fakeIdleService);
|
|
});
|
|
});
|
|
|
|
add_task(async function testQueryStateActive() {
|
|
function background() {
|
|
browser.idle.queryState(20).then(
|
|
status => {
|
|
browser.test.assertEq("active", status, "Idle status is active");
|
|
browser.test.notifyPass("idle");
|
|
},
|
|
err => {
|
|
browser.test.fail(`Error: ${err} :: ${err.stack}`);
|
|
browser.test.notifyFail("idle");
|
|
});
|
|
}
|
|
|
|
let extension = ExtensionTestUtils.loadExtension({
|
|
background,
|
|
manifest: {
|
|
permissions: ["idle"],
|
|
},
|
|
});
|
|
|
|
await extension.startup();
|
|
await extension.awaitFinish("idle");
|
|
await extension.unload();
|
|
});
|
|
|
|
add_task(async function testQueryStateIdle() {
|
|
function background() {
|
|
browser.idle.queryState(15).then(
|
|
status => {
|
|
browser.test.assertEq("idle", status, "Idle status is idle");
|
|
browser.test.notifyPass("idle");
|
|
},
|
|
err => {
|
|
browser.test.fail(`Error: ${err} :: ${err.stack}`);
|
|
browser.test.notifyFail("idle");
|
|
});
|
|
}
|
|
|
|
let extension = ExtensionTestUtils.loadExtension({
|
|
background,
|
|
manifest: {
|
|
permissions: ["idle"],
|
|
},
|
|
});
|
|
|
|
await extension.startup();
|
|
await extension.awaitFinish("idle");
|
|
await extension.unload();
|
|
});
|
|
|
|
add_task(async function testOnlySetDetectionInterval() {
|
|
function background() {
|
|
browser.idle.setDetectionInterval(99);
|
|
browser.test.sendMessage("detectionIntervalSet");
|
|
}
|
|
|
|
let extension = ExtensionTestUtils.loadExtension({
|
|
background,
|
|
manifest: {
|
|
permissions: ["idle"],
|
|
},
|
|
});
|
|
|
|
idleService._reset();
|
|
await extension.startup();
|
|
await extension.awaitMessage("detectionIntervalSet");
|
|
idleService._fireObservers("idle");
|
|
checkActivity({expectedAdd: [], expectedRemove: [], expectedFires: []});
|
|
await extension.unload();
|
|
});
|
|
|
|
add_task(async function testSetDetectionIntervalBeforeAddingListener() {
|
|
function background() {
|
|
browser.idle.setDetectionInterval(99);
|
|
browser.idle.onStateChanged.addListener(newState => {
|
|
browser.test.assertEq("idle", newState, "listener fired with the expected state");
|
|
browser.test.sendMessage("listenerFired");
|
|
});
|
|
browser.test.sendMessage("listenerAdded");
|
|
}
|
|
|
|
let extension = ExtensionTestUtils.loadExtension({
|
|
background,
|
|
manifest: {
|
|
permissions: ["idle"],
|
|
},
|
|
});
|
|
|
|
idleService._reset();
|
|
await extension.startup();
|
|
await extension.awaitMessage("listenerAdded");
|
|
idleService._fireObservers("idle");
|
|
await extension.awaitMessage("listenerFired");
|
|
checkActivity({expectedAdd: [99], expectedRemove: [], expectedFires: ["idle"]});
|
|
// Defer unloading the extension so the asynchronous event listener
|
|
// reply finishes.
|
|
await new Promise(resolve => setTimeout(resolve, 0));
|
|
await extension.unload();
|
|
});
|
|
|
|
add_task(async function testSetDetectionIntervalAfterAddingListener() {
|
|
function background() {
|
|
browser.idle.onStateChanged.addListener(newState => {
|
|
browser.test.assertEq("idle", newState, "listener fired with the expected state");
|
|
browser.test.sendMessage("listenerFired");
|
|
});
|
|
browser.idle.setDetectionInterval(99);
|
|
browser.test.sendMessage("detectionIntervalSet");
|
|
}
|
|
|
|
let extension = ExtensionTestUtils.loadExtension({
|
|
background,
|
|
manifest: {
|
|
permissions: ["idle"],
|
|
},
|
|
});
|
|
|
|
idleService._reset();
|
|
await extension.startup();
|
|
await extension.awaitMessage("detectionIntervalSet");
|
|
idleService._fireObservers("idle");
|
|
await extension.awaitMessage("listenerFired");
|
|
checkActivity({expectedAdd: [60, 99], expectedRemove: [60], expectedFires: ["idle"]});
|
|
|
|
// Defer unloading the extension so the asynchronous event listener
|
|
// reply finishes.
|
|
await new Promise(resolve => setTimeout(resolve, 0));
|
|
await extension.unload();
|
|
});
|
|
|
|
add_task(async function testOnlyAddingListener() {
|
|
function background() {
|
|
browser.idle.onStateChanged.addListener(newState => {
|
|
browser.test.assertEq("active", newState, "listener fired with the expected state");
|
|
browser.test.sendMessage("listenerFired");
|
|
});
|
|
browser.test.sendMessage("listenerAdded");
|
|
}
|
|
|
|
let extension = ExtensionTestUtils.loadExtension({
|
|
background,
|
|
manifest: {
|
|
permissions: ["idle"],
|
|
},
|
|
});
|
|
|
|
idleService._reset();
|
|
await extension.startup();
|
|
await extension.awaitMessage("listenerAdded");
|
|
idleService._fireObservers("active");
|
|
await extension.awaitMessage("listenerFired");
|
|
// check that "idle-daily" topic does not cause a listener to fire
|
|
idleService._fireObservers("idle-daily");
|
|
checkActivity({expectedAdd: [60], expectedRemove: [], expectedFires: ["active", "idle-daily"]});
|
|
|
|
// Defer unloading the extension so the asynchronous event listener
|
|
// reply finishes.
|
|
await new Promise(resolve => setTimeout(resolve, 0));
|
|
await extension.unload();
|
|
});
|