mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-09 21:00:42 +02:00
e930b89c34
***
Bug 1514594: Part 3a - Change ChromeUtils.import to return an exports object; not pollute global. r=mccr8
This changes the behavior of ChromeUtils.import() to return an exports object,
rather than a module global, in all cases except when `null` is passed as a
second argument, and changes the default behavior not to pollute the global
scope with the module's exports. Thus, the following code written for the old
model:
ChromeUtils.import("resource://gre/modules/Services.jsm");
is approximately the same as the following, in the new model:
var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
Since the two behaviors are mutually incompatible, this patch will land with a
scripted rewrite to update all existing callers to use the new model rather
than the old.
***
Bug 1514594: Part 3b - Mass rewrite all JS code to use the new ChromeUtils.import API. rs=Gijs
This was done using the followng script:
https://bitbucket.org/kmaglione/m-c-rewrites/src/tip/processors/cu-import-exports.jsm
***
Bug 1514594: Part 3c - Update ESLint plugin for ChromeUtils.import API changes. r=Standard8
Differential Revision: https://phabricator.services.mozilla.com/D16747
***
Bug 1514594: Part 3d - Remove/fix hundreds of duplicate imports from sync tests. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16748
***
Bug 1514594: Part 3e - Remove no-op ChromeUtils.import() calls. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16749
***
Bug 1514594: Part 3f.1 - Cleanup various test corner cases after mass rewrite. r=Gijs
***
Bug 1514594: Part 3f.2 - Cleanup various non-test corner cases after mass rewrite. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16750
--HG--
extra : rebase_source : 359574ee3064c90f33bf36c2ebe3159a24cc8895
extra : histedit_source : b93c8f42808b1599f9122d7842d2c0b3e656a594%2C64a3a4e3359dc889e2ab2b49461bab9e27fc10a7
41 lines
1.6 KiB
JavaScript
41 lines
1.6 KiB
JavaScript
/* Any copyright is dedicated to the Public Domain.
|
|
* http://creativecommons.org/publicdomain/zero/1.0/ */
|
|
|
|
"use strict";
|
|
|
|
const {CreditCard} = ChromeUtils.import("resource://gre/modules/CreditCard.jsm");
|
|
const {OSKeyStore} = ChromeUtils.import("resource://formautofill/OSKeyStore.jsm");
|
|
const {OSKeyStoreTestUtils} = ChromeUtils.import("resource://testing-common/OSKeyStoreTestUtils.jsm");
|
|
|
|
let oldGetters = {};
|
|
let gFakeLoggedIn = true;
|
|
|
|
add_task(function setup() {
|
|
OSKeyStoreTestUtils.setup();
|
|
oldGetters.isLoggedIn = Object.getOwnPropertyDescriptor(OSKeyStore, "isLoggedIn").get;
|
|
OSKeyStore.__defineGetter__("isLoggedIn", () => gFakeLoggedIn);
|
|
registerCleanupFunction(async () => {
|
|
OSKeyStore.__defineGetter__("isLoggedIn", oldGetters.isLoggedIn);
|
|
await OSKeyStoreTestUtils.cleanup();
|
|
|
|
// CreditCard.jsm, OSKeyStore.jsm, and OSKeyStoreTestUtils.jsm are imported
|
|
// into the global scope -- the window -- above. If they're not deleted,
|
|
// they outlive the test and are reported as a leak.
|
|
delete window.OSKeyStore;
|
|
delete window.CreditCard;
|
|
delete window.OSKeyStoreTestUtils;
|
|
});
|
|
});
|
|
|
|
add_task(async function test_getLabel_withOSKeyStore() {
|
|
ok(OSKeyStore.isLoggedIn, "Confirm that OSKeyStore is faked and thinks it is logged in");
|
|
|
|
const ccNumber = "4111111111111111";
|
|
const encryptedNumber = await OSKeyStore.encrypt(ccNumber);
|
|
const decryptedNumber = await OSKeyStore.decrypt(encryptedNumber);
|
|
is(decryptedNumber, ccNumber, "Decrypted CC number should match original");
|
|
|
|
const name = "Foxkeh";
|
|
const label = CreditCard.getLabel({name: "Foxkeh", number: ccNumber});
|
|
is(label, `**** 1111, ${name}`, "Label matches");
|
|
});
|