diff --git a/apps/homescreen/test/marionette/app_appcache_pending_test.js b/apps/homescreen/test/marionette/app_appcache_pending_test.js index 8b244120a058..75aba2432e2d 100644 --- 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 index e38cf205a81e..5ac693cac00b 100644 --- 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 index e6d33b164b07..684bda52f1e3 100644 --- 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 index 0a547af093d1..2969a063806c 100644 --- 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 index 7c2458dcb236..5e524d0db4b0 100644 --- 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 index 4595c98a2235..75580d2bd3a9 100644 --- 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 index 215b5b9b1dc3..67b999a276c9 100644 --- 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 index 4dcee7333e95..790f3a4515d6 100644 --- 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 index 92a955d1ad67..a04f35a1f518 100644 --- 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 index 5ed408ad46e2..9b39ee1bf593 100644 --- 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 index 45f3a549ff87..dbbe30970a40 100644 --- 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 index 583149574b6f..fe2756de4c4b 100644 --- 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 index 2cdcbc331cda..80d040917ec7 100644 --- 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 index a0c38c54d744..cd052e14d154 100644 --- 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 index 7fc39689baf0..0da9094fac67 100644 --- 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 index e1dbccc09c61..6973b4519b46 100644 --- 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 index 860d44226c55..a8da7c390d9d 100644 --- 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 index dd420e86cb91..63fab8dd6196 100644 --- 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 index 622fa46475b1..b3d04b0ee994 100644 --- 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 index 2d2a35def717..f69f7adf1905 100644 --- 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 index 0bd11ca39c28..8845e07fe16e 100644 --- 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 index a302729a85e8..990087f765b5 100644 --- 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 index 68a668105a25..80c1d5016725 100644 --- 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 index deeb21d4fdf2..cc2cf2213e18 100644 --- 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 index 97d3ab80352e..b855b4bd83c0 100644 --- 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 index 7a158ea96281..d98942c0cb39 100644 --- 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 index 31435121356d..a81e4bbc5225 100644 --- 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,7 +54,6 @@ marionette('Homescreen - Home button', function() { system.dismissBanner(); system.tapHome(); - home.waitForLaunch(); var icon = home.getIcon(url); @@ -63,7 +61,6 @@ marionette('Homescreen - Home button', function() { 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 index dbc0ffe62c5f..393db3662da3 100644 --- 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 index 76ec4771f507..87d8ebefdd2b 100644 --- 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 index 67c860d182fc..fd060bfd6f0b 100644 --- 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 index be4350f53ab6..24c596f431f7 100644 --- a/apps/homescreen/test/marionette/pinning_edit_test.js +++ b/apps/homescreen/test/marionette/pinning_edit_test.js @@ -31,7 +31,6 @@ 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(); @@ -39,7 +38,6 @@ marionette('Homescreen - Pinned Site Edit', function() { 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 index 57549f9333d9..cf3a2084c3b1 100644 --- 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 index 8f4b3e28d136..521ed9aba57f 100644 --- 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 index 4b3cab1dc08d..f223daaae8b0 100644 --- 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 index a43d49e02326..2f400ba9b27b 100644 --- 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 index 4a4b4524409d..9abb589323cb 100644 --- a/apps/homescreen/test/marionette/pinning_uninstall_test.js +++ b/apps/homescreen/test/marionette/pinning_uninstall_test.js @@ -34,7 +34,6 @@ 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(); @@ -42,7 +41,6 @@ marionette('Homescreen - Pinned Site Uninstall', function() { 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 deleted file mode 100644 index ed0d5aa1c2f7..000000000000 --- a/apps/homescreen/test/marionette/verticalhome_migration_test.js +++ /dev/null @@ -1,60 +0,0 @@ -'use strict'; -/* global __dirname */ - -var assert = require('assert'); - -marionette('Homescreen - verticalhome migration', function() { - var client = marionette.client({ - profile: require(__dirname + '/client_options_verticalhome.js') - }); - var actions, verticalhome, home, system; - - setup(function() { - actions = client.loader.getActions(); - verticalhome = client.loader.getAppClass('verticalhome'); - home = client.loader.getAppClass('homescreen'); - system = client.loader.getAppClass('system'); - system.waitForFullyLoaded(); - verticalhome.waitForLaunch(); - }); - - test('App order is imported from verticalhome', function() { - // Drag the second icon to the first position so we differ from the - // default settings. - var icon1 = verticalhome.getNthIcon(1); - var icon2 = verticalhome.getNthIcon(2); - actions.press(icon2).wait(1).move(icon1).release().wait(1).perform(); - verticalhome.exitEditMode(); - - // Restart the home screen so that icon DOM order corresponds with actual - // order. - verticalhome.restart(); - - // Record the names of all the apps and bookmarks (these are the only - // items that are migrated) - var iconNames = - client.findElements('#icons div.icon:not(.placeholder)'). - map(function(icon) { - return icon.findElement('.title').text(); - }); - - // Request migration to new home screen - client.executeScript(function() { - window.wrappedJSObject.app.itemStore.migrate( - 'app://homescreen.gaiamobile.org/manifest.webapp'); - }); - client.switchToFrame(); - home.waitForLaunch(); - - // Verify icon order matches - var importedIconNames = home.visibleIcons.map(function(icon) { - return home.getIconText(icon); - }); - - var nIcons = iconNames.length; - assert.equal(importedIconNames.length, nIcons); - for (var i = 0; i < nIcons; i++) { - assert.equal(importedIconNames[i], iconNames[i]); - } - }); -}); diff --git a/apps/search/test/marionette/app_installed_test.js b/apps/search/test/marionette/app_installed_test.js index 479132219dc8..3c3a1a81c3db 100644 --- a/apps/search/test/marionette/app_installed_test.js +++ b/apps/search/test/marionette/app_installed_test.js @@ -31,7 +31,6 @@ marionette('Search - Installed Apps Test', function() { }); test('app result after install/uninstall', function() { - home.waitForLaunch(); rocketbar.homescreenFocus(); rocketbar.enterText('Calendar'); search.goToResults(); diff --git a/apps/search/test/marionette/app_search_test.js b/apps/search/test/marionette/app_search_test.js index 0ce82c50ac08..b9d825179a2c 100644 --- a/apps/search/test/marionette/app_search_test.js +++ b/apps/search/test/marionette/app_search_test.js @@ -12,10 +12,9 @@ marionette('Search - App search', function() { profile: profile, desiredCapabilities: { raisesAccessibilityExceptions: false } }); - var home, search, rocketbar, system; + var search, rocketbar, system; setup(function() { - home = client.loader.getAppClass('homescreen'); system = client.loader.getAppClass('system'); search = client.loader.getAppClass('search'); rocketbar = new Rocketbar(client); @@ -23,7 +22,6 @@ marionette('Search - App search', function() { }); test('Search apps from Rocketbar', function() { - home.waitForLaunch(); rocketbar.homescreenFocus(); rocketbar.enterText('calendar'); search.goToResults(); @@ -34,7 +32,6 @@ marionette('Search - App search', function() { }); test('Search for app with entry point', function() { - home.waitForLaunch(); rocketbar.homescreenFocus(); rocketbar.enterText('Phone'); search.goToResults(); diff --git a/apps/search/test/marionette/change_providers_test.js b/apps/search/test/marionette/change_providers_test.js index 90cc8c36c753..2e62f0243246 100644 --- a/apps/search/test/marionette/change_providers_test.js +++ b/apps/search/test/marionette/change_providers_test.js @@ -9,7 +9,7 @@ marionette('Search - Switch Providers Test', function() { profile: require(__dirname + '/client_options.js'), desiredCapabilities: { raisesAccessibilityExceptions: false } }); - var home, search, rocketbar, system, server; + var search, rocketbar, system, server; var providers; @@ -21,7 +21,6 @@ marionette('Search - Switch Providers Test', function() { }); setup(function() { - home = client.loader.getAppClass('homescreen'); system = client.loader.getAppClass('system'); search = client.loader.getAppClass('search'); rocketbar = new Rocketbar(client); @@ -50,8 +49,6 @@ marionette('Search - Switch Providers Test', function() { test('Test switching suggestion provider', function() { - home.waitForLaunch(); - rocketbar.homescreenFocus(); search.triggerFirstRun(rocketbar); diff --git a/apps/search/test/marionette/home_button_test.js b/apps/search/test/marionette/home_button_test.js index 840d45987693..688df81890bc 100644 --- a/apps/search/test/marionette/home_button_test.js +++ b/apps/search/test/marionette/home_button_test.js @@ -8,10 +8,9 @@ marionette('Search - Home Button Press', function() { profile: require(__dirname + '/client_options.js'), desiredCapabilities: { raisesAccessibilityExceptions: false } }); - var home, search, rocketbar, system; + var search, rocketbar, system; setup(function() { - home = client.loader.getAppClass('homescreen'); system = client.loader.getAppClass('system'); search = client.loader.getAppClass('search'); rocketbar = new Rocketbar(client); @@ -19,7 +18,6 @@ marionette('Search - Home Button Press', function() { }); test('Home button returns to home screen', function() { - home.waitForLaunch(); rocketbar.homescreenFocus(); rocketbar.enterText('calendar'); diff --git a/apps/search/test/marionette/notice_test.js b/apps/search/test/marionette/notice_test.js index 170634447103..2ac17f144cfc 100644 --- a/apps/search/test/marionette/notice_test.js +++ b/apps/search/test/marionette/notice_test.js @@ -47,7 +47,6 @@ marionette('Search - Notice Test', function() { test('Search Notice', function() { - home.waitForLaunch(); rocketbar.homescreenFocus(); var confirmSelector = search.Selectors.firstRunConfirm; diff --git a/apps/search/test/marionette/places_search_test.js b/apps/search/test/marionette/places_search_test.js index 01a3a48505a5..4d6ddd8a692f 100644 --- a/apps/search/test/marionette/places_search_test.js +++ b/apps/search/test/marionette/places_search_test.js @@ -24,7 +24,7 @@ marionette('Places tests', function() { }); setup(function() { - home = client.loader.getAppClass('verticalhome'); + home = client.loader.getAppClass('homescreen'); search = client.loader.getAppClass('search'); rocketbar = new Rocketbar(client); system = client.loader.getAppClass('system'); @@ -37,7 +37,6 @@ marionette('Places tests', function() { var url2 = server.url('favicon.html'); // Lauch the rocketbar and trigger its first run notice - home.waitForLaunch(); home.focusRocketBar(); search.triggerFirstRun(rocketbar); diff --git a/apps/search/test/marionette/search_rocketbar_test.js b/apps/search/test/marionette/search_rocketbar_test.js index e9593d730631..49e685a5c82a 100644 --- a/apps/search/test/marionette/search_rocketbar_test.js +++ b/apps/search/test/marionette/search_rocketbar_test.js @@ -42,7 +42,6 @@ marionette('Search - Rocketbar Test', function() { } }; mockSearch(); - home.waitForLaunch(); rocketbar.homescreenFocus(); }); @@ -116,7 +115,6 @@ marionette('Search - Rocketbar Test', function() { }); test('Browser search', function() { - home.waitForLaunch(); rocketbar.homescreenFocus(); var textToSearch = 'a test'; rocketbar.performSearchInBrowser(textToSearch); diff --git a/apps/search/test/marionette/suggestions_disabled_test.js b/apps/search/test/marionette/suggestions_disabled_test.js index 046c3f372780..7f697cfc0014 100644 --- a/apps/search/test/marionette/suggestions_disabled_test.js +++ b/apps/search/test/marionette/suggestions_disabled_test.js @@ -9,7 +9,7 @@ marionette('Search - Suggestions disabled', function() { profile: require(__dirname + '/client_options.js'), desiredCapabilities: { raisesAccessibilityExceptions: false } }); - var home, search, rocketbar, system, server; + var search, rocketbar, system, server; var providers; @@ -21,7 +21,6 @@ marionette('Search - Suggestions disabled', function() { }); setup(function() { - home = client.loader.getAppClass('homescreen'); system = client.loader.getAppClass('system'); search = client.loader.getAppClass('search'); rocketbar = new Rocketbar(client); @@ -50,8 +49,6 @@ marionette('Search - Suggestions disabled', function() { test('Test switching suggestion provider', function() { - home.waitForLaunch(); - rocketbar.homescreenFocus(); search.triggerFirstRun(rocketbar); diff --git a/apps/search/test/marionette/suggestions_test.js b/apps/search/test/marionette/suggestions_test.js index 674013b8bf09..29b15a70b962 100644 --- a/apps/search/test/marionette/suggestions_test.js +++ b/apps/search/test/marionette/suggestions_test.js @@ -9,7 +9,7 @@ marionette('Search - Suggestions Test', function() { profile: require(__dirname + '/client_options.js'), desiredCapabilities: { raisesAccessibilityExceptions: false } }); - var home, search, rocketbar, system, server; + var search, rocketbar, system, server; var providers; @@ -21,7 +21,6 @@ marionette('Search - Suggestions Test', function() { }); setup(function() { - home = client.loader.getAppClass('homescreen'); system = client.loader.getAppClass('system'); search = client.loader.getAppClass('search'); rocketbar = new Rocketbar(client); @@ -45,7 +44,6 @@ marionette('Search - Suggestions Test', function() { test('Test suggestions', function() { - home.waitForLaunch(); rocketbar.homescreenFocus(); search.triggerFirstRun(rocketbar); diff --git a/apps/system/test/marionette/app_authentication_dialog_test.js b/apps/system/test/marionette/app_authentication_dialog_test.js index 039a99aacb7f..53996fc8d0e0 100644 --- a/apps/system/test/marionette/app_authentication_dialog_test.js +++ b/apps/system/test/marionette/app_authentication_dialog_test.js @@ -15,7 +15,7 @@ marionette('App Authentication Dialog', desiredCapabilities: { raisesAccessibilityExceptions: false } }); - var home, rocketbar, search, server, system; + var rocketbar, search, server, system; suiteSetup(function(done) { Server.create(__dirname + '/fixtures/', function(err, _server) { @@ -29,12 +29,10 @@ marionette('App Authentication Dialog', }); setup(function() { - home = client.loader.getAppClass('homescreen'); rocketbar = new Rocketbar(client); search = client.loader.getAppClass('search'); system = client.loader.getAppClass('system'); system.waitForFullyLoaded(); - home.waitForLaunch(); }); test('cancel button works', function() { diff --git a/apps/system/test/marionette/app_window_mananger_pinned_sites_test.js b/apps/system/test/marionette/app_window_mananger_pinned_sites_test.js index 7fb9d03a5265..cdad754cd6c8 100644 --- a/apps/system/test/marionette/app_window_mananger_pinned_sites_test.js +++ b/apps/system/test/marionette/app_window_mananger_pinned_sites_test.js @@ -57,7 +57,6 @@ marionette('AppWindowManager - Pinning sites', search = client.loader.getAppClass('search'); pinning = new Pinning(client); system.waitForFullyLoaded(); - home.waitForLaunch(); }); suite('Pinning unscoped', function() { diff --git a/apps/system/test/marionette/browser_chrome_new_window_test.js b/apps/system/test/marionette/browser_chrome_new_window_test.js index 1d4f1f127f94..7b6571595dd5 100644 --- a/apps/system/test/marionette/browser_chrome_new_window_test.js +++ b/apps/system/test/marionette/browser_chrome_new_window_test.js @@ -32,7 +32,6 @@ marionette('Browser Chrome - Open New Window', function() { search = client.loader.getAppClass('search'); system = client.loader.getAppClass('system'); system.waitForFullyLoaded(); - home.waitForLaunch(); }); test('open new window', function() { diff --git a/apps/system/test/marionette/browser_chrome_title_test.js b/apps/system/test/marionette/browser_chrome_title_test.js index 9a40f26ddd34..8607f41e1061 100644 --- a/apps/system/test/marionette/browser_chrome_title_test.js +++ b/apps/system/test/marionette/browser_chrome_title_test.js @@ -18,7 +18,7 @@ marionette('Browser Chrome - Title content', function() { desiredCapabilities: { raisesAccessibilityExceptions: false } }); - var actions, home, rocketbar, search, server, system; + var actions, rocketbar, search, server, system; suiteSetup(function(done) { Server.create(__dirname + '/fixtures/', function(err, _server) { @@ -33,7 +33,6 @@ marionette('Browser Chrome - Title content', function() { setup(function() { actions = client.loader.getActions(); - home = client.loader.getAppClass('homescreen'); rocketbar = new Rocketbar(client); search = client.loader.getAppClass('search'); system = client.loader.getAppClass('system'); @@ -63,8 +62,6 @@ marionette('Browser Chrome - Title content', function() { }); test('website without app name should use hostname', function() { - // Use the home-screen search box to open up the system browser - home.waitForLaunch(); var url = server.url('sample.html'); var hostname = urlUtility.parse(url).hostname; rocketbar.homescreenFocus(); @@ -78,8 +75,6 @@ marionette('Browser Chrome - Title content', function() { }); test('Dont persist application-name', function() { - // Use the home-screen search box to open up the system browser - home.waitForLaunch(); var customAppUrl = server.url('app-name.html'); var sampleUrl = server.url('sample.html'); var sampleHostname = urlUtility.parse(sampleUrl).hostname; diff --git a/apps/system/test/marionette/browser_launch_navigate_window_test.js b/apps/system/test/marionette/browser_launch_navigate_window_test.js index 1ac3b006069a..1672b6be9433 100644 --- a/apps/system/test/marionette/browser_launch_navigate_window_test.js +++ b/apps/system/test/marionette/browser_launch_navigate_window_test.js @@ -11,7 +11,7 @@ marionette('Browser - Launch a URL navigates the same window', desiredCapabilities: { raisesAccessibilityExceptions: false } }); - var home, rocketbar, search, server, system; + var rocketbar, search, server, system; suiteSetup(function(done) { Server.create(__dirname + '/fixtures/', function(err, _server) { @@ -25,12 +25,10 @@ marionette('Browser - Launch a URL navigates the same window', }); setup(function() { - home = client.loader.getAppClass('homescreen'); rocketbar = new Rocketbar(client); search = client.loader.getAppClass('search'); system = client.loader.getAppClass('system'); system.waitForFullyLoaded(); - home.waitForLaunch(); }); test('opens a new sheet with window.open()', function() { diff --git a/apps/system/test/marionette/browser_launch_window_open_test.js b/apps/system/test/marionette/browser_launch_window_open_test.js index 3db5c687535c..8621fb057155 100644 --- a/apps/system/test/marionette/browser_launch_window_open_test.js +++ b/apps/system/test/marionette/browser_launch_window_open_test.js @@ -11,7 +11,7 @@ marionette('Browser - Launch the same origin after navigating away', desiredCapabilities: { raisesAccessibilityExceptions: false } }); client.scope({ searchTimeout: 20000 }); - var home, rocketbar, search, server, system; + var rocketbar, search, server, system; suiteSetup(function(done) { Server.create(__dirname + '/fixtures/', function(err, _server) { @@ -25,12 +25,10 @@ marionette('Browser - Launch the same origin after navigating away', }); setup(function() { - home = client.loader.getAppClass('homescreen'); rocketbar = new Rocketbar(client); search = client.loader.getAppClass('search'); system = client.loader.getAppClass('system'); system.waitForFullyLoaded(); - home.waitForLaunch(); }); test('opens a new sheet with window.open()', function() { diff --git a/apps/system/test/marionette/browser_meta_application_name_test.js b/apps/system/test/marionette/browser_meta_application_name_test.js index 893e3f3b7336..86897a1110e3 100644 --- a/apps/system/test/marionette/browser_meta_application_name_test.js +++ b/apps/system/test/marionette/browser_meta_application_name_test.js @@ -24,7 +24,7 @@ marionette('Browser - Site loading background', function() { }); setup(function() { - home = client.loader.getAppClass('verticalhome'); + home = client.loader.getAppClass('homescreen'); rocketbar = new Rocketbar(client); search = client.loader.getAppClass('search'); system = client.loader.getAppClass('system'); @@ -34,7 +34,6 @@ marionette('Browser - Site loading background', function() { // screenshot. Without the homescreen, we may take a screenshot of the // system boot screen. client.apps.launch(home.URL); - home.waitForLaunch(); client.switchToFrame(); }); diff --git a/apps/system/test/marionette/browser_navigate_chrome_test.js b/apps/system/test/marionette/browser_navigate_chrome_test.js index 2cc0d2307f44..ffbcd57992aa 100644 --- a/apps/system/test/marionette/browser_navigate_chrome_test.js +++ b/apps/system/test/marionette/browser_navigate_chrome_test.js @@ -17,7 +17,7 @@ marionette('Browser - Chrome on browser navigation', desiredCapabilities: { raisesAccessibilityExceptions: false } }); - var home, rocketbar, search, server, system, pinTheWeb; + var rocketbar, search, server, system, pinTheWeb; suiteSetup(function(done) { Server.create(__dirname + '/fixtures/', function(err, _server) { @@ -31,13 +31,11 @@ marionette('Browser - Chrome on browser navigation', }); setup(function() { - home = client.loader.getAppClass('homescreen'); rocketbar = new Rocketbar(client); pinTheWeb = new PinTheWeb(client); search = client.loader.getAppClass('search'); system = client.loader.getAppClass('system'); system.waitForFullyLoaded(); - home.waitForLaunch(); }); test('should show the progressbar', function() { diff --git a/apps/system/test/marionette/browser_private_option_menu_test.js b/apps/system/test/marionette/browser_private_option_menu_test.js index 2f44b94755f0..c87508e1979b 100644 --- a/apps/system/test/marionette/browser_private_option_menu_test.js +++ b/apps/system/test/marionette/browser_private_option_menu_test.js @@ -15,7 +15,7 @@ marionette('Private Browser - option menu', function() { desiredCapabilities: { raisesAccessibilityExceptions: false } }); - var home, rocketbar, search, server, system; + var rocketbar, search, server, system; suiteSetup(function(done) { Server.create(__dirname + '/fixtures/', function(err, _server) { @@ -29,12 +29,10 @@ marionette('Private Browser - option menu', function() { }); setup(function() { - home = client.loader.getAppClass('homescreen'); rocketbar = new Rocketbar(client); search = client.loader.getAppClass('search'); system = client.loader.getAppClass('system'); system.waitForStartup(); - home.waitForLaunch(); }); test('Open option menu from app chrome bar of private browsers', function() { diff --git a/apps/system/test/marionette/browser_private_sanity_test.js b/apps/system/test/marionette/browser_private_sanity_test.js index 142d3ec14930..9dfc44bee916 100644 --- a/apps/system/test/marionette/browser_private_sanity_test.js +++ b/apps/system/test/marionette/browser_private_sanity_test.js @@ -10,7 +10,7 @@ marionette('Private Browser - Basic Sanity Test', function() { desiredCapabilities: { raisesAccessibilityExceptions: false } }); - var home, rocketbar, search, server, system; + var rocketbar, search, server, system; suiteSetup(function(done) { Server.create(__dirname + '/fixtures/', function(err, _server) { @@ -24,12 +24,10 @@ marionette('Private Browser - Basic Sanity Test', function() { }); setup(function() { - home = client.loader.getAppClass('homescreen'); rocketbar = new Rocketbar(client); search = client.loader.getAppClass('search'); system = client.loader.getAppClass('system'); system.waitForFullyLoaded(); - home.waitForLaunch(); }); var STORAGE_KEY = 'foo'; diff --git a/apps/system/test/marionette/browser_private_url_cleared_test.js b/apps/system/test/marionette/browser_private_url_cleared_test.js index 582ecd01ab86..4cb2df9b7d26 100644 --- a/apps/system/test/marionette/browser_private_url_cleared_test.js +++ b/apps/system/test/marionette/browser_private_url_cleared_test.js @@ -10,7 +10,7 @@ marionette('Private Browser - URL Persistence', function() { desiredCapabilities: { raisesAccessibilityExceptions: false } }); - var home, rocketbar, search, server, system; + var rocketbar, search, server, system; suiteSetup(function(done) { Server.create(__dirname + '/fixtures/', function(err, _server) { @@ -24,12 +24,10 @@ marionette('Private Browser - URL Persistence', function() { }); setup(function() { - home = client.loader.getAppClass('homescreen'); rocketbar = new Rocketbar(client); search = client.loader.getAppClass('search'); system = client.loader.getAppClass('system'); system.waitForFullyLoaded(); - home.waitForLaunch(); }); test('Url is cleared after submitting and pressing home in private window', diff --git a/apps/system/test/marionette/browser_private_window_open_test.js b/apps/system/test/marionette/browser_private_window_open_test.js index c6a6e550d9cd..a936f6b8eb85 100644 --- a/apps/system/test/marionette/browser_private_window_open_test.js +++ b/apps/system/test/marionette/browser_private_window_open_test.js @@ -14,7 +14,7 @@ marionette('Private Browser - Window.open', function() { desiredCapabilities: { raisesAccessibilityExceptions: false } }); - var home, rocketbar, search, server, system; + var rocketbar, search, server, system; suiteSetup(function(done) { Server.create(__dirname + '/fixtures/', function(err, _server) { @@ -28,12 +28,10 @@ marionette('Private Browser - Window.open', function() { }); setup(function() { - home = client.loader.getAppClass('homescreen'); rocketbar = new Rocketbar(client); search = client.loader.getAppClass('search'); system = client.loader.getAppClass('system'); system.waitForFullyLoaded(); - home.waitForLaunch(); }); test('Open windows from private browsers are also private', function() { diff --git a/apps/system/test/marionette/browser_site_loading_background_test.js b/apps/system/test/marionette/browser_site_loading_background_test.js index 7b655b747f5b..614b277dbbd0 100644 --- a/apps/system/test/marionette/browser_site_loading_background_test.js +++ b/apps/system/test/marionette/browser_site_loading_background_test.js @@ -23,7 +23,7 @@ marionette('Browser - Site loading background', function() { }); setup(function() { - home = client.loader.getAppClass('verticalhome'); + home = client.loader.getAppClass('homescreen'); rocketbar = new Rocketbar(client); system = client.loader.getAppClass('system'); system.waitForFullyLoaded(); @@ -32,7 +32,6 @@ marionette('Browser - Site loading background', function() { // screenshot. Without the homescreen, we may take a screenshot of the // system boot screen. client.apps.launch(home.URL); - home.waitForLaunch(); client.switchToFrame(); }); diff --git a/apps/system/test/marionette/software_home_app_crash_dialog_layout_test.js b/apps/system/test/marionette/software_home_app_crash_dialog_layout_test.js index a349d5e0331f..afc088082c37 100644 --- a/apps/system/test/marionette/software_home_app_crash_dialog_layout_test.js +++ b/apps/system/test/marionette/software_home_app_crash_dialog_layout_test.js @@ -11,13 +11,11 @@ marionette('Software Home Button - App Crash Report Layout', function() { } } }); - var home, system; + var system; setup(function() { - home = client.loader.getAppClass('homescreen'); system = client.loader.getAppClass('system'); system.waitForFullyLoaded(); - home.waitForLaunch(); }); test('Proper layout for crash report dialog', function() { diff --git a/apps/system/test/marionette/software_home_app_install_dialog_test.js b/apps/system/test/marionette/software_home_app_install_dialog_test.js index b88e6b6dcdaf..428bf7a1ced8 100644 --- a/apps/system/test/marionette/software_home_app_install_dialog_test.js +++ b/apps/system/test/marionette/software_home_app_install_dialog_test.js @@ -16,7 +16,7 @@ marionette('Software Home Button - App Install Dialog', function() { } } }); - var appInstall, home, server, serverManifestURL, serverRootURL, system; + var appInstall, server, serverManifestURL, serverRootURL, system; suiteSetup(function(done) { Server.create(__dirname + '/fixtures/', function(err, _server) { @@ -36,10 +36,8 @@ marionette('Software Home Button - App Install Dialog', function() { setup(function() { appInstall = new AppInstall(client); - home = client.loader.getAppClass('homescreen'); system = client.loader.getAppClass('system'); system.waitForFullyLoaded(); - home.waitForLaunch(); client.switchToFrame(); }); diff --git a/apps/system/test/marionette/software_home_emergency_callback_dialog_test.js b/apps/system/test/marionette/software_home_emergency_callback_dialog_test.js index 874ff59fd89d..374bb58f0120 100644 --- a/apps/system/test/marionette/software_home_emergency_callback_dialog_test.js +++ b/apps/system/test/marionette/software_home_emergency_callback_dialog_test.js @@ -12,13 +12,11 @@ marionette('Software Home Button - Emergency Callback Dialog', function() { } } }); - var home, system; + var system; setup(function() { - home = client.loader.getAppClass('homescreen'); system = client.loader.getAppClass('system'); system.waitForFullyLoaded(); - home.waitForLaunch(); client.switchToFrame(); }); diff --git a/apps/system/test/marionette/software_home_fullscreen_layout_test.js b/apps/system/test/marionette/software_home_fullscreen_layout_test.js index 6a1f480669d9..e0b96cfd5280 100644 --- a/apps/system/test/marionette/software_home_fullscreen_layout_test.js +++ b/apps/system/test/marionette/software_home_fullscreen_layout_test.js @@ -24,14 +24,12 @@ marionette('Software Home Button - Fullscreen Layout', function() { }, desiredCapabilities: { raisesAccessibilityExceptions: false } }); - var home, system, actions, screenSize, shbSize; + var system, actions, screenSize, shbSize; setup(function() { - home = client.loader.getAppClass('homescreen'); system = client.loader.getAppClass('system'); actions = client.loader.getActions(); system.waitForFullyLoaded(); - home.waitForLaunch(); client.switchToFrame(); client.apps.launch(appUrl); client.apps.switchToApp(appUrl); diff --git a/apps/system/test/marionette/software_home_fullscreen_test.js b/apps/system/test/marionette/software_home_fullscreen_test.js index 2c787973e533..d04f3f5f70b0 100644 --- a/apps/system/test/marionette/software_home_fullscreen_test.js +++ b/apps/system/test/marionette/software_home_fullscreen_test.js @@ -19,13 +19,11 @@ marionette('Software Home Button - Fullscreen Request', function() { }, desiredCapabilities: { raisesAccessibilityExceptions: false } }); - var home, system; + var system; setup(function() { - home = client.loader.getAppClass('homescreen'); system = client.loader.getAppClass('system'); system.waitForFullyLoaded(); - home.waitForLaunch(); client.switchToFrame(); }); diff --git a/apps/system/test/marionette/software_home_ime_menu_test.js b/apps/system/test/marionette/software_home_ime_menu_test.js index c6c6e96bd41b..b2c3977a2157 100644 --- a/apps/system/test/marionette/software_home_ime_menu_test.js +++ b/apps/system/test/marionette/software_home_ime_menu_test.js @@ -12,13 +12,11 @@ marionette('Software Home Button - IME Menu', function() { } } }); - var home, system; + var system; setup(function() { - home = client.loader.getAppClass('homescreen'); system = client.loader.getAppClass('system'); system.waitForFullyLoaded(); - home.waitForLaunch(); client.switchToFrame(); }); diff --git a/apps/system/test/marionette/software_home_modal_dialog_test.js b/apps/system/test/marionette/software_home_modal_dialog_test.js index 0786465f7327..b2a60b69de09 100644 --- a/apps/system/test/marionette/software_home_modal_dialog_test.js +++ b/apps/system/test/marionette/software_home_modal_dialog_test.js @@ -12,13 +12,11 @@ marionette('Software Home Button - Modal Dialog', function() { } } }); - var home, system; + var system; setup(function() { - home = client.loader.getAppClass('homescreen'); system = client.loader.getAppClass('system'); system.waitForFullyLoaded(); - home.waitForLaunch(); client.switchToFrame(); }); diff --git a/apps/system/test/marionette/software_home_no_steal_focus.js b/apps/system/test/marionette/software_home_no_steal_focus.js index c5bf0cf43261..ec8241d8033e 100644 --- a/apps/system/test/marionette/software_home_no_steal_focus.js +++ b/apps/system/test/marionette/software_home_no_steal_focus.js @@ -14,14 +14,12 @@ marionette('Software Home Button - Stealing input focus', function() { desiredCapabilities: { raisesAccessibilityExceptions: false } }); - var home, rocketbar, system; + var rocketbar, system; setup(function() { - home = client.loader.getAppClass('verticalhome'); rocketbar = new Rocketbar(client); system = client.loader.getAppClass('system'); system.waitForFullyLoaded(); - home.waitForLaunch(); client.switchToFrame(); }); diff --git a/apps/system/test/marionette/software_home_notification_banner_test.js b/apps/system/test/marionette/software_home_notification_banner_test.js index 1429898d11fb..d7c06f753fb8 100644 --- a/apps/system/test/marionette/software_home_notification_banner_test.js +++ b/apps/system/test/marionette/software_home_notification_banner_test.js @@ -16,7 +16,7 @@ marionette('Software Home Button - Notification Banner Test', function() { } } }); - var appInstall, home, server, system; + var appInstall, server, system; suiteSetup(function(done) { // Any app that we can test the download success banner. @@ -33,10 +33,8 @@ marionette('Software Home Button - Notification Banner Test', function() { setup(function() { appInstall = new AppInstall(client); - home = client.loader.getAppClass('homescreen'); system = client.loader.getAppClass('system'); system.waitForFullyLoaded(); - home.waitForLaunch(); client.switchToFrame(); }); diff --git a/apps/system/test/marionette/software_home_permission_prompt_test.js b/apps/system/test/marionette/software_home_permission_prompt_test.js index 2722d3d8654d..c5284b15c731 100644 --- a/apps/system/test/marionette/software_home_permission_prompt_test.js +++ b/apps/system/test/marionette/software_home_permission_prompt_test.js @@ -14,14 +14,12 @@ marionette('Software Home Button - Permission Prompt', function() { } } }); - var home, rocketbar, system; + var rocketbar, system; setup(function() { - home = client.loader.getAppClass('homescreen'); rocketbar = new Rocketbar(client); system = client.loader.getAppClass('system'); system.waitForFullyLoaded(); - home.waitForLaunch(); client.switchToFrame(); }); diff --git a/apps/system/test/marionette/software_home_quick_setting_dialog_test.js b/apps/system/test/marionette/software_home_quick_setting_dialog_test.js index 1a47d5760ae0..a42b53d21913 100644 --- a/apps/system/test/marionette/software_home_quick_setting_dialog_test.js +++ b/apps/system/test/marionette/software_home_quick_setting_dialog_test.js @@ -12,13 +12,11 @@ marionette('Software Home Button - Quick Settings Dialog', function() { } } }); - var home, system; + var system; setup(function() { - home = client.loader.getAppClass('homescreen'); system = client.loader.getAppClass('system'); system.waitForFullyLoaded(); - home.waitForLaunch(); client.switchToFrame(); }); diff --git a/apps/system/test/marionette/software_home_update_dialog_confirm_test.js b/apps/system/test/marionette/software_home_update_dialog_confirm_test.js index 1c7ac189d99c..b2b177182583 100644 --- a/apps/system/test/marionette/software_home_update_dialog_confirm_test.js +++ b/apps/system/test/marionette/software_home_update_dialog_confirm_test.js @@ -17,12 +17,10 @@ marionette('Software Home Button - Update Dialog Confirm', function() { } }); - var home, system; + var system; setup(function() { - home = client.loader.getAppClass('homescreen'); system = client.loader.getAppClass('system'); system.waitForFullyLoaded(); - home.waitForLaunch(); client.switchToFrame(); }); diff --git a/apps/system/test/marionette/software_home_update_dialog_test.js b/apps/system/test/marionette/software_home_update_dialog_test.js index 07b89f0b33bb..b61fbcb6ecdc 100644 --- a/apps/system/test/marionette/software_home_update_dialog_test.js +++ b/apps/system/test/marionette/software_home_update_dialog_test.js @@ -12,13 +12,11 @@ marionette('Software Home Button - Update Dialog', function() { } } }); - var home, system; + var system; setup(function() { - home = client.loader.getAppClass('homescreen'); system = client.loader.getAppClass('system'); system.waitForFullyLoaded(); - home.waitForLaunch(); client.switchToFrame(); }); diff --git a/apps/system/test/marionette/task_manager_icons_test.js b/apps/system/test/marionette/task_manager_icons_test.js index 1be1c90394e1..dbc11a9509c1 100644 --- a/apps/system/test/marionette/task_manager_icons_test.js +++ b/apps/system/test/marionette/task_manager_icons_test.js @@ -122,12 +122,6 @@ marionette('Task Manager - Icons', function() { }); suite('Web Content', function() { - var home; - - setup(function() { - home = client.loader.getAppClass('homescreen'); - home.waitForLaunch(); - }); function loadUrl(url) { rocketbar.homescreenFocus(); diff --git a/apps/system/test/marionette/update_dialog_confirm_test.js b/apps/system/test/marionette/update_dialog_confirm_test.js index cc77e63195d2..ca60cc8dde16 100644 --- a/apps/system/test/marionette/update_dialog_confirm_test.js +++ b/apps/system/test/marionette/update_dialog_confirm_test.js @@ -23,7 +23,6 @@ marionette('Software Home Button - Update Dialog Confirm', function() { home = client.loader.getAppClass('homescreen'); system = client.loader.getAppClass('system'); system.waitForFullyLoaded(); - home.waitForLaunch(); client.switchToFrame(); }); diff --git a/taskgraph.json b/taskgraph.json index d8e429ab5107..09d0b0bb379e 100644 --- a/taskgraph.json +++ b/taskgraph.json @@ -19,7 +19,8 @@ "scopes": [ "docker-worker:cache:gaia-tc-vcs", "docker-worker:cache:gaia-linux-cache", - "docker-worker:cache:gaia-misc-caches" + "docker-worker:cache:gaia-misc-caches", + "scheduler:extend-task-graph:*" ], "payload": { "cache": { diff --git a/tests/jsmarionette/plugins/marionette-apps/lib/app.js b/tests/jsmarionette/plugins/marionette-apps/lib/app.js index 46b3f56a5e32..f8ce1cb8ddd2 100644 --- a/tests/jsmarionette/plugins/marionette-apps/lib/app.js +++ b/tests/jsmarionette/plugins/marionette-apps/lib/app.js @@ -82,14 +82,13 @@ App.prototype = { * @param {String} entrypoint for app. */ launch: function(entrypoint) { - // XXXAus: FIX THIS. We should no longer rely on ObjectCache. var client = this._client.scope({ context: 'content' }); - client.executeAsyncScript(function(id, entrypoint) { - var ObjectCache = window.wrappedJSObject.ObjectCache; - var app = ObjectCache._inst.get(id); - app.launch(entrypoint || null); + var app = this; + app.url = app.origin; + client.executeAsyncScript(function(app) { + window.dispatchEvent(new CustomEvent('webapps-launch', { detail: app })); marionetteScriptFinished(); - }, [this._id, entrypoint], function(err) { + }, [this], function(err) { if (err) { throw err; } diff --git a/tests/jsmarionette/plugins/marionette-apps/lib/launch.js b/tests/jsmarionette/plugins/marionette-apps/lib/launch.js index 514a5e418f9e..91d794195d81 100644 --- a/tests/jsmarionette/plugins/marionette-apps/lib/launch.js +++ b/tests/jsmarionette/plugins/marionette-apps/lib/launch.js @@ -40,7 +40,7 @@ function launch(apps, origin, entrypoint, callback) { app.launch(entrypoint); // wait for this app to be visible - return waitForApp(apps, app.source, function(err, element) { + return waitForApp(apps, app.origin, function(err, element) { return callback(err, app, element); }); }); diff --git a/tests/jsmarionette/plugins/marionette-apps/lib/waitforapp.js b/tests/jsmarionette/plugins/marionette-apps/lib/waitforapp.js index f5eb3ed91995..166369b0e354 100644 --- a/tests/jsmarionette/plugins/marionette-apps/lib/waitforapp.js +++ b/tests/jsmarionette/plugins/marionette-apps/lib/waitforapp.js @@ -22,7 +22,7 @@ function waitForApp(apps, source, callback) { assertDriverIsSync(client); waitForAppSync( - client, '#windows iframe[src*="' + source + '"]', callback + client, '#windows iframe[mozapp*="' + source + '"]', callback ); } diff --git a/tests/jsmarionette/plugins/marionette-apps/package.json b/tests/jsmarionette/plugins/marionette-apps/package.json index 776d90ea5b62..efa1bfafb75d 100644 --- a/tests/jsmarionette/plugins/marionette-apps/package.json +++ b/tests/jsmarionette/plugins/marionette-apps/package.json @@ -1,5 +1,5 @@ { "name": "marionette-apps", - "version": "0.3.13", + "version": "0.4.0", "author": "Gareth Aye " }