Merge pull request #18464 from KevinGrandon/bug_996968_homescreen_boo…

…kmark_tests Bug 996968 - Intermittent gaia-integration TEST-UNEXPECTED-FAIL | Update bookmark on homescreen > Navigate to sample.html and bookmark it on homescreen
mozilla-b2g · Apr 19, 2014 · eb97461 · eb97461
2 parents 56a06e3 + f0fd0ae
commit eb97461
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/apps/homescreen/test/marionette/lib/bookmark_editor.js b/apps/homescreen/test/marionette/lib/bookmark_editor.js
@@ -32,7 +32,7 @@ BookmarkEditor.prototype = {
   },
 
   get currentTabFrame() {
-    return this.client.findElement(
+    return this.client.helper.waitForElement(
       BookmarkEditor.Selectors['mozbrowser']);
   },
 

diff --git a/shared/test/integration/tbpl-manifest.json b/shared/test/integration/tbpl-manifest.json
@@ -13,9 +13,6 @@
     "apps/email/test/marionette/notification_set_interval_test.js",
     "apps/email/test/marionette/reply_imap_email_test.js",
     "apps/email/test/marionette/send_imap_email_test.js",
-    "apps/homescreen/test/marionette/install_bookmark_test.js",
-    "apps/homescreen/test/marionette/remove_bookmark_test.js",
-    "apps/homescreen/test/marionette/update_bookmark_test.js",
     "apps/search/test/marionette/app_search_test.js",
     "apps/search/test/marionette/places_search_test.js",
     "apps/system/test/marionette/edges_gesture_test.js",

diff --git a/shared/test/integration/travis-manifest.json b/shared/test/integration/travis-manifest.json
@@ -12,9 +12,6 @@
     "apps/email/test/marionette/notification_set_interval_test.js",
     "apps/email/test/marionette/reply_imap_email_test.js",
     "apps/email/test/marionette/send_imap_email_test.js",
-    "apps/homescreen/test/marionette/install_bookmark_test.js",
-    "apps/homescreen/test/marionette/remove_bookmark_test.js",
-    "apps/homescreen/test/marionette/update_bookmark_test.js",
     "apps/search/test/marionette/app_search_test.js",
     "apps/search/test/marionette/places_search_test.js",
     "apps/system/test/marionette/rocketbar_test.js"