Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1463750 - Move RemoteSettings to services/settings/ r=mgoodwin

Browse Source 
MozReview-Commit-ID: 7IwUysPBHZu

--HG--
rename : services/common/remote-settings.js => services/settings/remote-settings.js
rename : services/common/tests/unit/test_remote_settings.js => services/settings/test/unit/test_remote_settings.js
rename : services/common/tests/unit/test_remote_settings_jexl_filters.js => services/settings/test/unit/test_remote_settings_jexl_filters.js
rename : services/common/tests/unit/test_remote_settings_poll.js => services/settings/test/unit/test_remote_settings_poll.js
extra : rebase_source : 1940db50b675c935ff3a01b4e6ec99b0fc98df00
This commit is contained in:
Mathieu Leplatre 2018-05-24 15:32:40 +02:00
parent 8e4ea9e029
commit d3baae5bb1
17 changed files with 48 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/installer/package-manifest.in
View File

@ -299,6 +299,7 @@
@RESPATH@/components/CaptivePortalDetectComponents.manifest
@RESPATH@/components/captivedetect.js
@RESPATH@/components/servicesComponents.manifest
@RESPATH@/components/servicesSettings.manifest
@RESPATH@/components/cryptoComponents.manifest
@RESPATH@/components/TelemetryStartup.js
@RESPATH@/components/TelemetryStartup.manifest

1
mobile/android/installer/package-manifest.in
View File

@ -187,6 +187,7 @@
@BINPATH@/components/nsINIProcessor.manifest
@BINPATH@/components/nsINIProcessor.js
@BINPATH@/components/servicesComponents.manifest
@BINPATH@/components/servicesSettings.manifest
#ifndef MOZ_GECKOVIEW_JAR
@BINPATH@/components/TelemetryStartup.js

4
services/common/blocklist-clients.js
View File

@ -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-common/remote-settings.js");
ChromeUtils.defineModuleGetter(this, "jexlFilterFunc", "resource://services-common/remote-settings.js");
ChromeUtils.defineModuleGetter(this, "RemoteSettings", "resource://services-settings/remote-settings.js");
ChromeUtils.defineModuleGetter(this, "jexlFilterFunc", "resource://services-settings/remote-settings.js");
const PREF_BLOCKLIST_BUCKET = "services.blocklist.bucket";
const PREF_BLOCKLIST_ONECRL_COLLECTION = "services.blocklist.onecrl.collection";

4
services/common/docs/RemoteSettings.rst
View File

@ -4,7 +4,7 @@
Remote Settings
===============
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.
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.
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-common/remote-settings.js", {});
const { RemoteSettings } = ChromeUtils.import("resource://services-settings/remote-settings.js", {});
const data = await RemoteSettings("a-key").get();

1
services/common/moz.build
View File

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

2
services/common/tests/unit/head_global.js
View File

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

2
services/common/tests/unit/test_blocklist_targetapp_filter.js
View File

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

6
services/common/tests/unit/xpcshell.ini
View File

@ -18,12 +18,6 @@ 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

10
services/settings/moz.build
View File

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

4
services/common/remote-settings.js → services/settings/remote-settings.js
View File

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

2
services/settings/servicesSettings.manifest Normal file
View File

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

7
services/settings/test/unit/.eslintrc.js Normal file
View File

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

4
services/common/tests/unit/test_remote_settings.js → services/settings/test/unit/test_remote_settings.js
View File

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

3
services/common/tests/unit/test_remote_settings_jexl_filters.js → services/settings/test/unit/test_remote_settings_jexl_filters.js
View File

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

6
services/common/tests/unit/test_remote_settings_poll.js → services/settings/test/unit/test_remote_settings_poll.js
View File

@ -1,6 +1,10 @@
/* import-globals-from ../../../common/tests/unit/head_helpers.js */
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-common/remote-settings.js", {});
const { RemoteSettings } = ChromeUtils.import("resource://services-settings/remote-settings.js", {});
var server;

8
services/settings/test/unit/xpcshell.ini Normal file
View File

@ -0,0 +1,8 @@
[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]

2
toolkit/mozapps/extensions/Blocklist.jsm
View File

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