Merge pull request #27938 from KevinGrandon/bug_1129637_eme_endpoint_30

Bug 1129637 - Change app search endpoint
mozilla-b2g · Feb 25, 2015 · 7894b92 · 7894b92
2 parents 2006cbe + 134ffd7
commit 7894b92
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/build/config/common-settings.json b/build/config/common-settings.json
@@ -186,7 +186,7 @@
    "ril.data.apnSettings": "",
    "ril.data.cp.apns": "",
    "ril.callerId": "CLIR_DEFAULT",
-   "everythingme.api.url": "https://api.everything.me/partners/1.0/{resource}/",
+   "appsearch.url": "https://appsearch.services.mozilla.com/partners/1.0/{resource}/",
    "search.marketplace.url": "https://marketplace.firefox.com/api/v2/apps/search/rocketbar/?q={q}&limit={limit}&lang={lang}&region=restofworld",
    "screen.automatic-brightness": false,
    "screen.brightness": 1,

diff --git a/shared/js/everythingme/eme.js b/shared/js/everythingme/eme.js
@@ -25,8 +25,8 @@
       .then(
         function success(settings) {
           // config overrides
-          if (settings['everythingme.api.url']) {
-            this.config.apiUrl = settings['everythingme.api.url'];
+          if (settings['appsearch.url']) {
+            this.config.apiUrl = settings['appsearch.url'];
           }
 
           // wait for device init

diff --git a/shared/test/integration/eme_server/parent.js b/shared/test/integration/eme_server/parent.js
@@ -80,7 +80,7 @@ module.exports.setServerURL = function(client, server) {
   var chrome = client.scope({ context: 'chrome' });
   chrome.executeAsyncScript(function(url) {
     var request = navigator.mozSettings.createLock().set({
-      'everythingme.api.url': url
+      'appsearch.url': url
     });
     request.onsuccess = function() {
       marionetteScriptFinished();

diff --git a/shared/test/integration/profile.js b/shared/test/integration/profile.js
@@ -5,7 +5,7 @@ module.exports = {
   settings: {
     'search.suggestions.enabled': false,
     'cdn.url': 'http://localhost',
-    'everythingme.api.url': null,
+    'appsearch.url': null,
     'search.marketplace.url': null
   },
   prefs: {