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
213 lines
6.4 KiB
JavaScript
213 lines
6.4 KiB
JavaScript
"use strict";
|
|
|
|
/* exported createHttpServer, promiseConsoleOutput, cleanupDir, clearCache, testEnv
|
|
runWithPrefs, withHandlingUserInput */
|
|
|
|
var {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
|
|
var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
|
var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
|
|
var {clearInterval, clearTimeout, setInterval, setIntervalWithTarget, setTimeout, setTimeoutWithTarget} = ChromeUtils.import("resource://gre/modules/Timer.jsm");
|
|
var {AddonTestUtils, MockAsyncShutdown} = ChromeUtils.import("resource://testing-common/AddonTestUtils.jsm");
|
|
|
|
// eslint-disable-next-line no-unused-vars
|
|
XPCOMUtils.defineLazyModuleGetters(this, {
|
|
ContentTask: "resource://testing-common/ContentTask.jsm",
|
|
Extension: "resource://gre/modules/Extension.jsm",
|
|
ExtensionData: "resource://gre/modules/Extension.jsm",
|
|
ExtensionParent: "resource://gre/modules/ExtensionParent.jsm",
|
|
ExtensionTestUtils: "resource://testing-common/ExtensionXPCShellUtils.jsm",
|
|
FileUtils: "resource://gre/modules/FileUtils.jsm",
|
|
MessageChannel: "resource://gre/modules/MessageChannel.jsm",
|
|
NetUtil: "resource://gre/modules/NetUtil.jsm",
|
|
PromiseTestUtils: "resource://testing-common/PromiseTestUtils.jsm",
|
|
Schemas: "resource://gre/modules/Schemas.jsm",
|
|
});
|
|
|
|
// These values may be changed in later head files and tested in check_remote
|
|
// below.
|
|
Services.prefs.setBoolPref("extensions.webextensions.remote", false);
|
|
const testEnv = {
|
|
expectRemote: false,
|
|
};
|
|
|
|
add_task(function check_remote() {
|
|
Assert.equal(WebExtensionPolicy.useRemoteWebExtensions, testEnv.expectRemote, "useRemoteWebExtensions matches");
|
|
Assert.equal(WebExtensionPolicy.isExtensionProcess, !testEnv.expectRemote, "testing from extension process");
|
|
});
|
|
|
|
ExtensionTestUtils.init(this);
|
|
|
|
var createHttpServer = (...args) => {
|
|
AddonTestUtils.maybeInit(this);
|
|
return AddonTestUtils.createHttpServer(...args);
|
|
};
|
|
|
|
if (AppConstants.platform === "android") {
|
|
Services.io.offline = true;
|
|
}
|
|
|
|
/**
|
|
* Clears the HTTP and content image caches.
|
|
*/
|
|
function clearCache() {
|
|
Services.cache2.clear();
|
|
|
|
let imageCache = Cc["@mozilla.org/image/tools;1"]
|
|
.getService(Ci.imgITools)
|
|
.getImgCacheForDocument(null);
|
|
imageCache.clearCache(false);
|
|
}
|
|
|
|
var promiseConsoleOutput = async function(task) {
|
|
const DONE = `=== console listener ${Math.random()} done ===`;
|
|
|
|
let listener;
|
|
let messages = [];
|
|
let awaitListener = new Promise(resolve => {
|
|
listener = msg => {
|
|
if (msg == DONE) {
|
|
resolve();
|
|
} else {
|
|
void (msg instanceof Ci.nsIConsoleMessage);
|
|
void (msg instanceof Ci.nsIScriptError);
|
|
messages.push(msg);
|
|
}
|
|
};
|
|
});
|
|
|
|
Services.console.registerListener(listener);
|
|
try {
|
|
let result = await task();
|
|
|
|
Services.console.logStringMessage(DONE);
|
|
await awaitListener;
|
|
|
|
return {messages, result};
|
|
} finally {
|
|
Services.console.unregisterListener(listener);
|
|
}
|
|
};
|
|
|
|
// Attempt to remove a directory. If the Windows OS is still using the
|
|
// file sometimes remove() will fail. So try repeatedly until we can
|
|
// remove it or we give up.
|
|
function cleanupDir(dir) {
|
|
let count = 0;
|
|
return new Promise((resolve, reject) => {
|
|
function tryToRemoveDir() {
|
|
count += 1;
|
|
try {
|
|
dir.remove(true);
|
|
} catch (e) {
|
|
// ignore
|
|
}
|
|
if (!dir.exists()) {
|
|
return resolve();
|
|
}
|
|
if (count >= 25) {
|
|
return reject(`Failed to cleanup directory: ${dir}`);
|
|
}
|
|
setTimeout(tryToRemoveDir, 100);
|
|
}
|
|
tryToRemoveDir();
|
|
});
|
|
}
|
|
|
|
// Run a test with the specified preferences and then restores their initial values
|
|
// right after the test function run (whether it passes or fails).
|
|
async function runWithPrefs(prefsToSet, testFn) {
|
|
const setPrefs = (prefs) => {
|
|
for (let [pref, value] of prefs) {
|
|
if (value === undefined) {
|
|
// Clear any pref that didn't have a user value.
|
|
info(`Clearing pref "${pref}"`);
|
|
Services.prefs.clearUserPref(pref);
|
|
continue;
|
|
}
|
|
|
|
info(`Setting pref "${pref}": ${value}`);
|
|
switch (typeof(value)) {
|
|
case "boolean":
|
|
Services.prefs.setBoolPref(pref, value);
|
|
break;
|
|
case "number":
|
|
Services.prefs.setIntPref(pref, value);
|
|
break;
|
|
case "string":
|
|
Services.prefs.setStringPref(pref, value);
|
|
break;
|
|
default:
|
|
throw new Error("runWithPrefs doesn't support this pref type yet");
|
|
}
|
|
}
|
|
};
|
|
|
|
const getPrefs = (prefs) => {
|
|
return prefs.map(([pref, value]) => {
|
|
info(`Getting initial pref value for "${pref}"`);
|
|
if (!Services.prefs.prefHasUserValue(pref)) {
|
|
// Check if the pref doesn't have a user value.
|
|
return [pref, undefined];
|
|
}
|
|
switch (typeof value) {
|
|
case "boolean":
|
|
return [pref, Services.prefs.getBoolPref(pref)];
|
|
case "number":
|
|
return [pref, Services.prefs.getIntPref(pref)];
|
|
case "string":
|
|
return [pref, Services.prefs.getStringPref(pref)];
|
|
default:
|
|
throw new Error("runWithPrefs doesn't support this pref type yet");
|
|
}
|
|
});
|
|
};
|
|
|
|
let initialPrefsValues = [];
|
|
|
|
try {
|
|
initialPrefsValues = getPrefs(prefsToSet);
|
|
|
|
setPrefs(prefsToSet);
|
|
|
|
await testFn();
|
|
} finally {
|
|
info("Restoring initial preferences values on exit");
|
|
setPrefs(initialPrefsValues);
|
|
}
|
|
}
|
|
|
|
// "Handling User Input" test helpers.
|
|
|
|
let extensionHandlers = new WeakSet();
|
|
|
|
function handlingUserInputFrameScript() {
|
|
/* globals content */
|
|
// eslint-disable-next-line no-shadow
|
|
const {MessageChannel} = ChromeUtils.import("resource://gre/modules/MessageChannel.jsm");
|
|
|
|
let handle;
|
|
MessageChannel.addListener(this, "ExtensionTest:HandleUserInput", {
|
|
receiveMessage({name, data}) {
|
|
if (data) {
|
|
handle = content.windowUtils.setHandlingUserInput(true);
|
|
} else if (handle) {
|
|
handle.destruct();
|
|
handle = null;
|
|
}
|
|
},
|
|
});
|
|
}
|
|
|
|
async function withHandlingUserInput(extension, fn) {
|
|
let {messageManager} = extension.extension.groupFrameLoader;
|
|
|
|
if (!extensionHandlers.has(extension)) {
|
|
messageManager.loadFrameScript(`data:,(${encodeURI(handlingUserInputFrameScript)}).call(this)`, false, true);
|
|
extensionHandlers.add(extension);
|
|
}
|
|
|
|
await MessageChannel.sendMessage(messageManager, "ExtensionTest:HandleUserInput", true);
|
|
await fn();
|
|
await MessageChannel.sendMessage(messageManager, "ExtensionTest:HandleUserInput", false);
|
|
}
|
|
|