Bug 1095097 - Override e.me url to localhost during tests. r=kgrandon

mozilla-b2g · Nov 10, 2014 · 837e085 · 837e085
1 parent 1ae19a5
commit 837e085
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 6 deletions.
diff --git a/apps/system/test/marionette/browser_chrome_bookmark_web_result_test.js b/apps/system/test/marionette/browser_chrome_bookmark_web_result_test.js
@@ -53,6 +53,9 @@ marionette('Browser Chrome - Bookmark Web Result', function() {
 
   test('bookmark web result', function() {
     var bookmarkIdentifier = 'mozilla1.org/';
+    home.waitForLaunch();
+    home.focusRocketBar();
+    search.triggerFirstRun(rocketbar);
 
     rocketbar.homescreenFocus();
     rocketbar.enterText('mozilla');

diff --git a/apps/system/test/marionette/browser_chrome_share_web_result_test.js b/apps/system/test/marionette/browser_chrome_share_web_result_test.js
@@ -60,6 +60,10 @@ marionette('Browser Chrome - Share Web Result', function() {
   test('share web result via e-mail', function() {
     var linkIdentifier = 'mozilla1.org/';
 
+    home.waitForLaunch();
+    home.focusRocketBar();
+    search.triggerFirstRun(rocketbar);
+
     // Use the home-screen search box to open up the system browser
     rocketbar.homescreenFocus();
     rocketbar.enterText('mozilla');

diff --git a/apps/verticalhome/test/marionette/search_test.js b/apps/verticalhome/test/marionette/search_test.js
@@ -10,24 +10,30 @@ var Rocketbar = require(
 var Search = require('../../../../apps/search/test/marionette/lib/search.js');
 var System = require('../../../../apps/system/test/marionette/lib/system');
 var Server = require('../../../../shared/test/integration/server');
+var EmeServer = require(
+  '../../../../shared/test/integration/eme_server/parent');
 
 marionette('Vertical - Search', function() {
 
   var client = marionette.client(Home2.clientOptions);
-  var home, rocketbar, search, system, server;
+  var home, rocketbar, search, system, server, emeServer;
   var phoneIdentifier =
     'app://communications.gaiamobile.org/manifest.webapp-dialer';
 
   suiteSetup(function(done) {
     Server.create(__dirname + '/fixtures/', function(err, _server) {
       server = _server;
-      done();
+      EmeServer(client, function(err, _server) {
+        emeServer = _server;
+        done(err);
+      });
     });
     system = new System(client);
   });
 
-  suiteTeardown(function() {
+  suiteTeardown(function(done) {
     server.stop();
+    emeServer.close(done);
   });
 
   setup(function() {
@@ -37,6 +43,7 @@ marionette('Vertical - Search', function() {
     system = new System(client);
     system.waitForStartup();
     search.removeGeolocationPermission();
+    EmeServer.setServerURL(client, emeServer);
   });
 
   test('Search notification', function() {

diff --git a/shared/js/everythingme/api.js b/shared/js/everythingme/api.js
@@ -46,6 +46,13 @@
    * respectively
    */
   function Request(service, method, options) {
+
+    if (!eme.config.apiUrl) {
+      return new Promise(function(resolve, reject) {
+        reject('eme.config.apiUrl not defined');
+      });
+    }
+
     var resource = service + '/' + method;
     var url = eme.config.apiUrl.replace('{resource}', resource);
     var payload = '';

diff --git a/shared/js/everythingme/eme.js b/shared/js/everythingme/eme.js
@@ -7,14 +7,13 @@
   const mozSettings = navigator.mozSettings;
 
   const DEBUG = true;
-  const API_URL = 'https://api.everything.me/partners/1.0/{resource}/';
 
   var initPromise = null;
   var slice = Function.call.bind(Array.prototype.slice);
 
   exports.eme = {
     config: {
-      apiUrl: API_URL
+      apiUrl: null
     },
 
     init: function init() {

diff --git a/shared/test/integration/eme_server/child.js b/shared/test/integration/eme_server/child.js
@@ -83,6 +83,12 @@ var emeServer = new EmeServer(process.argv[2], {
     writeJSON(res, json);
   },
 
+  '/Search/suggestions': function(req, res) {
+    var file = fs.readFileSync(this.root + 'search_suggestions.json');
+    var json = JSON.parse(file);
+    writeJSON(res, json);
+  },
+
   '/settings/failAll': function(req, res) {
     this.fail = true;
     writeJSON(res);

diff --git a/shared/test/integration/eme_server/fixtures/search_suggestions.json b/shared/test/integration/eme_server/fixtures/search_suggestions.json
@@ -0,0 +1,12 @@
+{
+  "errorCode":1,
+  "processingTime":14.3,
+  "response": [
+    "[ab]out.com",
+    "ab",
+    "[ab]ercrombie & fitch",
+    "[ab]ner louima"
+  ],
+  "errorString":"OK",
+  "requestId":"8WxZsKjO_VU"
+}
diff --git a/shared/test/integration/profile.js b/shared/test/integration/profile.js
@@ -2,7 +2,9 @@
  * @fileoverview this is where all the global profile overrides live.
  */
 module.exports = {
-  // settings: {},
+  settings: {
+    'everythingme.api.url': null
+  }
   // prefs: {},
   // apps: {}
 };