Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 12:51:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

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

`testing` should now be 100% ESM 🎉

Differential Revision: https://phabricator.services.mozilla.com/D173643
This commit is contained in:
CanadaHonk 2023-03-29 07:34:10 +00:00
parent 8cd944215e
commit 91709586ba
112 changed files with 294 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/base/content/test/contextMenu/browser_contextmenu_share_macosx.js
View File

@ -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

4
browser/base/content/test/contextMenu/browser_contextmenu_share_win.js
View File

@ -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

4
browser/base/content/test/contextMenu/browser_contextmenu_spellcheck.js
View File

@ -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

4
browser/base/content/test/general/browser_contentAreaClick.js
View File

@ -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 = [
{

4
browser/base/content/test/menubar/browser_file_share.js
View File

@ -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

2
browser/base/content/test/pageActions/head.js
View File

@ -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 = {}) {

4
browser/base/content/test/protectionsUI/browser_protectionsUI_cookie_banner.js
View File

@ -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,

4
browser/base/content/test/sync/head.js
View File

@ -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)

4
browser/base/content/test/tabs/browser_removeTabs_order.js
View File

@ -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();

4
browser/base/content/test/tabs/common_link_in_tab_title_and_url_prefilled.js
View File

@ -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",

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

@ -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

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

@ -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

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

@ -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();

4
browser/components/colorways/tests/browser/head.js
View File

@ -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";

4
browser/components/extensions/test/browser/browser_ExtensionControlledPopup.js
View File

@ -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,

2
browser/components/extensions/test/xpcshell/test_ext_chrome_settings_overrides_home.js
View File

@ -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) {

2
browser/components/extensions/test/xpcshell/test_ext_chrome_settings_overrides_update.js
View File

@ -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);

4
browser/components/extensions/test/xpcshell/test_ext_settings_overrides_defaults.js
View File

@ -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";

4
browser/components/extensions/test/xpcshell/test_ext_settings_overrides_search_mozParam.js
View File

@ -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();

4
browser/components/firefoxview/tests/browser/head.js
View File

@ -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"
);

4
browser/components/migration/tests/browser/browser_do_migration.js
View File

@ -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"
);

4
browser/components/migration/tests/unit/test_Edge_registry_migration.js
View File

@ -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"
);

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

@ -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.

4
browser/components/newtab/test/xpcshell/test_AboutWelcomeAttribution.js
View File

@ -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"
);

4
browser/components/newtab/test/xpcshell/test_AboutWelcomeTelemetry.js
View File

@ -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() {

4
browser/components/newtab/test/xpcshell/test_OnboardingMessageProvider.js
View File

@ -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 => {

4
browser/components/places/tests/browser/browser_bookmarkProperties_cancel.js
View File

@ -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();

4
browser/components/places/tests/browser/browser_bookmarkProperties_speculativeConnection.js
View File

@ -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")

4
browser/components/places/tests/browser/browser_controller_onDrop_tagFolder.js
View File

@ -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";

4
browser/components/places/tests/browser/browser_forgetthissite.js
View File

@ -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"
);

4
browser/components/places/tests/browser/browser_toolbar_drop_bookmarklet.js
View File

@ -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/";

4
browser/components/places/tests/browser/interactions/head.js
View File

@ -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,

4
browser/components/places/tests/unit/test_PUIU_batchUpdatesForNode.js
View File

@ -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 */

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

@ -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.

4
browser/components/pocket/test/unit/head.js
View File

@ -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"
);

4
browser/components/pocket/test/unit/panels/head.js
View File

