mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-11 05:39:41 +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
92 lines
2.8 KiB
JavaScript
92 lines
2.8 KiB
JavaScript
/* Any copyright is dedicated to the Public Domain.
|
|
http://creativecommons.org/publicdomain/zero/1.0/ */
|
|
|
|
const {CertUtils} = ChromeUtils.import("resource://gre/modules/CertUtils.jsm");
|
|
|
|
const PREF_PREFIX = "certutils.certs.";
|
|
|
|
function resetPrefs() {
|
|
var prefs = Services.prefs.getChildList(PREF_PREFIX);
|
|
prefs.forEach(Services.prefs.clearUserPref);
|
|
}
|
|
|
|
function attributes_match(aCert, aExpected) {
|
|
if (Object.keys(aCert).length != Object.keys(aExpected).length)
|
|
return false;
|
|
|
|
for (var attribute in aCert) {
|
|
if (!(attribute in aExpected))
|
|
return false;
|
|
if (aCert[attribute] != aExpected[attribute])
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
function test_results(aCerts, aExpected) {
|
|
Assert.equal(aCerts.length, aExpected.length);
|
|
|
|
for (var i = 0; i < aCerts.length; i++) {
|
|
if (!attributes_match(aCerts[i], aExpected[i])) {
|
|
dump("Attributes for certificate " + (i + 1) + " did not match expected attributes\n");
|
|
dump("Saw: " + aCerts[i].toSource() + "\n");
|
|
dump("Expected: " + aExpected[i].toSource() + "\n");
|
|
Assert.ok(false);
|
|
}
|
|
}
|
|
}
|
|
|
|
add_test(function test_singleCert() {
|
|
Services.prefs.setCharPref(PREF_PREFIX + "1.attribute1", "foo");
|
|
Services.prefs.setCharPref(PREF_PREFIX + "1.attribute2", "bar");
|
|
|
|
var certs = CertUtils.readCertPrefs(PREF_PREFIX);
|
|
test_results(certs, [{
|
|
attribute1: "foo",
|
|
attribute2: "bar",
|
|
}]);
|
|
|
|
resetPrefs();
|
|
run_next_test();
|
|
});
|
|
|
|
add_test(function test_multipleCert() {
|
|
Services.prefs.setCharPref(PREF_PREFIX + "1.md5Fingerprint", "cf84a9a2a804e021f27cb5128fe151f4");
|
|
Services.prefs.setCharPref(PREF_PREFIX + "1.nickname", "1st cert");
|
|
Services.prefs.setCharPref(PREF_PREFIX + "2.md5Fingerprint", "9441051b7eb50e5ca2226095af710c1a");
|
|
Services.prefs.setCharPref(PREF_PREFIX + "2.nickname", "2nd cert");
|
|
|
|
var certs = CertUtils.readCertPrefs(PREF_PREFIX);
|
|
test_results(certs, [{
|
|
md5Fingerprint: "cf84a9a2a804e021f27cb5128fe151f4",
|
|
nickname: "1st cert",
|
|
}, {
|
|
md5Fingerprint: "9441051b7eb50e5ca2226095af710c1a",
|
|
nickname: "2nd cert",
|
|
}]);
|
|
|
|
resetPrefs();
|
|
run_next_test();
|
|
});
|
|
|
|
add_test(function test_skippedCert() {
|
|
Services.prefs.setCharPref(PREF_PREFIX + "1.issuerName", "Mozilla");
|
|
Services.prefs.setCharPref(PREF_PREFIX + "1.nickname", "1st cert");
|
|
Services.prefs.setCharPref(PREF_PREFIX + "2.issuerName", "Top CA");
|
|
Services.prefs.setCharPref(PREF_PREFIX + "2.nickname", "2nd cert");
|
|
Services.prefs.setCharPref(PREF_PREFIX + "4.issuerName", "Unknown CA");
|
|
Services.prefs.setCharPref(PREF_PREFIX + "4.nickname", "Ignored cert");
|
|
|
|
var certs = CertUtils.readCertPrefs(PREF_PREFIX);
|
|
test_results(certs, [{
|
|
issuerName: "Mozilla",
|
|
nickname: "1st cert",
|
|
}, {
|
|
issuerName: "Top CA",
|
|
nickname: "2nd cert",
|
|
}]);
|
|
|
|
resetPrefs();
|
|
run_next_test();
|
|
});
|