Bug 1266235 - Rename KintoBlocklist to blocklist-clients,r=mgoodwin
MozReview-Commit-ID: Eus7sHqN6GW
rename from services/common/KintoBlocklist.js
rename to services/common/blocklist-clients.js
--- a/services/common/blocklist-updater.js
+++ b/services/common/blocklist-updater.js
@@ -4,17 +4,17 @@
this.EXPORTED_SYMBOLS = ["checkVersions", "addTestKintoClient"];
const { classes: Cc, Constructor: CC, interfaces: Ci, utils: Cu } = Components;
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/Task.jsm");
Cu.importGlobalProperties(['fetch']);
-const BlocklistClients = Cu.import("resource://services-common/KintoBlocklist.js", {});
+const BlocklistClients = Cu.import("resource://services-common/blocklist-clients.js", {});
const PREF_KINTO_CHANGES_PATH = "services.kinto.changes.path";
const PREF_KINTO_BASE = "services.kinto.base";
const PREF_KINTO_BUCKET = "services.kinto.bucket";
const PREF_KINTO_LAST_UPDATE = "services.kinto.last_update_seconds";
const PREF_KINTO_LAST_ETAG = "services.kinto.last_etag";
const PREF_KINTO_CLOCK_SKEW_SECONDS = "services.kinto.clock_skew_seconds";
const PREF_KINTO_ONECRL_COLLECTION = "services.kinto.onecrl.collection";
--- a/services/common/moz.build
+++ b/services/common/moz.build
@@ -10,20 +10,20 @@ with Files('**'):
TEST_DIRS += ['tests']
EXTRA_COMPONENTS += [
'servicesComponents.manifest',
]
EXTRA_JS_MODULES['services-common'] += [
'async.js',
+ 'blocklist-clients.js',
'blocklist-updater.js',
'kinto-http-client.js',
'kinto-offline-client.js',
- 'KintoBlocklist.js',
'logmanager.js',
'observers.js',
'rest.js',
'stringbundle.js',
'utils.js',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
rename from services/common/tests/unit/test_kintoCertBlocklist.js
rename to services/common/tests/unit/test_blocklist_certificates.js
--- a/services/common/tests/unit/test_kintoCertBlocklist.js
+++ b/services/common/tests/unit/test_blocklist_certificates.js
@@ -1,13 +1,13 @@
const { Constructor: CC } = Components;
Cu.import("resource://testing-common/httpd.js");
-const { OneCRLBlocklistClient } = Cu.import("resource://services-common/KintoBlocklist.js");
+const { OneCRLBlocklistClient } = Cu.import("resource://services-common/blocklist-clients.js");
const { loadKinto } = Cu.import("resource://services-common/kinto-offline-client.js");
const BinaryInputStream = CC("@mozilla.org/binaryinputstream;1",
"nsIBinaryInputStream", "setInputStream");
let server;
// set up what we need to make storage adapters
rename from services/common/tests/unit/test_kintoAddonPluginBlocklist.js
rename to services/common/tests/unit/test_blocklist_clients.js
--- a/services/common/tests/unit/test_kintoAddonPluginBlocklist.js
+++ b/services/common/tests/unit/test_blocklist_clients.js
@@ -4,25 +4,25 @@ const KEY_PROFILEDIR = "ProfD";
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://testing-common/httpd.js");
Cu.import("resource://gre/modules/Timer.jsm");
const { FileUtils } = Cu.import("resource://gre/modules/FileUtils.jsm");
const { OS } = Cu.import("resource://gre/modules/osfile.jsm");
const { loadKinto } = Cu.import("resource://services-common/kinto-offline-client.js");
-const KintoBlocklist = Cu.import("resource://services-common/KintoBlocklist.js");
+const BlocklistClients = Cu.import("resource://services-common/blocklist-clients.js");
const BinaryInputStream = CC("@mozilla.org/binaryinputstream;1",
"nsIBinaryInputStream", "setInputStream");
const gBlocklistClients = [
- {client: KintoBlocklist.AddonBlocklistClient, filename: KintoBlocklist.FILENAME_ADDONS_JSON, testData: ["i808","i720", "i539"]},
- {client: KintoBlocklist.PluginBlocklistClient, filename: KintoBlocklist.FILENAME_PLUGINS_JSON, testData: ["p1044","p32","p28"]},
- {client: KintoBlocklist.GfxBlocklistClient, filename: KintoBlocklist.FILENAME_GFX_JSON, testData: ["g204","g200","g36"]},
+ {client: BlocklistClients.AddonBlocklistClient, filename: BlocklistClients.FILENAME_ADDONS_JSON, testData: ["i808","i720", "i539"]},
+ {client: BlocklistClients.PluginBlocklistClient, filename: BlocklistClients.FILENAME_PLUGINS_JSON, testData: ["p1044","p32","p28"]},
+ {client: BlocklistClients.GfxBlocklistClient, filename: BlocklistClients.FILENAME_GFX_JSON, testData: ["g204","g200","g36"]},
];
let server;
let kintoClient;
function kintoCollection(collectionName) {
if (!kintoClient) {
--- a/services/common/tests/unit/xpcshell.ini
+++ b/services/common/tests/unit/xpcshell.ini
@@ -4,19 +4,19 @@ tail =
firefox-appdir = browser
skip-if = toolkit == 'gonk'
support-files =
test_storage_adapter/**
# Test load modules first so syntax failures are caught early.
[test_load_modules.js]
+[test_blocklist_certificates.js]
+[test_blocklist_clients.js]
[test_blocklist_updater.js]
-[test_kintoAddonPluginBlocklist.js]
-[test_kintoCertBlocklist.js]
[test_kinto.js]
[test_storage_adapter.js]
[test_utils_atob.js]
[test_utils_convert_string.js]
[test_utils_dateprefs.js]
[test_utils_deepCopy.js]
--- a/toolkit/mozapps/extensions/nsBlocklistService.js
+++ b/toolkit/mozapps/extensions/nsBlocklistService.js
@@ -627,20 +627,20 @@ Blocklist.prototype = {
// When the blocklist loads we need to compare it to the current copy so
// make sure we have loaded it.
if (!this._isBlocklistLoaded())
this._loadBlocklist();
// If kinto update is enabled, do the kinto update
if (gPref.getBoolPref(PREF_KINTO_UPDATE_ENABLED)) {
- let KintoUpdater =
+ const updater =
Components.utils.import("resource://services-common/blocklist-updater.js",
{});
- KintoUpdater.checkVersions().catch(() => {
+ updater.checkVersions().catch(() => {
// Before we enable this in release, we want to collect telemetry on
// failed kinto updates - see bug 1254099
});
}
},
onXMLLoad: Task.async(function*(aEvent) {
let request = aEvent.target;