From 8f37977e7987a2296cea7a4edda61167929410cc Mon Sep 17 00:00:00 2001
From: Aaron Train <aaron.train@gmail.com>
Date: Fri, 20 Mar 2020 12:16:50 -0400
Subject: [PATCH] Closes #9262: Add additional waits to LibraryMenuTest (#9263)

---
 .../java/org/mozilla/fenix/helpers/ext/WaitNotNull.kt     | 2 +-
 .../java/org/mozilla/fenix/ui/LibraryMenuTest.kt          | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/helpers/ext/WaitNotNull.kt b/app/src/androidTest/java/org/mozilla/fenix/helpers/ext/WaitNotNull.kt
index 91f08f19a..f726a3ac8 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/helpers/ext/WaitNotNull.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/helpers/ext/WaitNotNull.kt
@@ -16,5 +16,5 @@ import org.mozilla.fenix.helpers.TestAssetHelper
  */
 fun UiDevice.waitNotNull(
     searchCondition: SearchCondition<*>,
-    waitTime: Long = TestAssetHelper.waitingTimeShort
+    waitTime: Long = TestAssetHelper.waitingTime
 ) = assertNotNull(wait(searchCondition, waitTime))
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/LibraryMenuTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/LibraryMenuTest.kt
index 935e7f530..4f06cb24b 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/LibraryMenuTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/LibraryMenuTest.kt
@@ -39,7 +39,9 @@ class LibraryMenuTest {
     fun libraryMenuItemsTest() {
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
+            verifyPageContent(defaultWebPage.content)
         }.openThreeDotMenu {
+            verifyLibraryButton()
         }.openLibrary {
             verifyLibraryView()
             verifyHistoryButton()
@@ -51,7 +53,9 @@ class LibraryMenuTest {
     fun backButtonTest() {
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
+            verifyPageContent(defaultWebPage.content)
         }.openThreeDotMenu {
+            verifyLibraryButton()
         }.openLibrary {
         }.goBack {
             verifyBrowserScreen()
@@ -62,7 +66,9 @@ class LibraryMenuTest {
     fun bookmarksButtonTest() {
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
+            verifyPageContent(defaultWebPage.content)
         }.openThreeDotMenu {
+            verifyLibraryButton()
         }.openLibrary {
         }.openBookmarks {
             verifyBookmarksMenuView()
@@ -73,7 +79,9 @@ class LibraryMenuTest {
     fun historyButtonTest() {
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
+            verifyPageContent(defaultWebPage.content)
         }.openThreeDotMenu {
+            verifyLibraryButton()
         }.openLibrary {
         }.openHistory {
             verifyHistoryMenuView()