Bug 1095466 - Make marketplace api url overrideable. r=kgrandon

apps/search/js/providers/marketplace.js

@@ -5,11 +5,7 @@
   'use strict';
 
   const NUM_DISPLAY = 4;
-  const API = 'https://marketplace.firefox.com/api/v2/apps/search/rocketbar/' +
-    '?q={q}' +
-    '&limit=' + NUM_DISPLAY +
-    '&lang=' + document.documentElement.lang +
-    '&region=restofworld';
+  var apiUrl = null;
 
   function Marketplace() {}
 
@@ -23,16 +19,30 @@
     dedupeStrategy: 'exact',
     remote: true,
 
+    init: function() {
+
+      DataGridProvider.prototype.init.apply(this, arguments);
+      var urlKey = 'search.marketplace.url';
+      var req = navigator.mozSettings.createLock().get(urlKey);
+      req.onsuccess = function () {
+        if (req.result[urlKey]) {
+          apiUrl = req.result[urlKey]
+            .replace('{limit}', NUM_DISPLAY)
+            .replace('{lang}', document.documentElement.lang);
+        }
+      };
+    },
+
     search: function(input) {
       return new Promise((resolve, reject) => {
         this.abort();
 
-        if (!input) {
-          return;
+        if (!input || !apiUrl) {
+          return reject();
         }
 
         var req = new XMLHttpRequest();
-        req.open('GET', API.replace('{q}', input), true);
+        req.open('GET', apiUrl.replace('{q}', input), true);
         req.onload = (function onload() {
           var results = JSON.parse(req.responseText);
           if (!results.length) {

apps/search/test/unit/providers/marketplace_test.js

@@ -1,6 +1,7 @@
 'use strict';
 /* global MocksHelper, Search */
-
+/* global MockNavigatorSettings */
+require('/shared/test/unit/mocks/mock_navigator_moz_settings.js');
 require('/shared/test/unit/mocks/mock_moz_activity.js');
 require('/shared/test/unit/mocks/mock_l10n.js');
 
@@ -25,9 +26,16 @@ var mocksForMarketplaceProvider = new MocksHelper([
 suite('search/providers/marketplace', function() {
   mocksForMarketplaceProvider.attachTestHelpers();
 
-  var fakeElement, stubById, subject;
+  var fakeElement, stubById, subject, realMozSettings;
 
   setup(function(done) {
+    realMozSettings = navigator.mozSettings;
+    navigator.mozSettings = MockNavigatorSettings;
+
+    navigator.mozSettings.createLock().set({
+      'search.marketplace.url': 'http://localhost'
+    });
+
     fakeElement = document.createElement('div');
     fakeElement.style.cssText = 'height: 100px; display: block;';
     stubById = this.sinon.stub(document, 'getElementById')

build/config/common-settings.json

@@ -185,6 +185,7 @@
    "ril.data.cp.apns": "",
    "ril.callerId": "CLIR_DEFAULT",
    "everythingme.api.url": "https://api.everything.me/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,
    "screen.timeout": 60,

shared/test/integration/profile.js

@@ -4,10 +4,11 @@
 module.exports = {
   settings: {
     'cdn.url': 'http://localhost',
-    'everythingme.api.url': null
+    'everythingme.api.url': null,
+    'search.marketplace.url': null
   },
   prefs: {
     'geo.wifi.uri': 'http://localhost'
-  },
+  }
   // apps: {}
 };