Commit a9ec0b84 authored by Mark Banner's avatar Mark Banner
Browse files

Bug 1799314 - Convert consumers of testing modules to import ES modules direct... 

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

Differential Revision: https://phabricator.services.mozilla.com/D161909
parent 02375d92

docshell/test/chrome/docshell_helpers.js

+2 −2
Original line number Diff line number Diff line
@@ -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 =

docshell/test/unit/head_docshell.js

+1 −1
Original line number Diff line number Diff line
@@ -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();

docshell/test/unit/test_URIFixup_external_protocol_fallback.js

+2 −2
Original line number Diff line number Diff line
@@ -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() {

docshell/test/unit/test_allowJavascript.js

+2 −2
Original line number Diff line number Diff line 
"use strict";



const { XPCShellContentUtils } = ChromeUtils.import(

  "resource://testing-common/XPCShellContentUtils.jsm"

const { XPCShellContentUtils } = ChromeUtils.importESModule(

  "resource://testing-common/XPCShellContentUtils.sys.mjs"

);



XPCShellContentUtils.init(this);

docshell/test/unit/test_subframe_stop_after_parent_error.js

+2 −2
Original line number Diff line number Diff line
@@ -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);