Backed out changeset b9bf5db54805 (bug 1463750) for ESlint failure at test_remote_settings.js on a CLOSED TREE

--HG--
rename : services/settings/remote-settings.js => services/common/remote-settings.js
rename : services/settings/test/unit/test_remote_settings.js => services/common/tests/unit/test_remote_settings.js
rename : services/settings/test/unit/test_remote_settings_jexl_filters.js => services/common/tests/unit/test_remote_settings_jexl_filters.js
rename : services/settings/test/unit/test_remote_settings_poll.js => services/common/tests/unit/test_remote_settings_poll.js

services/common/blocklist-clients.js

@@ -11,8 +11,8 @@ var EXPORTED_SYMBOLS = [
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm", {});
 
-ChromeUtils.defineModuleGetter(this, "RemoteSettings", "resource://services-settings/remote-settings.js");
-ChromeUtils.defineModuleGetter(this, "jexlFilterFunc", "resource://services-settings/remote-settings.js");
+ChromeUtils.defineModuleGetter(this, "RemoteSettings", "resource://services-common/remote-settings.js");
+ChromeUtils.defineModuleGetter(this, "jexlFilterFunc", "resource://services-common/remote-settings.js");
 
 const PREF_BLOCKLIST_BUCKET                  = "services.blocklist.bucket";
 const PREF_BLOCKLIST_ONECRL_COLLECTION       = "services.blocklist.onecrl.collection";

services/common/docs/RemoteSettings.rst

@@ -4,7 +4,7 @@
 Remote Settings
 ===============
 
-The `remote-settings.js <https://dxr.mozilla.org/mozilla-central/source/services/settings/remote-settings.js>`_ module offers the ability to fetch remote settings that are kept in sync with Mozilla servers.
+The `remote-settings.js <https://dxr.mozilla.org/mozilla-central/source/services/common/remote-settings.js>`_ module offers the ability to fetch remote settings that are kept in sync with Mozilla servers.
 
 
 Usage
@@ -14,7 +14,7 @@ The ``get()`` method returns the list of entries for a specific key. Each entry
 
 .. code-block:: js
 
-    const { RemoteSettings } = ChromeUtils.import("resource://services-settings/remote-settings.js", {});
+    const { RemoteSettings } = ChromeUtils.import("resource://services-common/remote-settings.js", {});
 
     const data = await RemoteSettings("a-key").get();
 

services/common/moz.build

@@ -21,6 +21,7 @@ EXTRA_JS_MODULES['services-common'] += [
     'kinto-storage-adapter.js',
     'logmanager.js',
     'observers.js',
+    'remote-settings.js',
     'rest.js',
     'uptake-telemetry.js',
     'utils.js',

services/common/remote-settings.js

@@ -275,8 +275,8 @@ class RemoteSettingsClient {
     // a packaged JSON dump.
     if (timestamp == null) {
       try {
-         const { data } = await this._loadDumpFile();
-         await c.loadDump(data);
+        const { data } = await this._loadDumpFile();
+        await c.loadDump(data);
       } catch (e) {
         // Report but return an empty list since there will be no data anyway.
         Cu.reportError(e);

services/common/tests/unit/head_global.js

@@ -20,7 +20,7 @@ function addResourceAlias() {
   const handler = Services.io.getProtocolHandler("resource")
                   .QueryInterface(Ci.nsIResProtocolHandler);
 
-  let modules = ["common", "crypto", "settings"];
+  let modules = ["common", "crypto"];
   for (let module of modules) {
     let uri = Services.io.newURI("resource://gre/modules/services-" + module + "/");
     handler.setSubstitution("services-" + module, uri);

services/common/tests/unit/test_blocklist_targetapp_filter.js

@@ -1,5 +1,5 @@
 const BlocklistClients = ChromeUtils.import("resource://services-common/blocklist-clients.js", {});
-const { RemoteSettings } = ChromeUtils.import("resource://services-settings/remote-settings.js", {});
+const { RemoteSettings } = ChromeUtils.import("resource://services-common/remote-settings.js", {});
 
 const APP_ID = "xpcshell@tests.mozilla.org";
 const TOOLKIT_ID = "toolkit@mozilla.org";

services/common/tests/unit/test_remote_settings.js

@@ -3,7 +3,7 @@ const { Constructor: CC } = Components;
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://testing-common/httpd.js");
 
-const { RemoteSettings } = ChromeUtils.import("resource://services-settings/remote-settings.js", {});
+const { RemoteSettings } = ChromeUtils.import("resource://services-common/remote-settings.js", {});
 const { UptakeTelemetry } = ChromeUtils.import("resource://services-common/uptake-telemetry.js", {});
 
 const BinaryInputStream = CC("@mozilla.org/binaryinputstream;1",

services/common/tests/unit/test_remote_settings_jexl_filters.js

@@ -1,4 +1,4 @@
-const { RemoteSettings } = ChromeUtils.import("resource://services-settings/remote-settings.js", {});
+const { RemoteSettings } = ChromeUtils.import("resource://services-common/remote-settings.js", {});
 
 let client;
 

services/common/tests/unit/test_remote_settings_poll.js

@@ -1,8 +1,6 @@
-ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://testing-common/httpd.js");
-
 const { UptakeTelemetry } = ChromeUtils.import("resource://services-common/uptake-telemetry.js", {});
-const { RemoteSettings } = ChromeUtils.import("resource://services-settings/remote-settings.js", {});
+const { RemoteSettings } = ChromeUtils.import("resource://services-common/remote-settings.js", {});
 
 var server;
 

services/common/tests/unit/xpcshell.ini

@@ -18,6 +18,12 @@ tags = blocklist
 tags = blocklist
 [test_blocklist_pinning.js]
 tags = blocklist
+[test_remote_settings.js]
+tags = remote-settings blocklist
+[test_remote_settings_poll.js]
+tags = remote-settings blocklist
+[test_remote_settings_jexl_filters.js]
+tags = remote-settings
 
 [test_kinto.js]
 tags = blocklist

services/settings/moz.build

@@ -8,13 +8,3 @@ with Files('**'):
 DIRS += [
     'dumps',
 ]
-
-EXTRA_COMPONENTS += [
-    'servicesSettings.manifest',
-]
-
-EXTRA_JS_MODULES['services-settings'] += [
-    'remote-settings.js',
-]
-
-XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']

services/settings/servicesSettings.manifest

@@ -1,2 +0,0 @@
-# Register resource aliases
-resource services-settings resource://gre/modules/services-settings/

services/settings/test/unit/.eslintrc.js

@@ -1,7 +0,0 @@
-"use strict";
-
-module.exports = {
-  "extends": [
-    "plugin:mozilla/xpcshell-test"
-  ]
-};

services/settings/test/unit/xpcshell.ini

@@ -1,8 +0,0 @@
-[DEFAULT]
-head = ../../../common/tests/unit/head_global.js ../../../common/tests/unit/head_helpers.js
-firefox-appdir = browser
-tags = remote-settings
-
-[test_remote_settings.js]
-[test_remote_settings_poll.js]
-[test_remote_settings_jexl_filters.js]

toolkit/mozapps/extensions/Blocklist.jsm

@@ -40,7 +40,7 @@ XPCOMUtils.defineLazyGetter(this, "RemoteSettings", function() {
   // Instantiate blocklist clients.
   BlocklistClients.initialize();
   // Import RemoteSettings for ``pollChanges()``
-  const { RemoteSettings } = ChromeUtils.import("resource://services-settings/remote-settings.js", {});
+  const { RemoteSettings } = ChromeUtils.import("resource://services-common/remote-settings.js", {});
   return RemoteSettings;
 });