nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1799314 - Convert consumers of testing modules to import ES modules direct (uriloader/ dom/ docshell/). r=smaug

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D161909
This commit is contained in:
Mark Banner 2022-11-17 12:00:28 +00:00
parent 02375d923e
commit a9ec0b8434
25 changed files with 54 additions and 54 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
docshell/test/chrome/docshell_helpers.js
View file

@ -18,8 +18,8 @@ var imports = [
for (var name of imports) {
window[name] = window.opener.wrappedJSObject[name];
}
const { BrowserTestUtils } = ChromeUtils.import(
"resource://testing-common/BrowserTestUtils.jsm"
const { BrowserTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/BrowserTestUtils.sys.mjs"
);
const ACTOR_MODULE_URI =

2
docshell/test/unit/head_docshell.js
View file

@ -9,13 +9,13 @@ var { XPCOMUtils } = ChromeUtils.importESModule(
ChromeUtils.defineESModuleGetters(this, {
SearchTestUtils: "resource://testing-common/SearchTestUtils.sys.mjs",
SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
TestUtils: "resource://testing-common/TestUtils.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
AddonTestUtils: "resource://testing-common/AddonTestUtils.jsm",
HttpServer: "resource://testing-common/httpd.js",
NetUtil: "resource://gre/modules/NetUtil.jsm",
TestUtils: "resource://testing-common/TestUtils.jsm",
});
var profileDir = do_get_profile();

4
docshell/test/unit/test_URIFixup_external_protocol_fallback.js
View file

@ -9,8 +9,8 @@
const { AppConstants } = ChromeUtils.importESModule(
"resource://gre/modules/AppConstants.sys.mjs"
);
const { MockRegistrar } = ChromeUtils.import(
"resource://testing-common/MockRegistrar.jsm"
const { MockRegistrar } = ChromeUtils.importESModule(
"resource://testing-common/MockRegistrar.sys.mjs"
);
add_task(async function setup() {

4
docshell/test/unit/test_allowJavascript.js
View file

@ -1,7 +1,7 @@
"use strict";
const { XPCShellContentUtils } = ChromeUtils.import(
"resource://testing-common/XPCShellContentUtils.jsm"
const { XPCShellContentUtils } = ChromeUtils.importESModule(
"resource://testing-common/XPCShellContentUtils.sys.mjs"
);
XPCShellContentUtils.init(this);

4
docshell/test/unit/test_subframe_stop_after_parent_error.js
View file

@ -3,8 +3,8 @@
// document do not delay showing load errors (and possibly result in a
// crash at docShell destruction) for failed document loads.
const { XPCShellContentUtils } = ChromeUtils.import(
"resource://testing-common/XPCShellContentUtils.jsm"
const { XPCShellContentUtils } = ChromeUtils.importESModule(
"resource://testing-common/XPCShellContentUtils.sys.mjs"
);
XPCShellContentUtils.init(this);

8
dom/base/test/unit/test_blockParsing.js
View file

@ -1,10 +1,10 @@
"use strict";
const { TestUtils } = ChromeUtils.import(
"resource://testing-common/TestUtils.jsm"
const { TestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TestUtils.sys.mjs"
);
const { XPCShellContentUtils } = ChromeUtils.import(
"resource://testing-common/XPCShellContentUtils.jsm"
const { XPCShellContentUtils } = ChromeUtils.importESModule(
"resource://testing-common/XPCShellContentUtils.sys.mjs"
);
const { setTimeout } = ChromeUtils.importESModule(
"resource://gre/modules/Timer.sys.mjs"

4
dom/events/test/browser_alt_keyup_in_content.js
View file

@ -1,7 +1,7 @@
"use strict";
const { ContentTaskUtils } = ChromeUtils.import(
"resource://testing-common/ContentTaskUtils.jsm"
const { ContentTaskUtils } = ChromeUtils.importESModule(
"resource://testing-common/ContentTaskUtils.sys.mjs"
);
add_task(async function runTests() {

4
dom/file/tests/test_ipc_messagemanager_blob.js
View file

@ -1,7 +1,7 @@
"use strict";
const { XPCShellContentUtils } = ChromeUtils.import(
"resource://testing-common/XPCShellContentUtils.jsm"
const { XPCShellContentUtils } = ChromeUtils.importESModule(
"resource://testing-common/XPCShellContentUtils.sys.mjs"
);
XPCShellContentUtils.init(this);

4
dom/ipc/tests/test_blob_sliced_from_child_process.js
View file

@ -1,7 +1,7 @@
"use strict";
const { XPCShellContentUtils } = ChromeUtils.import(
"resource://testing-common/XPCShellContentUtils.jsm"
const { XPCShellContentUtils } = ChromeUtils.importESModule(
"resource://testing-common/XPCShellContentUtils.sys.mjs"
);
XPCShellContentUtils.init(this);

4
dom/ipc/tests/test_blob_sliced_from_parent_process.js
View file

@ -1,7 +1,7 @@
"use strict";
const { XPCShellContentUtils } = ChromeUtils.import(
"resource://testing-common/XPCShellContentUtils.jsm"
const { XPCShellContentUtils } = ChromeUtils.importESModule(
"resource://testing-common/XPCShellContentUtils.sys.mjs"
);
XPCShellContentUtils.init(this);

8
dom/ipc/tests/test_bug1086684.js
View file

@ -1,7 +1,7 @@
"use strict";
const { XPCShellContentUtils } = ChromeUtils.import(
"resource://testing-common/XPCShellContentUtils.jsm"
const { XPCShellContentUtils } = ChromeUtils.importESModule(
"resource://testing-common/XPCShellContentUtils.sys.mjs"
);
XPCShellContentUtils.init(this);
@ -32,8 +32,8 @@ function childFrameScript() {
/* eslint-env mozilla/frame-script */
"use strict";
let { MockFilePicker } = ChromeUtils.import(
"resource://testing-common/MockFilePicker.jsm"
let { MockFilePicker } = ChromeUtils.importESModule(
"resource://testing-common/MockFilePicker.sys.mjs"
);
function parentReady(message) {

4
dom/ipc/tests/test_child_docshell.js
View file

@ -1,7 +1,7 @@
"use strict";
const { XPCShellContentUtils } = ChromeUtils.import(
"resource://testing-common/XPCShellContentUtils.jsm"
const { XPCShellContentUtils } = ChromeUtils.importESModule(
"resource://testing-common/XPCShellContentUtils.sys.mjs"
);
XPCShellContentUtils.init(this);

4
dom/ipc/tests/test_sharedMap.js
View file

@ -6,8 +6,8 @@ const { AppConstants } = ChromeUtils.importESModule(
const { ExtensionUtils } = ChromeUtils.import(
"resource://gre/modules/ExtensionUtils.jsm"
);
const { XPCShellContentUtils } = ChromeUtils.import(
"resource://testing-common/XPCShellContentUtils.jsm"
const { XPCShellContentUtils } = ChromeUtils.importESModule(
"resource://testing-common/XPCShellContentUtils.sys.mjs"
);
const PROCESS_COUNT_PREF = "dom.ipc.processCount";

4
dom/push/test/xpcshell/test_broadcast_success.js
View file

@ -13,8 +13,8 @@ const { JSONFile } = ChromeUtils.importESModule(
"resource://gre/modules/JSONFile.sys.mjs"
);
const { FileTestUtils } = ChromeUtils.import(
"resource://testing-common/FileTestUtils.jsm"
const { FileTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/FileTestUtils.sys.mjs"
);
const { broadcastHandler } = ChromeUtils.importESModule(
"resource://test/broadcast_handler.sys.mjs"

4
dom/push/test/xpcshell/test_handler_service.js
View file

@ -4,8 +4,8 @@
// manager for push notifications against a specific scope, that service is
// instantiated before the message is delivered.
const { MockRegistrar } = ChromeUtils.import(
"resource://testing-common/MockRegistrar.jsm"
const { MockRegistrar } = ChromeUtils.importESModule(
"resource://testing-common/MockRegistrar.sys.mjs"
);
let pushService = Cc["@mozilla.org/push/Service;1"].getService(

4
dom/tests/browser/browser_hasbeforeunload.js
View file

@ -229,8 +229,8 @@ function controlFrameAt(browser, frameDepth, command) {
return SpecialPowers.spawn(browser, [{ frameDepth, command }], async function(
args
) {
const { TestUtils } = ChromeUtils.import(
"resource://testing-common/TestUtils.jsm"
const { TestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TestUtils.sys.mjs"
);
let { command: contentCommand, frameDepth: contentFrameDepth } = args;

4
dom/tests/browser/browser_keypressTelemetry.js
View file

@ -9,8 +9,8 @@ Services.scriptloader.loadSubScript(
"chrome://mochikit/content/tests/SimpleTest/EventUtils.js",
EventUtils
);
const { ContentTaskUtils } = ChromeUtils.import(
"resource://testing-common/ContentTaskUtils.jsm"
const { ContentTaskUtils } = ChromeUtils.importESModule(
"resource://testing-common/ContentTaskUtils.sys.mjs"
);
function getRecordedKeypressCount() {

4
dom/workers/test/xpcshell/test_remoteworker_launch_new_process.js
View file

@ -2,8 +2,8 @@
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
const { TestUtils } = ChromeUtils.import(
"resource://testing-common/TestUtils.jsm"
const { TestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TestUtils.sys.mjs"
);
const { AddonTestUtils } = ChromeUtils.import(

2
uriloader/exthandler/tests/HandlerServiceTestUtils.sys.mjs
View file

@ -8,7 +8,7 @@
import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const { Assert } = ChromeUtils.import("resource://testing-common/Assert.jsm");
import { Assert } from "resource://testing-common/Assert.sys.mjs";
const lazy = {};

4
uriloader/exthandler/tests/mochitest/browser_bad_download_dir.js
View file

@ -3,8 +3,8 @@ http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
let { FileTestUtils } = ChromeUtils.import(
"resource://testing-common/FileTestUtils.jsm"
let { FileTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/FileTestUtils.sys.mjs"
);
const ROOT = getRootDirectory(gTestPath).replace(

4
uriloader/exthandler/tests/mochitest/browser_download_idn_blocklist.js
View file

@ -7,8 +7,8 @@ const TEST_HOST = "example.org";
const TEST_FILE = "\u3002.bin";
const TEST_URL = `http://${TEST_HOST}/${TEST_FILE}`;
const { XPCShellContentUtils } = ChromeUtils.import(
"resource://testing-common/XPCShellContentUtils.jsm"
const { XPCShellContentUtils } = ChromeUtils.importESModule(
"resource://testing-common/XPCShellContentUtils.sys.mjs"
);
XPCShellContentUtils.initMochitest(this);
const server = XPCShellContentUtils.createHttpServer({

4
uriloader/exthandler/tests/mochitest/browser_download_preferred_action.js
View file

@ -6,8 +6,8 @@
const { DownloadIntegration } = ChromeUtils.importESModule(
"resource://gre/modules/DownloadIntegration.sys.mjs"
);
const { FileTestUtils } = ChromeUtils.import(
"resource://testing-common/FileTestUtils.jsm"
const { FileTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/FileTestUtils.sys.mjs"
);
const gHandlerService = Cc[
"@mozilla.org/uriloader/handler-service;1"

8
uriloader/exthandler/tests/mochitest/browser_download_privatebrowsing.js
View file

@ -14,11 +14,11 @@ const { Downloads } = ChromeUtils.importESModule(
const { DownloadPaths } = ChromeUtils.importESModule(
"resource://gre/modules/DownloadPaths.sys.mjs"
);
const { FileTestUtils } = ChromeUtils.import(
"resource://testing-common/FileTestUtils.jsm"
const { FileTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/FileTestUtils.sys.mjs"
);
const { MockRegistrar } = ChromeUtils.import(
"resource://testing-common/MockRegistrar.jsm"
const { MockRegistrar } = ChromeUtils.importESModule(
"resource://testing-common/MockRegistrar.sys.mjs"
);
add_task(async function test_setup() {

4
uriloader/exthandler/tests/mochitest/browser_launched_app_save_directory.js
View file

@ -2,8 +2,8 @@ const { DownloadIntegration } = ChromeUtils.importESModule(
"resource://gre/modules/DownloadIntegration.sys.mjs"
);
const { TestUtils } = ChromeUtils.import(
"resource://testing-common/TestUtils.jsm"
const { TestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TestUtils.sys.mjs"
);
const TEST_PATH = getRootDirectory(gTestPath).replace(

4
uriloader/exthandler/tests/unit/head.js
View file

@ -22,8 +22,8 @@ var { XPCOMUtils } = ChromeUtils.importESModule(
const { HandlerServiceTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/HandlerServiceTestUtils.sys.mjs"
);
var { TestUtils } = ChromeUtils.import(
"resource://testing-common/TestUtils.jsm"
var { TestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TestUtils.sys.mjs"
);
XPCOMUtils.defineLazyServiceGetter(