Merge pull request #23256 from KevinGrandon/bug_1054672_rocketbar_tes…

…t_browser_chrome_new_window

Bug 1054672 - Failing rocketbar test, browser_chrome_new_window.js

apps/system/js/app_chrome.js

@@ -12,12 +12,14 @@
   var _id = 0;
   var _ = navigator.mozL10n.get;
 
-  var newTabApp = null;
+  var newTabManifestURL = null;
   SettingsListener.observe('rocketbar.newTabAppURL', '',
     function(url) {
-      var manifestURL = url ? url.match(/(^.*?:\/\/.*?\/)/)[1] +
+      // The application list in applications.js is not yet ready, so we store
+      // only the manifestURL for now and we look up the application whenever
+      // we trigger a new window.
+      newTabManifestURL = url ? url.match(/(^.*?:\/\/.*?\/)/)[1] +
         'manifest.webapp' : '';
-      newTabApp = applications.getByManifestURL(manifestURL);
     });
 
   /**
@@ -621,9 +623,8 @@
   };
 
   AppChrome.prototype.onNewWindow = function ac_onNewWindow() {
-    if (newTabApp) {
-      newTabApp.launch();
-    }
+    var newTabApp = applications.getByManifestURL(newTabManifestURL);
+    newTabApp.launch();
 
     this.hideOverflowMenu();
   };

apps/system/test/marionette/browser_chrome_new_window.js → apps/system/test/marionette/browser_chrome_new_window_test.js

@@ -6,6 +6,7 @@ var Home = require(
   '../../../../apps/verticalhome/test/marionette/lib/home2');
 var Search = require(
   '../../../../apps/search/test/marionette/lib/search');
+var Server = require('../../../../shared/test/integration/server');
 var System = require('./lib/system');
 var Rocketbar = require('./lib/rocketbar');
 
@@ -21,7 +22,18 @@ marionette('Browser Chrome - Open New Window', function() {
     }
   });
 
-  var actions, home, rocketbar, search, system;
+  var actions, home, rocketbar, search, server, system;
+
+  suiteSetup(function(done) {
+    Server.create(__dirname + '/fixtures/', function(err, _server) {
+      server = _server;
+      done();
+    });
+  });
+
+  suiteTeardown(function() {
+    server.stop();
+  });
 
   setup(function() {
     actions = new Actions(client);
@@ -36,8 +48,9 @@ marionette('Browser Chrome - Open New Window', function() {
 
   test('open new window', function() {
     // Use the home-screen search box to open up the system browser
+    var url = server.url('sample.html');
     rocketbar.homescreenFocus();
-    rocketbar.enterText('mozilla.org\uE006');
+    rocketbar.enterText(url + '\uE006');
 
     // Count the number of currently open apps
     var nApps = system.getAppWindows().length;
@@ -53,6 +66,8 @@ marionette('Browser Chrome - Open New Window', function() {
 
     // Confirm that a new window was opened
     client.switchToFrame();
-    assert(system.getAppWindows().length === nApps + 1);
+    client.waitFor(function(){
+      return system.getAppWindows().length === nApps + 1;
+    });
   });
 });