@ -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 {

4
browser/components/preferences/tests/browser_sync_pairing.js
View File

@ -11,7 +11,9 @@ const { FxAccountsPairingFlow } = ChromeUtils.importESModule(
);
// Use sinon for mocking.
const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
const { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);
let flowCounter = 0;

4
browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about_default_pin_promo.js
View File

@ -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 sandbox = sinon.createSandbox();

4
browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about_nimbus_messaging.js
View File

@ -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"
);
add_task(async function test_experiment_messaging_system() {
const LOCALE = Services.locale.appLocaleAsBCP47;

4
browser/components/screenshots/tests/browser/browser_screenshots_test_screenshot_too_big.js
View File

@ -10,7 +10,9 @@ const SCREENSHOTS_EVENTS = [
{ category: "screenshots", method: "failed", object: "screenshot_too_large" },
];
const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
const { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);
ChromeUtils.defineESModuleGetters(this, {
ScreenshotsUtils: "resource:///modules/ScreenshotsUtils.sys.mjs",
});

4
browser/components/screenshots/tests/browser/browser_screenshots_test_toggle_pref.js
View File

@ -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"
);
ChromeUtils.defineESModuleGetters(this, {
ScreenshotsUtils: "resource:///modules/ScreenshotsUtils.sys.mjs",

4
browser/components/search/test/browser/browser_search_nimbus_reload.js
View File

@ -10,7 +10,9 @@ const { ExperimentFakes } = ChromeUtils.import(
const { SearchService } = ChromeUtils.importESModule(
"resource://gre/modules/SearchService.sys.mjs"
);
const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
const { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);
add_task(async function test_engines_reloaded_nimbus() {
let reloadSpy = sinon.spy(SearchService.prototype, "_maybeReloadEngines");

2
browser/components/search/test/unit/test_urlTelemetry.js
View File

@ -10,11 +10,11 @@ ChromeUtils.defineESModuleGetters(this, {
SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.sys.mjs",
SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
sinon: "resource://testing-common/Sinon.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
NetUtil: "resource://gre/modules/NetUtil.jsm",
sinon: "resource://testing-common/Sinon.jsm",
});
const TESTS = [

2
browser/components/search/test/unit/test_urlTelemetry_generic.js
View File

@ -10,11 +10,11 @@ ChromeUtils.defineESModuleGetters(this, {
SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.sys.mjs",
SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
sinon: "resource://testing-common/Sinon.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
NetUtil: "resource://gre/modules/NetUtil.jsm",
sinon: "resource://testing-common/Sinon.jsm",
});
const TEST_PROVIDER_INFO = [

4
browser/components/sessionstore/test/browser_firefoxView_selected_restore.js
View File

@ -4,7 +4,9 @@
const { _LastSession } = ChromeUtils.importESModule(
"resource:///modules/sessionstore/SessionStore.sys.mjs"
);
const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
const { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);
const state = {
windows: [

5
browser/components/shell/test/browser_setDefaultBrowser.js
View File

@ -1,11 +1,14 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
ChromeUtils.defineESModuleGetters(this, {
sinon: "resource://testing-common/Sinon.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
ExperimentAPI: "resource://nimbus/ExperimentAPI.jsm",
ExperimentFakes: "resource://testing-common/NimbusTestUtils.jsm",
NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
sinon: "resource://testing-common/Sinon.jsm",
});
const userChoiceStub = sinon

5
browser/components/shell/test/browser_setDefaultPDFHandler.js
View File

@ -1,11 +1,14 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
ChromeUtils.defineESModuleGetters(this, {
sinon: "resource://testing-common/Sinon.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
ExperimentAPI: "resource://nimbus/ExperimentAPI.jsm",
ExperimentFakes: "resource://testing-common/NimbusTestUtils.jsm",
NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
sinon: "resource://testing-common/Sinon.jsm",
});
XPCOMUtils.defineLazyServiceGetter(

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

@ -1 +1,3 @@
var { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
var { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);

4
browser/components/syncedtabs/test/xpcshell/head.js
View File

@ -1,7 +1,9 @@
var { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
var { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
var { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);
XPCOMUtils.defineLazyGetter(this, "FxAccountsCommon", function() {
return ChromeUtils.import("resource://gre/modules/FxAccountsCommon.js");

5
browser/components/tests/browser/head.js
View File

@ -5,10 +5,7 @@ http://creativecommons.org/publicdomain/zero/1.0/ */
ChromeUtils.defineESModuleGetters(this, {
TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
sinon: "resource://testing-common/Sinon.jsm",
sinon: "resource://testing-common/Sinon.sys.mjs",
});
// Helpers for testing telemetry events.

4
browser/components/tests/unit/head.js
View File

@ -2,5 +2,7 @@
* 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/. */
var { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
var { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);
var gProfD = do_get_profile().QueryInterface(Ci.nsIFile);

4
browser/components/uitour/test/browser_fxa_config.js
View File

@ -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"
);
var gTestTab;
var gContentAPI;

4
browser/components/urlbar/tests/browser/browser_dns_first_for_single_words.js
View File

@ -5,7 +5,9 @@
// the original search string to the docshell and not a search url.
add_task(async function test() {
const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
const { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);
const sandbox = sinon.createSandbox();
await SpecialPowers.pushPrefEnv({

2
browser/components/urlbar/tests/browser/head.js
View File

@ -19,6 +19,7 @@ ChromeUtils.defineESModuleGetters(this, {
UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.sys.mjs",
UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs",
UrlbarView: "resource:///modules/UrlbarView.sys.mjs",
sinon: "resource://testing-common/Sinon.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
@ -26,7 +27,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
ExperimentAPI: "resource://nimbus/ExperimentAPI.jsm",
ExperimentFakes: "resource://testing-common/NimbusTestUtils.jsm",
ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
sinon: "resource://testing-common/Sinon.jsm",
});
XPCOMUtils.defineLazyGetter(this, "PlacesFrecencyRecalculator", () => {

5
browser/components/urlbar/tests/engagementTelemetry/browser/head.js
View File

@ -30,12 +30,9 @@ XPCOMUtils.defineLazyGetter(this, "MerinoTestUtils", () => {
return module;
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
sinon: "resource://testing-common/Sinon.jsm",
});
ChromeUtils.defineESModuleGetters(lazy, {
UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.sys.mjs",
sinon: "resource://testing-common/Sinon.sys.mjs",
});
async function addTopSites(url) {

2
browser/components/urlbar/tests/quicksuggest/QuickSuggestTestUtils.sys.mjs
View File

@ -22,13 +22,13 @@ ChromeUtils.defineESModuleGetters(lazy, {
"resource:///modules/UrlbarProviderQuickSuggest.sys.mjs",
UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs",
setTimeout: "resource://gre/modules/Timer.sys.mjs",
sinon: "resource://testing-common/Sinon.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
ExperimentAPI: "resource://nimbus/ExperimentAPI.jsm",
ExperimentFakes: "resource://testing-common/NimbusTestUtils.jsm",
NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
sinon: "resource://testing-common/Sinon.jsm",
});
let gTestScope;

5
browser/components/urlbar/tests/quicksuggest/browser/browser_quicksuggest_configuration.js
View File

@ -10,10 +10,7 @@
ChromeUtils.defineESModuleGetters(this, {
EnterprisePolicyTesting:
"resource://testing-common/EnterprisePolicyTesting.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
sinon: "resource://testing-common/Sinon.jsm",
sinon: "resource://testing-common/Sinon.sys.mjs",
});
// We use this pref in enterprise preference policy tests. We specifically use a

5
browser/components/urlbar/tests/quicksuggest/browser/browser_telemetry_impressionEdgeCases.js
View File

@ -11,10 +11,7 @@ ChromeUtils.defineESModuleGetters(this, {
CONTEXTUAL_SERVICES_PING_TYPES:
"resource:///modules/PartnerLinkAttribution.sys.mjs",
UrlbarView: "resource:///modules/UrlbarView.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
sinon: "resource://testing-common/Sinon.jsm",
sinon: "resource://testing-common/Sinon.sys.mjs",
});
const { TELEMETRY_SCALARS } = UrlbarProviderQuickSuggest;

2
browser/components/urlbar/tests/unit/head.js
View File

@ -29,12 +29,12 @@ ChromeUtils.defineESModuleGetters(this, {
UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs",
UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.sys.mjs",
UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs",
sinon: "resource://testing-common/Sinon.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
AddonTestUtils: "resource://testing-common/AddonTestUtils.jsm",
HttpServer: "resource://testing-common/httpd.js",
sinon: "resource://testing-common/Sinon.jsm",
});
XPCOMUtils.defineLazyGetter(this, "QuickSuggestTestUtils", () => {

4
browser/components/urlbar/tests/unit/test_muxer.js
View File

@ -5,8 +5,8 @@
const lazy = {};
XPCOMUtils.defineLazyModuleGetters(lazy, {
sinon: "resource://testing-common/Sinon.jsm",
ChromeUtils.defineESModuleGetters(lazy, {
sinon: "resource://testing-common/Sinon.sys.mjs",
});
let sandbox;

4
browser/components/urlbar/tests/unit/test_resultGroups.js
View File

@ -9,8 +9,8 @@
const lazy = {};
XPCOMUtils.defineLazyModuleGetters(lazy, {
sinon: "resource://testing-common/Sinon.jsm",
ChromeUtils.defineESModuleGetters(lazy, {
sinon: "resource://testing-common/Sinon.sys.mjs",
});
// The possible limit-related properties in result groups.

4
browser/components/urlbar/tests/unit/test_search_suggestions.js
View File

@ -8,8 +8,8 @@
const lazy = {};
XPCOMUtils.defineLazyModuleGetters(lazy, {
sinon: "resource://testing-common/Sinon.jsm",
ChromeUtils.defineESModuleGetters(lazy, {
sinon: "resource://testing-common/Sinon.sys.mjs",
});
const SUGGEST_PREF = "browser.urlbar.suggest.searches";

4
browser/components/urlbar/tests/unit/test_suggestedIndexRelativeToGroup.js
View File

@ -7,8 +7,8 @@
const lazy = {};
XPCOMUtils.defineLazyModuleGetters(lazy, {
sinon: "resource://testing-common/Sinon.jsm",
ChromeUtils.defineESModuleGetters(lazy, {
sinon: "resource://testing-common/Sinon.sys.mjs",
});
const MAX_RESULTS = 10;

4
browser/extensions/formautofill/test/unit/head.js
View File

@ -25,7 +25,9 @@ var { FileTestUtils } = ChromeUtils.importESModule(
var { MockDocument } = ChromeUtils.importESModule(
"resource://testing-common/MockDocument.sys.mjs"
);
var { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
var { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);
var { TestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TestUtils.sys.mjs"
);

2
browser/modules/test/unit/test_HomePage.js
View File

@ -10,11 +10,11 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
ChromeUtils.defineESModuleGetters(this, {
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
sinon: "resource://testing-common/Sinon.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
HomePage: "resource:///modules/HomePage.jsm",
sinon: "resource://testing-common/Sinon.jsm",
});
const HOMEPAGE_IGNORELIST = "homepage-urls";

2
browser/modules/test/unit/test_HomePage_ignore.js
View File

@ -11,11 +11,11 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
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",
});
const HOMEPAGE_IGNORELIST = "homepage-urls";

4
browser/modules/test/unit/test_PartnerLinkAttribution.js
View File

@ -11,7 +11,9 @@ const {
"resource:///modules/PartnerLinkAttribution.sys.mjs"
);
const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
const { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);
const FAKE_PING = { tile_id: 1, position: 1 };

4
browser/modules/test/unit/test_PingCentre.js
View File

@ -17,7 +17,9 @@ const { UpdateUtils } = ChromeUtils.importESModule(
"resource://gre/modules/UpdateUtils.sys.mjs"
);
const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
const { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);
const FAKE_PING = { event: "fake_event", value: "fake_value", locale: "en-US" };
const FAKE_ENDPOINT = "https://www.test.com";

4
browser/themes/test/browser/browser_expireThemes.js
View File

@ -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 { AddonTestUtils } = ChromeUtils.import(
"resource://testing-common/AddonTestUtils.jsm"

4
devtools/client/aboutdebugging/test/xpcshell/test_runtime_default_preferences.js
View File

@ -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 {
setDefaultPreferencesIfNeeded,
PREFERENCE_TYPES,

4
intl/locale/tests/unit/test_langPackMatcher.js
View File

@ -8,7 +8,9 @@ const { getAddonAndLocalAPIsMocker } = ChromeUtils.importESModule(
const { LangPackMatcher } = ChromeUtils.importESModule(
"resource://gre/modules/LangPackMatcher.sys.mjs"
);
const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
const { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);
const sandbox = sinon.createSandbox();
const mockAddonAndLocaleAPIs = getAddonAndLocalAPIsMocker(this, sandbox);

4
services/common/tests/unit/test_async_foreach.js
View File

@ -4,7 +4,9 @@
const { Async } = ChromeUtils.importESModule(
"resource://services-common/async.sys.mjs"
);
const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
const { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);
function makeArray(length) {
// Start at 1 so that we can just divide by yieldEvery to get the expected

4
services/fxaccounts/tests/xpcshell/head.js
View File

@ -9,7 +9,9 @@
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
const { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);
const { SCOPE_OLD_SYNC, LEGACY_SCOPE_WEBEXT_SYNC } = ChromeUtils.import(
"resource://gre/modules/FxAccountsCommon.js"
);

4
services/sync/tests/unit/head_helpers.js
View File

@ -22,7 +22,9 @@ var { CommonUtils } = ChromeUtils.importESModule(
var { PlacesTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/PlacesTestUtils.sys.mjs"
);
var { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
var { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);
var {
SerializableSet,
Svc,

2
testing/docs/browser-chrome/writing.md
View File

@ -119,7 +119,7 @@ The [`Sinon`](https://sinonjs.org/) mocking framework is available. You can impo
using something like:
```js
const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
const { sinon } = ChromeUtils.importESModule("resource://testing-common/Sinon.sys.mjs");
```
More details on how to do mocking are available on the Sinon website.

19
testing/modules/Sinon.jsm → testing/modules/Sinon.sys.mjs
View File

@ -2,22 +2,18 @@
* 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/. */
"use strict";
var EXPORTED_SYMBOLS = ["sinon"];
// ================================================
// Load mocking/stubbing library sinon
// docs: http://sinonjs.org/releases/v7.2.7/
const {
import {
clearInterval,
clearTimeout,
setInterval,
setIntervalWithTarget,
setTimeout,
setTimeoutWithTarget,
} = ChromeUtils.importESModule("resource://gre/modules/Timer.sys.mjs");
// eslint-disable-next-line no-unused-vars
} from "resource://gre/modules/Timer.sys.mjs";
const obj = {
global: {
clearInterval,
@ -28,10 +24,17 @@ const obj = {
setTimeoutWithTarget,
Date,
},
clearInterval,
clearTimeout,
setInterval,
setIntervalWithTarget,
setTimeout,
setTimeoutWithTarget,
};
Services.scriptloader.loadSubScript(
"resource://testing-common/sinon-7.2.7.js",
obj
);
const sinon = obj.global.sinon;
export const sinon = obj.global.sinon;
// ================================================

2
testing/modules/moz.build
View File

@ -15,7 +15,7 @@ TESTING_JS_MODULES += [
"FileTestUtils.sys.mjs",
"MockRegistrar.sys.mjs",
"sinon-7.2.7.js",
"Sinon.jsm",
"Sinon.sys.mjs",
"StructuredLog.sys.mjs",
"TestUtils.sys.mjs",
"XPCShellContentUtils.sys.mjs",

4
toolkit/components/cookiebanners/test/unit/test_cookiebannerlistservice.js
View File

@ -7,7 +7,9 @@ const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
let { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
let { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);
// Name of the RemoteSettings collection containing the rules.
const COLLECTION_NAME = "cookie-banner-rules-list";

4
toolkit/components/extensions/test/xpcshell/test_ext_dnr_tabIds.js
View File

@ -24,7 +24,9 @@ add_setup(async () => {
const { WebRequest } = ChromeUtils.import(
"resource://gre/modules/WebRequest.jsm"
);
const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
const { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);
gTabLookupSpy = sinon.spy(WebRequest, "getTabIdForChannelWrapper");
await ExtensionTestUtils.startAddonManager();

4
toolkit/components/extensions/test/xpcshell/test_ext_scripting_startupCache.js
View File

@ -19,7 +19,9 @@ const { TestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TestUtils.sys.mjs"
);
const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
const { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);
add_task(async function test_hasPersistedScripts_startup_cache() {
let extension1 = ExtensionTestUtils.loadExtension({

4
toolkit/components/featuregates/test/unit/head.js
View File

@ -1 +1,3 @@
var { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
var { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);

4
toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/head.js
View File

@ -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 { JsonSchema } = ChromeUtils.importESModule(
"resource://gre/modules/JsonSchema.sys.mjs"
);

4
toolkit/components/messaging-system/targeting/test/unit/head.js
View File

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

2
toolkit/components/nimbus/test/NimbusTestUtils.jsm
View File

@ -20,6 +20,7 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
JsonSchema: "resource://gre/modules/JsonSchema.sys.mjs",
sinon: "resource://testing-common/Sinon.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
@ -29,7 +30,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
NormandyUtils: "resource://normandy/lib/NormandyUtils.jsm",
_RemoteSettingsExperimentLoader:
"resource://nimbus/lib/RemoteSettingsExperimentLoader.jsm",
sinon: "resource://testing-common/Sinon.jsm",
FeatureManifest: "resource://nimbus/FeatureManifest.js",
});

4
toolkit/components/nimbus/test/browser/head.js
View File

@ -4,7 +4,9 @@
"use strict";
// Globals
const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
const { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);
XPCOMUtils.defineLazyModuleGetters(this, {
ExperimentManager: "resource://nimbus/lib/ExperimentManager.jsm",

4
toolkit/components/nimbus/test/unit/head.js
View File

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

4
toolkit/components/normandy/test/NormandyTestUtils.jsm
View File

@ -15,7 +15,9 @@ const { NormandyUtils } = ChromeUtils.import(
const { RecipeRunner } = ChromeUtils.import(
"resource://normandy/lib/RecipeRunner.jsm"
);
const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
const { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);
const FIXTURE_ADDON_ID = "normandydriver-a@example.com";
const UUID_REGEX = /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/i;

4
toolkit/components/normandy/test/browser/head.js
View File

@ -40,7 +40,9 @@ const FileInputStream = Components.Constructor(
"init"
);
const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
const { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);
// Make sinon assertions fail in a way that mochitest understands
sinon.assert.fail = function(message) {

4
toolkit/components/normandy/test/unit/head_xpc.js
View File

@ -1,3 +1,5 @@
"use strict";
var { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
var { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);

4
toolkit/components/passwordmgr/test/browser/browser_autocomplete_import.js
View File

@ -5,7 +5,9 @@ const { ExperimentAPI } = 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"
);
// Dummy migrator to change and detect importable behavior.
const gTestMigrator = {

4
toolkit/components/passwordmgr/test/browser/browser_openPasswordManager.js
View File

@ -1,4 +1,6 @@
const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
const { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);
add_task(async function test_noFilter() {
let openingFunc = () =>

4
toolkit/components/passwordmgr/test/browser/browser_relay_telemetry.js
View File

@ -1,4 +1,6 @@
const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
const { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);
const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js");
const { getFxAccountsSingleton } = ChromeUtils.import(
"resource://gre/modules/FxAccounts.jsm"

4
toolkit/components/passwordmgr/test/unit/test_LoginManagerParent_doAutocompleteSearch.js
View File

@ -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 { LoginManagerParent } = ChromeUtils.import(
"resource://gre/modules/LoginManagerParent.jsm"
);

4
toolkit/components/passwordmgr/test/unit/test_LoginManagerParent_getGeneratedPassword.js
View File

@ -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 { LoginManagerParent } = ChromeUtils.import(
"resource://gre/modules/LoginManagerParent.jsm"
);

4
toolkit/components/passwordmgr/test/unit/test_LoginManagerParent_onPasswordEditedOrGenerated.js
View File

@ -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 { LoginManagerParent } = ChromeUtils.import(
"resource://gre/modules/LoginManagerParent.jsm"
);

4
toolkit/components/passwordmgr/test/unit/test_module_LoginExport.js
View File

@ -11,7 +11,9 @@
let { LoginExport } = ChromeUtils.import(
"resource://gre/modules/LoginExport.jsm"
);
let { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
let { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);
/**
* Saves the logins to a temporary CSV file, reads the lines and returns the CSV lines.

4
toolkit/components/pictureinpicture/tests/browser_changePiPSrcInFullscreen.js
View File

@ -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 NEW_VIDEO_ASPECT_RATIO = 1.334;

4
toolkit/components/places/tests/bookmarks/test_bookmarks_insert.js
View File

@ -179,7 +179,9 @@ add_task(async function invalid_properties_for_bookmark_type() {
});
add_task(async function test_insert_into_root_throws() {
const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
const { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);
const sandbox = sinon.createSandbox();
sandbox.stub(PlacesUtils, "isInAutomation").get(() => false);
registerCleanupFunction(() => sandbox.restore());

4
toolkit/components/places/tests/maintenance/test_preventive_maintenance.js
View File

@ -2808,7 +2808,9 @@ add_task(async function test_preventive_maintenance() {
// ------------------------------------------------------------------------------
add_task(async function test_idle_daily() {
const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
const { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);
const sandbox = sinon.createSandbox();
sandbox.stub(PlacesDBUtils, "maintenanceOnIdle");
Services.prefs.clearUserPref("places.database.lastMaintenance");

2
toolkit/components/search/tests/SearchTestUtils.sys.mjs
View File

@ -7,13 +7,13 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
sinon: "resource://testing-common/Sinon.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
AddonTestUtils: "resource://testing-common/AddonTestUtils.jsm",
ExtensionTestUtils: "resource://testing-common/ExtensionXPCShellUtils.jsm",
sinon: "resource://testing-common/Sinon.jsm",
});
var gTestScope;

Some files were not shown because too many files have changed in this diff Show More