diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt index 3c776d2385..32fdf1836c 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt @@ -43,7 +43,7 @@ class BookmarksTest { private val bookmarksFolderName = "New Folder" private val testBookmark = object { var title: String = "Bookmark title" - var url: String = "https://www.test.com" + var url: String = "https://www.example.com" } @get:Rule @@ -169,6 +169,31 @@ class BookmarksTest { } } + @SmokeTest + @Test + fun cancelEditBookmarkTest() { + val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1) + + navigationToolbar { + }.enterURLAndEnterToBrowser(defaultWebPage.url) { + }.openThreeDotMenu { + }.bookmarkPage { + clickSnackbarButton("EDIT") + } + bookmarksMenu { + verifyEditBookmarksView() + changeBookmarkTitle(testBookmark.title) + changeBookmarkUrl(testBookmark.url) + }.closeEditBookmarkSection { + } + browserScreen { + }.openThreeDotMenu { + }.openBookmarks { + verifyBookmarkTitle(defaultWebPage.title) + verifyBookmarkedURL(defaultWebPage.url.toString()) + } + } + @SmokeTest @Test fun editBookmarkTest() { @@ -177,22 +202,22 @@ class BookmarksTest { browserScreen { createBookmark(defaultWebPage.url) }.openThreeDotMenu { + }.editBookmarkPage { + verifyEditBookmarksView() + changeBookmarkTitle(testBookmark.title) + changeBookmarkUrl(testBookmark.url) + saveEditBookmark() + } + browserScreen { + }.openThreeDotMenu { }.openBookmarks { registerAndCleanupIdlingResources( RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2), ) {} - }.openThreeDotMenu(defaultWebPage.url) { - }.clickEdit { - verifyEditBookmarksView() - verifyBookmarkNameEditBox() - verifyBookmarkURLEditBox() - verifyParentFolderSelector() - changeBookmarkTitle(testBookmark.title) - changeBookmarkUrl(testBookmark.url) - saveEditBookmark() verifyBookmarkTitle(testBookmark.title) verifyBookmarkedURL(testBookmark.url) - verifyKeyboardHidden() + }.openBookmarkWithTitle(testBookmark.title) { + verifyUrl("example.com") } } diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt index a5efd0f795..61b29151b7 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt @@ -75,7 +75,7 @@ class ContextMenusTest { verifyLinkContextMenuItems(genericURL.url) clickContextOpenLinkInNewTab() verifySnackBarText("New tab opened") - snackBarButtonClick() + clickSnackbarButton("SWITCH") verifyUrl(genericURL.url.toString()) }.openTabDrawer { verifyNormalModeSelected() @@ -99,7 +99,7 @@ class ContextMenusTest { verifyLinkContextMenuItems(genericURL.url) clickContextOpenLinkInPrivateTab() verifySnackBarText("New private tab opened") - snackBarButtonClick() + clickSnackbarButton("SWITCH") verifyUrl(genericURL.url.toString()) }.openTabDrawer { verifyPrivateModeSelected() @@ -179,7 +179,7 @@ class ContextMenusTest { verifyLinkImageContextMenuItems(imageResource.url) clickContextOpenImageNewTab() verifySnackBarText("New tab opened") - snackBarButtonClick() + clickSnackbarButton("SWITCH") verifyUrl(imageResource.url.toString()) } } diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt index 9a2adea039..364f18d8f8 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt @@ -181,12 +181,12 @@ class SearchTest { }.submitQuery(queryString) { longClickLink("Link 1") clickContextOpenLinkInNewTab() - snackBarButtonClick() + clickSnackbarButton("SWITCH") waitForPageToLoad() pressBack() longClickLink("Link 2") clickContextOpenLinkInNewTab() - snackBarButtonClick() + clickSnackbarButton("SWITCH") waitForPageToLoad() }.openTabDrawer { }.openTabsListThreeDotMenu { @@ -219,22 +219,22 @@ class SearchTest { }.submitQuery(queryString) { longClickLink("Link 1") clickContextOpenLinkInNewTab() - snackBarButtonClick() + clickSnackbarButton("SWITCH") waitForPageToLoad() pressBack() longClickLink("Link 1") clickContextOpenLinkInNewTab() - snackBarButtonClick() + clickSnackbarButton("SWITCH") waitForPageToLoad() pressBack() longClickLink("Link 2") clickContextOpenLinkInNewTab() - snackBarButtonClick() + clickSnackbarButton("SWITCH") waitForPageToLoad() pressBack() longClickLink("Link 1") clickContextOpenLinkInNewTab() - snackBarButtonClick() + clickSnackbarButton("SWITCH") waitForPageToLoad() }.openTabDrawer { }.openTabsListThreeDotMenu { @@ -339,12 +339,12 @@ class SearchTest { }.submitQuery(queryString) { longClickLink("Link 1") clickContextOpenLinkInNewTab() - snackBarButtonClick() + clickSnackbarButton("SWITCH") waitForPageToLoad() mDevice.pressBack() longClickLink("Link 2") clickContextOpenLinkInNewTab() - snackBarButtonClick() + clickSnackbarButton("SWITCH") waitForPageToLoad() }.openTabDrawer { }.openTabsListThreeDotMenu { @@ -386,12 +386,12 @@ class SearchTest { }.submitQuery(queryString) { longClickLink("Link 1") clickContextOpenLinkInNewTab() - snackBarButtonClick() + clickSnackbarButton("SWITCH") waitForPageToLoad() mDevice.pressBack() longClickLink("Link 2") clickContextOpenLinkInNewTab() - snackBarButtonClick() + clickSnackbarButton("SWITCH") waitForPageToLoad() }.openTabDrawer { }.openTabsListThreeDotMenu { @@ -434,12 +434,12 @@ class SearchTest { }.submitQuery(queryString) { longClickLink("Link 1") clickContextOpenLinkInNewTab() - snackBarButtonClick() + clickSnackbarButton("SWITCH") waitForPageToLoad() mDevice.pressBack() longClickLink("Link 2") clickContextOpenLinkInNewTab() - snackBarButtonClick() + clickSnackbarButton("SWITCH") waitForPageToLoad() }.openTabDrawer { }.openTabsListThreeDotMenu { @@ -487,12 +487,12 @@ class SearchTest { }.submitQuery(queryString) { longClickLink("Link 1") clickContextOpenLinkInNewTab() - snackBarButtonClick() + clickSnackbarButton("SWITCH") waitForPageToLoad() mDevice.pressBack() longClickLink("Link 2") clickContextOpenLinkInNewTab() - snackBarButtonClick() + clickSnackbarButton("SWITCH") waitForPageToLoad() }.openTabDrawer { }.openTabsListThreeDotMenu { diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt index 51c2e81392..33d3238747 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt @@ -161,7 +161,7 @@ class ThreeDotMenuMainTest { }.enterURLAndEnterToBrowser(webPage.url) { longClickLink("Link 2") clickContextOpenLinkInNewTab() - snackBarButtonClick() + clickSnackbarButton("SWITCH") }.openThreeDotMenu { verifyDesktopSiteModeEnabled(false) } @@ -191,7 +191,7 @@ class ThreeDotMenuMainTest { }.enterURLAndEnterToBrowser(webPage.url) { longClickLink("Link 2") clickContextOpenLinkInPrivateTab() - snackBarButtonClick() + clickSnackbarButton("SWITCH") }.openThreeDotMenu { verifyDesktopSiteModeEnabled(false) } diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt index 45020245ab..cfb285ce12 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt @@ -32,8 +32,17 @@ import org.hamcrest.Matchers.containsString import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.mozilla.fenix.R +import org.mozilla.fenix.helpers.MatcherHelper.assertItemContainingTextExists +import org.mozilla.fenix.helpers.MatcherHelper.assertItemWithDescriptionExists +import org.mozilla.fenix.helpers.MatcherHelper.assertItemWithResIdExists +import org.mozilla.fenix.helpers.MatcherHelper.itemWithDescription +import org.mozilla.fenix.helpers.MatcherHelper.itemWithResId +import org.mozilla.fenix.helpers.MatcherHelper.itemWithResIdAndText +import org.mozilla.fenix.helpers.MatcherHelper.itemWithText import org.mozilla.fenix.helpers.TestAssetHelper import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime +import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeShort +import org.mozilla.fenix.helpers.TestHelper.getStringResource import org.mozilla.fenix.helpers.TestHelper.mDevice import org.mozilla.fenix.helpers.TestHelper.packageName import org.mozilla.fenix.helpers.click @@ -90,13 +99,17 @@ class BookmarksRobot { fun verifyCopySnackBarText() = assertSnackBarText("URL copied") - fun verifyEditBookmarksView() = assertEditBookmarksView() - - fun verifyBookmarkNameEditBox() = assertBookmarkNameEditBox() - - fun verifyBookmarkURLEditBox() = assertBookmarkURLEditBox() - - fun verifyParentFolderSelector() = assertBookmarkFolderSelector() + fun verifyEditBookmarksView() { + assertItemWithDescriptionExists(itemWithDescription("Navigate up")) + assertItemContainingTextExists(itemWithText(getStringResource(R.string.edit_bookmark_fragment_title))) + assertItemWithResIdExists( + itemWithResId("$packageName:id/delete_bookmark_button"), + itemWithResId("$packageName:id/save_bookmark_button"), + itemWithResId("$packageName:id/bookmarkNameEdit"), + itemWithResId("$packageName:id/bookmarkUrlEdit"), + itemWithResId("$packageName:id/bookmarkParentFolderSelector"), + ) + } fun verifyKeyboardHidden() = assertKeyboardVisibility(isExpectedToBeVisible = false) @@ -265,6 +278,24 @@ class BookmarksRobot { HomeScreenRobot().interact() return HomeScreenRobot.Transition() } + + fun closeEditBookmarkSection(interact: BookmarksRobot.() -> Unit): BookmarksRobot.Transition { + goBackButton().click() + + BookmarksRobot().interact() + return BookmarksRobot.Transition() + } + + fun openBookmarkWithTitle(bookmarkTitle: String, interact: BrowserRobot.() -> Unit): BrowserRobot.Transition { + itemWithResIdAndText("$packageName:id/title", bookmarkTitle) + .also { + it.waitForExists(waitingTime) + it.clickAndWaitForNewWindow(waitingTimeShort) + } + + BrowserRobot().interact() + return BrowserRobot.Transition() + } } } @@ -395,21 +426,6 @@ private fun assertUndoDeleteSnackBarButton() = private fun assertSnackBarText(text: String) = snackBarText().check(matches(withText(containsString(text)))) -private fun assertEditBookmarksView() = onView(withText("Edit bookmark")) - .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))) - -private fun assertBookmarkNameEditBox() = - onView(withId(R.id.bookmarkNameEdit)) - .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))) - -private fun assertBookmarkFolderSelector() = - onView(withId(R.id.bookmarkParentFolderSelector)) - .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))) - -private fun assertBookmarkURLEditBox() = - onView(withId(R.id.bookmarkUrlEdit)) - .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))) - private fun assertKeyboardVisibility(isExpectedToBeVisible: Boolean) = assertEquals( isExpectedToBeVisible, diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt index 13c47a274e..57e94bcf01 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt @@ -395,15 +395,12 @@ class BrowserRobot { searchText.click() } - fun snackBarButtonClick() { - val switchButton = - mDevice.findObject( - UiSelector() - .resourceId("$packageName:id/snackbar_btn"), - ) - switchButton.waitForExists(waitingTime) - switchButton.clickAndWaitForNewWindow(waitingTime) - } + fun clickSnackbarButton(expectedText: String) = + itemWithResIdAndText("$packageName:id/snackbar_btn", expectedText) + .also { + it.waitForExists(waitingTime) + it.click() + } fun clickSubmitLoginButton() = clickPageObject(webPageItemWithResourceId("submit"))