Merge pull request #11390 from KevinGrandon/bug_902199_fix_travis

Bug 902199 - Fix travis error r=vingtetun
mozilla-b2g · Aug 6, 2013 · 90c0082 · 90c0082
2 parents 70a9797 + 2713205
commit 90c0082
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 107 deletions.
diff --git a/apps/homescreen/js/configurator.js b/apps/homescreen/js/configurator.js
@@ -29,7 +29,7 @@ var Configurator = (function() {
           var provider = window[searchPage.provider] || dummyProvider;
           if (searchPage.enabled) {
             provider.init();
-            Homescreen.init(searchPage.separate_page? 1 : 0);
+            Homescreen.init(searchPage.separate_page ? 1 : 0);
           } else {
             startHomescreenByDefault();
             setTimeout(provider.destroy, 0);

diff --git a/apps/homescreen/js/homescreen.js b/apps/homescreen/js/homescreen.js
@@ -164,7 +164,7 @@ var Homescreen = (function() {
     },
 
     didEvmePreventHomeButton: function() {
-      var evme = ("EvmeFacade" in window) && window.EvmeFacade;
+      var evme = ('EvmeFacade' in window) && window.EvmeFacade;
       return evme.onHomeButtonPress && evme.onHomeButtonPress();
     },
 

diff --git a/apps/homescreen/test/unit/configurator_test.js b/apps/homescreen/test/unit/configurator_test.js
@@ -84,14 +84,6 @@ suite('configurator.js >', function() {
     assert.isUndefined(Configurator.getSection('petecan'));
   });
 
-  /*
-   * It checks the conditions when there is a search provider
-   */
-  test('Search provider enabled >', function() {
-    sendResponseText('{ "search_page":{ "provider": "xx","enabled": true } }');
-    assertHomescreen(1);
-  });
-
   /*
    * It checks the conditions when there is NOT a search provider
    */

diff --git a/apps/homescreen/test/unit/rocketbar_test.js b/apps/homescreen/test/unit/rocketbar_test.js