Bug 1801379 - Migrate Sinon.jsm to an ES module r=extension-reviewers,application-update-reviewers,pip-reviewers,credential-management-reviewers,fxview-reviewers,devtools-reviewers,Standard8,nchevobbe,sclements,dimi,mconley,bytesized,robwu

Migrated `testing/modules/Sinon.sys.mjs` to an ES module.

`testing` should now be 100% ESM 🎉

Differential Revision: https://phabricator.services.mozilla.com/D173643

Author: CanadaHonk

browser/base/content/test/contextMenu/browser_contextmenu_share_macosx.js

@@ -3,7 +3,9 @@
 
 "use strict";
 
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 const BASE = getRootDirectory(gTestPath).replace(
   "chrome://mochitests/content",
   // eslint-disable-next-line @microsoft/sdl/no-insecure-url

browser/base/content/test/contextMenu/browser_contextmenu_share_win.js

@@ -3,7 +3,9 @@
 
 "use strict";
 
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 const BASE = getRootDirectory(gTestPath).replace(
   "chrome://mochitests/content",
   // eslint-disable-next-line @microsoft/sdl/no-insecure-url

browser/base/content/test/contextMenu/browser_contextmenu_spellcheck.js

@@ -5,7 +5,9 @@
 
 let contextMenu;
 
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 
 const example_base =
   // eslint-disable-next-line @microsoft/sdl/no-insecure-url

browser/base/content/test/general/browser_contentAreaClick.js

@@ -14,7 +14,9 @@
  * correctly prevent default events, and follows the correct code path.
  */
 
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 
 var gTests = [
   {

browser/base/content/test/menubar/browser_file_share.js

@@ -3,7 +3,9 @@
 
 "use strict";
 
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 const BASE = getRootDirectory(gTestPath).replace(
   "chrome://mochitests/content",
   // eslint-disable-next-line @microsoft/sdl/no-insecure-url

browser/base/content/test/pageActions/head.js

@@ -6,11 +6,11 @@ ChromeUtils.defineESModuleGetters(this, {
     "resource://testing-common/EnterprisePolicyTesting.sys.mjs",
   PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
   TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
+  sinon: "resource://testing-common/Sinon.sys.mjs",
 });
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   ExtensionCommon: "resource://gre/modules/ExtensionCommon.jsm",
-  sinon: "resource://testing-common/Sinon.jsm",
 });
 
 async function promisePageActionPanelOpen(win = window, eventDict = {}) {

browser/base/content/test/protectionsUI/browser_protectionsUI_cookie_banner.js

@@ -10,7 +10,9 @@
 const { TelemetryTestUtils } = ChromeUtils.importESModule(
   "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 
 const {
   MODE_DISABLED,

browser/base/content/test/sync/head.js

@@ -1,7 +1,9 @@
 const { UIState } = ChromeUtils.importESModule(
   "resource://services-sync/UIState.sys.mjs"
 );
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 
 function promiseSyncReady() {
   let service = Cc["@mozilla.org/weave/service;1"].getService(Ci.nsISupports)

browser/base/content/test/tabs/browser_removeTabs_order.js

@@ -3,7 +3,9 @@
 
 "use strict";
 
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 
 add_task(async function() {
   let tab1 = await addTab();

browser/base/content/test/tabs/common_link_in_tab_title_and_url_prefilled.js

@@ -2,7 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 
 const TEST_ROOT = getRootDirectory(gTestPath).replace(
   "chrome://mochitests/content",

browser/components/attribution/test/browser/browser_AttributionCode_Mac_telemetry.js

@@ -7,7 +7,9 @@ const { MacAttribution } = ChromeUtils.importESModule(
 const { AttributionIOUtils } = ChromeUtils.importESModule(
   "resource:///modules/AttributionCode.sys.mjs"
 );
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 
 async function assertCacheExistsAndIsEmpty() {
   // We should have written to the cache, and be able to read back

browser/components/attribution/test/xpcshell/head.js

@@ -102,7 +102,9 @@ async function setupStubs() {
   const { AppConstants } = ChromeUtils.importESModule(
     "resource://gre/modules/AppConstants.sys.mjs"
   );
-  const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+  const { sinon } = ChromeUtils.importESModule(
+    "resource://testing-common/Sinon.sys.mjs"
+  );
 
   // This depends on the caller to invoke it by name.  We do try to
   // prevent the most obvious incorrect invocation, namely

browser/components/attribution/test/xpcshell/test_AttributionCode.js

@@ -7,7 +7,9 @@ const { AppConstants } = ChromeUtils.importESModule(
   "resource://gre/modules/AppConstants.sys.mjs"
 );
 
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 
 add_task(async () => {
   await setupStubs();

browser/components/colorways/tests/browser/head.js

@@ -12,7 +12,9 @@ const { BuiltInThemes } = ChromeUtils.importESModule(
 const { ColorwayClosetOpener } = ChromeUtils.import(
   "resource:///modules/ColorwayClosetOpener.jsm"
 );
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 
 const MOCK_COLLECTION_TEST_CARD_IMAGE_PATH = "mockCollectionPreview.avif";
 const MOCK_THEME_NAME = "Mock Theme";

browser/components/extensions/test/browser/browser_ExtensionControlledPopup.js

@@ -2,7 +2,9 @@
 /* vim: set sts=2 sw=2 et tw=80: */
 
 "use strict";
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 
 ChromeUtils.defineModuleGetter(
   this,

browser/components/extensions/test/xpcshell/test_ext_chrome_settings_overrides_home.js

@@ -9,11 +9,11 @@ const { AddonTestUtils } = ChromeUtils.import(
 ChromeUtils.defineESModuleGetters(this, {
   RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
   TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
+  sinon: "resource://testing-common/Sinon.sys.mjs",
 });
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   HomePage: "resource:///modules/HomePage.jsm",
-  sinon: "resource://testing-common/Sinon.jsm",
 });
 
 function promisePrefChanged(expectedValue) {

browser/components/extensions/test/xpcshell/test_ext_chrome_settings_overrides_update.js

@@ -9,12 +9,12 @@ const { AddonTestUtils } = ChromeUtils.import(
 ChromeUtils.defineESModuleGetters(this, {
   PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
   RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
+  sinon: "resource://testing-common/Sinon.sys.mjs",
 });
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AddonManager: "resource://gre/modules/AddonManager.jsm",
   HomePage: "resource:///modules/HomePage.jsm",
-  sinon: "resource://testing-common/Sinon.jsm",
 });
 
 AddonTestUtils.init(this);

browser/components/extensions/test/xpcshell/test_ext_settings_overrides_defaults.js

@@ -19,7 +19,9 @@ const { RemoteSettings } = ChromeUtils.importESModule(
   "resource://services-settings/remote-settings.sys.mjs"
 );
 
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 
 const URLTYPE_SUGGEST_JSON = "application/x-suggestions+json";
 

browser/components/extensions/test/xpcshell/test_ext_settings_overrides_search_mozParam.js

@@ -12,7 +12,9 @@ const { SearchTestUtils } = ChromeUtils.importESModule(
 const { NimbusFeatures } = ChromeUtils.import(
   "resource://nimbus/ExperimentAPI.jsm"
 );
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 
 AddonTestUtils.init(this);
 AddonTestUtils.overrideCertDB();

browser/components/firefoxview/tests/browser/head.js

@@ -20,7 +20,9 @@ const { ASRouter } = ChromeUtils.import(
 const { UIState } = ChromeUtils.importESModule(
   "resource://services-sync/UIState.sys.mjs"
 );
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 const { FeatureCalloutMessages } = ChromeUtils.import(
   "resource://activity-stream/lib/FeatureCalloutMessages.jsm"
 );

browser/components/migration/tests/browser/browser_do_migration.js

@@ -3,7 +3,9 @@
 
 "use strict";
 
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 const { InternalTestingProfileMigrator } = ChromeUtils.importESModule(
   "resource:///modules/InternalTestingProfileMigrator.sys.mjs"
 );

browser/components/migration/tests/unit/test_Edge_registry_migration.js

@@ -3,7 +3,9 @@ http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 const { EdgeProfileMigrator } = ChromeUtils.importESModule(
   "resource:///modules/EdgeProfileMigrator.sys.mjs"
 );

browser/components/newtab/test/browser/head.js

@@ -19,7 +19,9 @@ const { FxAccounts } = ChromeUtils.importESModule(
 );
 // We import sinon here to make it available across all mochitest test files
 // eslint-disable-next-line no-unused-vars
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 // Set the content pref to make it available across tests
 const ABOUT_WELCOME_OVERRIDE_CONTENT_PREF = "browser.aboutwelcome.screens";
 // Test differently for windows 7 as theme screens are removed.

browser/components/newtab/test/xpcshell/test_AboutWelcomeAttribution.js

@@ -7,7 +7,9 @@
 const { AboutWelcomeDefaults } = ChromeUtils.import(
   "resource://activity-stream/aboutwelcome/lib/AboutWelcomeDefaults.jsm"
 );
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 const { AttributionCode } = ChromeUtils.importESModule(
   "resource:///modules/AttributionCode.sys.mjs"
 );

browser/components/newtab/test/xpcshell/test_AboutWelcomeTelemetry.js

@@ -10,7 +10,9 @@ const { AboutWelcomeTelemetry } = ChromeUtils.import(
 const { AttributionCode } = ChromeUtils.importESModule(
   "resource:///modules/AttributionCode.sys.mjs"
 );
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 const TELEMETRY_PREF = "browser.newtabpage.activity-stream.telemetry";
 
 add_task(function test_enabled() {

browser/components/newtab/test/xpcshell/test_OnboardingMessageProvider.js

@@ -4,7 +4,9 @@
 const { OnboardingMessageProvider } = ChromeUtils.import(
   "resource://activity-stream/lib/OnboardingMessageProvider.jsm"
 );
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 
 function getOnboardingScreenById(screens, screenId) {
   return screens.find(screen => {

browser/components/places/tests/browser/browser_bookmarkProperties_cancel.js

@@ -1,6 +1,8 @@
 "use strict";
 
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 
 const sandbox = sinon.createSandbox();
 

browser/components/places/tests/browser/browser_bookmarkProperties_speculativeConnection.js

@@ -7,7 +7,9 @@
  * Test to ensure that on "mousedown" in Toolbar we set Speculative Connection
  */
 
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 const sandbox = sinon.createSandbox();
 let spy = sandbox
   .stub(PlacesUIUtils, "setupSpeculativeConnection")

browser/components/places/tests/browser/browser_controller_onDrop_tagFolder.js

@@ -4,7 +4,9 @@
 
 "use strict";
 
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 
 const sandbox = sinon.createSandbox();
 const TAG_NAME = "testTag";

browser/components/places/tests/browser/browser_forgetthissite.js

@@ -8,7 +8,9 @@
 const { PromptTestUtils } = ChromeUtils.importESModule(
   "resource://testing-common/PromptTestUtils.sys.mjs"
 );
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 const { ForgetAboutSite } = ChromeUtils.importESModule(
   "resource://gre/modules/ForgetAboutSite.sys.mjs"
 );

browser/components/places/tests/browser/browser_toolbar_drop_bookmarklet.js

@@ -1,7 +1,9 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 const sandbox = sinon.createSandbox();
 
 const URL1 = "https://example.com/1/";

browser/components/places/tests/browser/interactions/head.js

@@ -6,7 +6,9 @@ const { Interactions } = ChromeUtils.importESModule(
   "resource:///modules/Interactions.sys.mjs"
 );
 
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 
 XPCOMUtils.defineLazyPreferenceGetter(
   this,

browser/components/places/tests/unit/test_PUIU_batchUpdatesForNode.js

@@ -1,4 +1,6 @@
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 
 /* eslint-disable mozilla/use-chromeutils-generateqi */
 

browser/components/pocket/test/head.js

@@ -9,7 +9,9 @@ ChromeUtils.defineModuleGetter(
   "chrome://pocket/content/pktApi.jsm"
 );
 
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 
 // PocketEnabled/Disabled promises return true if it was already
 // Enabled/Disabled, and false if it need to Enable/Disable.

browser/components/pocket/test/unit/head.js

@@ -9,4 +9,6 @@ XPCOMUtils.defineLazyScriptGetter(
   "chrome://pocket/content/pktUI.js"
 );
 
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);

browser/components/pocket/test/unit/panels/head.js

@@ -1,4 +1,6 @@
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { sinon } = ChromeUtils.importESModule(
+  "resource://testing-common/Sinon.sys.mjs"
+);
 
 const testGlobal = {
   PKT_PANEL_OVERLAY: class {