Merge pull request #34287 from nullaus/bug1260897

Small fixes to marionette-apps. r=me
mozilla-b2g · May 5, 2016 · 025b492 · 025b492
2 parents 3322b12 + 4bb3c89
commit 025b492
Show file tree

Hide file tree

Showing 79 changed files with 40 additions and 232 deletions.
diff --git a/apps/homescreen/test/marionette/app_appcache_pending_test.js b/apps/homescreen/test/marionette/app_appcache_pending_test.js
@@ -26,7 +26,6 @@ marionette('Homescreen - Appcache installed download', function() {
     appInstall = new AppInstall(client);
 
     system.waitForFullyLoaded();
-    home.waitForLaunch();
   });
 
   teardown(function(done) {

diff --git a/apps/homescreen/test/marionette/app_blacklist_test.js b/apps/homescreen/test/marionette/app_blacklist_test.js
@@ -14,7 +14,6 @@ marionette('Homescreen - App Blacklist', function() {
     system.waitForFullyLoaded();
 
     client.apps.launch(home.URL);
-    home.waitForLaunch();
 
     // Fail finding elements quickly.
     client.setSearchTimeout(20);

diff --git a/apps/homescreen/test/marionette/app_default_order_test.js b/apps/homescreen/test/marionette/app_default_order_test.js
@@ -13,7 +13,6 @@ marionette('Homescreen - Default app order', function() {
     home = client.loader.getAppClass('homescreen');
     system = client.loader.getAppClass('system');
     system.waitForFullyLoaded();
-    home.waitForLaunch();
   });
 
   test('Default app order is respected', function() {

diff --git a/apps/homescreen/test/marionette/app_hosted_failed_icon_fetch_test.js b/apps/homescreen/test/marionette/app_hosted_failed_icon_fetch_test.js
@@ -26,7 +26,6 @@ marionette('Homescreen - Hosted app failed icon fetch', function() {
     appInstall = new AppInstall(client);
 
     system.waitForFullyLoaded();
-    home.waitForLaunch();
   });
 
   teardown(function(done) {

diff --git a/apps/homescreen/test/marionette/app_hosted_install_test.js b/apps/homescreen/test/marionette/app_hosted_install_test.js
@@ -26,7 +26,6 @@ marionette('Homescreen - Hosted App Install', function() {
     appInstall = new AppInstall(client);
 
     system.waitForFullyLoaded();
-    home.waitForLaunch();
   });
 
   teardown(function(done) {

diff --git a/apps/homescreen/test/marionette/app_hosted_retry_icon_fetch_test.js b/apps/homescreen/test/marionette/app_hosted_retry_icon_fetch_test.js
@@ -27,7 +27,6 @@ marionette('Homescreen - Hosted app failed icon fetch', function() {
     appInstall = new AppInstall(client);
 
     system.waitForFullyLoaded();
-    home.waitForLaunch();
   });
 
   teardown(function(done) {

diff --git a/apps/homescreen/test/marionette/app_hosted_use_cached_icon_test.js b/apps/homescreen/test/marionette/app_hosted_use_cached_icon_test.js
@@ -25,7 +25,6 @@ marionette('Homescreen - Hosted app cached icon fetch', function() {
     appInstall = new AppInstall(client);
 
     system.waitForFullyLoaded();
-    home.waitForLaunch();
   });
 
   teardown(function(done) {

diff --git a/apps/homescreen/test/marionette/app_order_test.js b/apps/homescreen/test/marionette/app_order_test.js
@@ -14,7 +14,6 @@ marionette('Homescreen - App order', function() {
     home = client.loader.getAppClass('homescreen');
     system = client.loader.getAppClass('system');
     system.waitForFullyLoaded();
-    home.waitForLaunch();
   });
 
   test('App order is retained after restart', function() {

diff --git a/apps/homescreen/test/marionette/app_packaged_fail_test.js b/apps/homescreen/test/marionette/app_packaged_fail_test.js
@@ -27,7 +27,6 @@ marionette('Homescreen - Packaged App Failed Download', function() {
     appInstall = new AppInstall(client);
 
     system.waitForFullyLoaded();
-    home.waitForLaunch();
   });
 
   teardown(function(done) {

diff --git a/apps/homescreen/test/marionette/app_packaged_install_test.js b/apps/homescreen/test/marionette/app_packaged_install_test.js
@@ -26,7 +26,6 @@ marionette('Homescreen - Packaged App Install', function() {
     appInstall = new AppInstall(client);
 
     system.waitForFullyLoaded();
-    home.waitForLaunch();
   });
 
   teardown(function(done) {

diff --git a/apps/homescreen/test/marionette/app_packaged_pending_test.js b/apps/homescreen/test/marionette/app_packaged_pending_test.js
@@ -26,7 +26,6 @@ marionette('Homescreen - Packaged App Pending', function() {
     appInstall = new AppInstall(client);
 
     system.waitForFullyLoaded();
-    home.waitForLaunch();
   });
 
   teardown(function(done) {

diff --git a/apps/homescreen/test/marionette/app_packaged_pending_update_test.js b/apps/homescreen/test/marionette/app_packaged_pending_update_test.js
@@ -29,7 +29,6 @@ marionette('Homescreen - Packaged App Pending Update', function() {
     // wait for the system app to be running
     system.waitForFullyLoaded();
     client.apps.launch(home.URL);
-    home.waitForLaunch();
 
     // install the app
     client.switchToFrame();

diff --git a/apps/homescreen/test/marionette/app_packaged_resume_test.js b/apps/homescreen/test/marionette/app_packaged_resume_test.js
@@ -23,7 +23,6 @@ marionette('Homescreen - Packaged App Resuming Downloads', function() {
       appInstall = new AppInstall(client);
 
       system.waitForFullyLoaded();
-      home.waitForLaunch();
 
       done(err);
     });

diff --git a/apps/homescreen/test/marionette/app_packaged_resume_update_test.js b/apps/homescreen/test/marionette/app_packaged_resume_update_test.js
@@ -29,7 +29,6 @@ marionette('Homescreen - Packaged App Resume Update', function() {
 
     // wait for the system app to be running
     system.waitForFullyLoaded();
-    home.waitForLaunch();
 
     // install the app
     client.switchToFrame();

diff --git a/apps/homescreen/test/marionette/app_packaged_role_hidden_test.js b/apps/homescreen/test/marionette/app_packaged_role_hidden_test.js
@@ -26,7 +26,6 @@ marionette('Homescreen - Packaged App Pending', function() {
     appInstall = new AppInstall(client);
 
     system.waitForFullyLoaded();
-    home.waitForLaunch();
   });
 
   teardown(function(done) {

diff --git a/apps/homescreen/test/marionette/app_packaged_update_test.js b/apps/homescreen/test/marionette/app_packaged_update_test.js
@@ -31,7 +31,6 @@ marionette('Homescreen - Packaged App Update', function() {
 
     // Launch the homescreen first, then go to the system app.
     // Make sure we do this before installing an application.
-    home.waitForLaunch();
     client.switchToFrame();
 
     // install the app with a broken icon

diff --git a/apps/homescreen/test/marionette/app_reorder_hint_test.js b/apps/homescreen/test/marionette/app_reorder_hint_test.js
@@ -12,7 +12,6 @@ marionette('Homescreen - App reordering', function() {
     home = client.loader.getAppClass('homescreen');
     system = client.loader.getAppClass('system');
     system.waitForFullyLoaded();
-    home.waitForLaunch();
   });
 
   test('App reordering has a visual hint', function() {

diff --git a/apps/homescreen/test/marionette/app_short_name_test.js b/apps/homescreen/test/marionette/app_short_name_test.js
@@ -21,7 +21,6 @@ marionette('Homescreen - App manifest', function() {
     system = client.loader.getAppClass('system');
     system.waitForFullyLoaded();
     client.apps.launch(home.URL);
-    home.waitForLaunch();
   });
 
   test('short_name', function() {

diff --git a/apps/homescreen/test/marionette/app_uninstall_pending_test.js b/apps/homescreen/test/marionette/app_uninstall_pending_test.js
@@ -37,7 +37,6 @@ marionette('Homescreen - App uninstall while pending', function() {
     // wait for the system app to be running
     system.waitForFullyLoaded();
     client.apps.launch(home.URL);
-    home.waitForLaunch();
 
     // install the app
     client.switchToFrame();

diff --git a/apps/homescreen/test/marionette/app_uninstall_test.js b/apps/homescreen/test/marionette/app_uninstall_test.js
@@ -33,7 +33,6 @@ marionette('Homescreen - App Uninstall', function() {
     system.waitForFullyLoaded();
 
     client.apps.launch(home.URL);
-    home.waitForLaunch();
   });
 
   function test_app_uninstall(manifestURL) {

diff --git a/apps/homescreen/test/marionette/app_unrecoverable_error_test.js b/apps/homescreen/test/marionette/app_unrecoverable_error_test.js
@@ -27,7 +27,6 @@ marionette('Homescreen - App unrecoverable error', function() {
     appInstall = new AppInstall(client);
 
     system.waitForFullyLoaded();
-    home.waitForLaunch();
   });
 
   teardown(function(done) {

diff --git a/apps/homescreen/test/marionette/group_append_test.js b/apps/homescreen/test/marionette/group_append_test.js
@@ -14,7 +14,6 @@ marionette('Homescreen - Group appending', function() {
     home = client.loader.getAppClass('homescreen');
     system = client.loader.getAppClass('system');
     system.waitForFullyLoaded();
-    home.waitForLaunch();
   });
 
   test('Appending to a group', function() {

diff --git a/apps/homescreen/test/marionette/group_create_test.js b/apps/homescreen/test/marionette/group_create_test.js
@@ -14,7 +14,6 @@ marionette('Homescreen - Group creation', function() {
     home = client.loader.getAppClass('homescreen');
     system = client.loader.getAppClass('system');
     system.waitForFullyLoaded();
-    home.waitForLaunch();
   });
 
   test('Creating a group', function() {

diff --git a/apps/homescreen/test/marionette/group_destroy_test.js b/apps/homescreen/test/marionette/group_destroy_test.js
@@ -12,7 +12,6 @@ marionette('Homescreen - Group destruction', function() {
     home = client.loader.getAppClass('homescreen');
     system = client.loader.getAppClass('system');
     system.waitForFullyLoaded();
-    home.waitForLaunch();
   });
 
   test('Removing the penultimate icon in a group', function() {

diff --git a/apps/homescreen/test/marionette/group_launch_test.js b/apps/homescreen/test/marionette/group_launch_test.js
@@ -15,7 +15,6 @@ marionette('Homescreen - Group launching', function() {
     home = client.loader.getAppClass('homescreen');
     system = client.loader.getAppClass('system');
     system.waitForFullyLoaded();
-    home.waitForLaunch();
   });
 
   test('Launching an icon in a group', function() {

diff --git a/apps/homescreen/test/marionette/group_order_test.js b/apps/homescreen/test/marionette/group_order_test.js
@@ -17,7 +17,6 @@ marionette('Homescreen - Group ordering', function() {
     home = client.loader.getAppClass('homescreen');
     system = client.loader.getAppClass('system');
     system.waitForFullyLoaded();
-    home.waitForLaunch();
   });
 
   test('Reordering an icon in a group', function() {

diff --git a/apps/homescreen/test/marionette/home_button_test.js b/apps/homescreen/test/marionette/home_button_test.js
@@ -32,7 +32,6 @@ marionette('Homescreen - Home button', function() {
     pinning = new Pinning(client);
     bookmark = new Bookmark(client, server);
     system.waitForFullyLoaded();
-    home.waitForLaunch();
   });
 
   test('scroll to the top of the screen', function() {
@@ -55,15 +54,13 @@ marionette('Homescreen - Home button', function() {
     system.dismissBanner();
 
     system.tapHome();
-    home.waitForLaunch();
 
     var icon = home.getIcon(url);
 
     home.scrollIconToCenter(icon);
     actions.longPress(icon, 1).perform();
 
     system.tapHome();
-    home.waitForLaunch();
 
     assert.equal(client.executeScript(function() {
       return document.body.classList.contains('edit-mode');

diff --git a/apps/homescreen/test/marionette/layout_test.js b/apps/homescreen/test/marionette/layout_test.js
@@ -13,7 +13,6 @@ marionette('Homescreen - Layout', function() {
     home = client.loader.getAppClass('homescreen');
     system = client.loader.getAppClass('system');
     system.waitForFullyLoaded();
-    home.waitForLaunch();
   });
 
   test('apps grid is LTR in LTR language', function() {

diff --git a/apps/homescreen/test/marionette/lib/homescreen.js b/apps/homescreen/test/marionette/lib/homescreen.js
@@ -98,23 +98,6 @@ Homescreen.prototype = {
     return this.client.findElement(Homescreen.Selectors.resumeDownload);
   },
 
-  /**
-   * Waits for the homescreen to launch and switches to the frame.
-   */
-  waitForLaunch: function() {
-    var client = this.client;
-    client.switchToFrame();
-    client.helper.waitForElement('body');
-    client.apps.switchToApp(Homescreen.URL);
-
-    // Wait for startup to complete
-    client.waitFor(function() {
-      return client.executeScript(function() {
-        return window.wrappedJSObject.appWindow.apps.startupMetadata === null;
-      });
-    });
-  },
-
   /**
    * Waits for the edit bar to fully appear.
    */

diff --git a/apps/homescreen/test/marionette/localization_test.js b/apps/homescreen/test/marionette/localization_test.js
@@ -13,7 +13,6 @@ marionette('Homescreen - Localization', function() {
     home = client.loader.getAppClass('homescreen');
     system = client.loader.getAppClass('system');
     system.waitForFullyLoaded();
-    home.waitForLaunch();
   });
 
   test('Localization updates icon names', function() {

diff --git a/apps/homescreen/test/marionette/pinning_edit_test.js b/apps/homescreen/test/marionette/pinning_edit_test.js
@@ -31,15 +31,13 @@ marionette('Homescreen - Pinned Site Edit', function() {
     pinning = new Pinning(client);
     bookmark = new Bookmark(client, server);
     system.waitForFullyLoaded();
-    home.waitForLaunch();
 
     url = server.url('sample.html');
     client.switchToFrame();
     pinning.openAndPinSiteFromBrowser(url);
     system.dismissBanner();
 
     system.tapHome();
-    home.waitForLaunch();
   });
 
   test('pressing enter after renaming the pinned site', function() {

diff --git a/apps/homescreen/test/marionette/pinning_invalid_favicon_test.js b/apps/homescreen/test/marionette/pinning_invalid_favicon_test.js
@@ -32,7 +32,6 @@ marionette('Homescreen - Pinning Favicon Failure', function() {
     system = client.loader.getAppClass('system');
     pinning = new Pinning(client, server);
     system.waitForFullyLoaded();
-    home.waitForLaunch();
 
     url = server.url('sample.html');
     client.switchToFrame();

diff --git a/apps/homescreen/test/marionette/pinning_order_test.js b/apps/homescreen/test/marionette/pinning_order_test.js
@@ -29,7 +29,6 @@ marionette('Homescreen - Pin order', function() {
     home = client.loader.getAppClass('homescreen');
     system = client.loader.getAppClass('system');
     system.waitForFullyLoaded();
-    home.waitForLaunch();
   });
 
   test('Pin order is retained after restart', function() {

diff --git a/apps/homescreen/test/marionette/pinning_test.js b/apps/homescreen/test/marionette/pinning_test.js
@@ -27,7 +27,6 @@ marionette('Homescreen - Pinned Sites', function() {
     pinning = new Pinning(client);
     system = client.loader.getAppClass('system');
     system.waitForFullyLoaded();
-    home.waitForLaunch();
   });
 
   test('Pinning a site adds pin to homescreen', function() {

diff --git a/apps/homescreen/test/marionette/pinning_the_web_test.js b/apps/homescreen/test/marionette/pinning_the_web_test.js
@@ -30,7 +30,6 @@ marionette('Homescreen - Pin the web', function() {
     system = client.loader.getAppClass('system');
     pinning = new Rocketbar(client);
     system.waitForFullyLoaded();
-    home.waitForLaunch();
   });
 
   // Skip test since we are disabling pinning door hanger in 2.5

diff --git a/apps/homescreen/test/marionette/pinning_uninstall_test.js b/apps/homescreen/test/marionette/pinning_uninstall_test.js
@@ -34,15 +34,13 @@ marionette('Homescreen - Pinned Site Uninstall', function() {
     pinning = new Pinning(client);
     bookmark = new Bookmark(client);
     system.waitForFullyLoaded();
-    home.waitForLaunch();
 
     url = server.url('sample.html');
     client.switchToFrame();
     pinning.openAndPinSiteFromBrowser(url);
     system.dismissBanner();
 
     system.tapHome();
-    home.waitForLaunch();
   });
 
   test('removal of pinned site', function() {

diff --git a/apps/homescreen/test/marionette/verticalhome_migration_test.js b/apps/homescreen/test/marionette/verticalhome_migration_test.js