corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1812141 - Convert JSMs in browser/components/attribution to ESMs. r=mconley,kpatenio,nalexander

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D167730
This commit is contained in:
elephanteatsapple
2023-02-15 21:40:30 +00:00
parent 44d2ecde1a
commit 0ad4eadcd9
21 changed files with 75 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
browser/components/attribution/test/browser/browser_AttributionCode_Mac_telemetry.js
View File

@@ -1,11 +1,11 @@
ChromeUtils.defineESModuleGetters(this, {
TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
});
const { MacAttribution } = ChromeUtils.import(
"resource:///modules/MacAttribution.jsm"
const { MacAttribution } = ChromeUtils.importESModule(
"resource:///modules/MacAttribution.sys.mjs"
);
const { AttributionIOUtils } = ChromeUtils.import(
"resource:///modules/AttributionCode.jsm"
const { AttributionIOUtils } = ChromeUtils.importESModule(
"resource:///modules/AttributionCode.sys.mjs"
);
const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");

8
browser/components/attribution/test/browser/browser_AttributionCode_telemetry.js
View File

@@ -1,16 +1,16 @@
ChromeUtils.defineESModuleGetters(this, {
TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
});
const { AttributionIOUtils } = ChromeUtils.import(
"resource:///modules/AttributionCode.jsm"
const { AttributionIOUtils } = ChromeUtils.importESModule(
"resource:///modules/AttributionCode.sys.mjs"
);
add_task(async function test_parse_error() {
if (AppConstants.platform == "macosx") {
// On macOS, the underlying data is the OS-level quarantine
// database. We need to start from nothing to isolate the cache.
const { MacAttribution } = ChromeUtils.import(
"resource:///modules/MacAttribution.jsm"
const { MacAttribution } = ChromeUtils.importESModule(
"resource:///modules/MacAttribution.sys.mjs"
);
let attributionSvc = Cc["@mozilla.org/mac-attribution;1"].getService(
Ci.nsIMacAttributionService

4
browser/components/attribution/test/browser/head.js
View File

@@ -3,8 +3,8 @@
*/
"use strict";
const { AttributionCode } = ChromeUtils.import(
"resource:///modules/AttributionCode.jsm"
const { AttributionCode } = ChromeUtils.importESModule(
"resource:///modules/AttributionCode.sys.mjs"
);
// Keep in sync with `BROWSER_ATTRIBUTION_ERRORS` in Histograms.json.

8
browser/components/attribution/test/xpcshell/head.js
View File

@@ -3,8 +3,8 @@
*/
"use strict";
const { AttributionCode } = ChromeUtils.import(
"resource:///modules/AttributionCode.jsm"
const { AttributionCode } = ChromeUtils.importESModule(
"resource:///modules/AttributionCode.sys.mjs"
);
let validAttrCodes = [
@@ -115,8 +115,8 @@ async function setupStubs() {
if (AppConstants.platform == "macosx") {
// We're implicitly using the fact that modules are shared between importers here.
const { MacAttribution } = ChromeUtils.import(
"resource:///modules/MacAttribution.jsm"
const { MacAttribution } = ChromeUtils.importESModule(
"resource:///modules/MacAttribution.sys.mjs"
);
sinon
.stub(MacAttribution, "applicationPath")

4
browser/components/attribution/test/xpcshell/test_MacAttribution.js
View File

@@ -4,8 +4,8 @@
"use strict";
const { MacAttribution } = ChromeUtils.import(
"resource:///modules/MacAttribution.jsm"
const { MacAttribution } = ChromeUtils.importESModule(
"resource:///modules/MacAttribution.sys.mjs"
);
add_task(async () => {