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 3bca1cfb4f..2aa975185f 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt @@ -609,9 +609,12 @@ class BookmarksTest { }.openThreeDotMenu(defaultWebPage.url) { IdlingRegistry.getInstance().unregister(bookmarksListIdlingResource!!) }.clickEdit { + clickDeleteInEditModeButton() + cancelDeletion() clickDeleteInEditModeButton() confirmDeletion() verifyDeleteSnackBarText() + verifyBookmarkIsDeleted("Test_Page_1") } } } 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 babea9abd0..d66e451ca4 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 @@ -75,6 +75,8 @@ class BookmarksRobot { assertBookmarkTitle(title) } + fun verifyBookmarkIsDeleted(expectedTitle: String) = assertBookmarkIsDeleted(expectedTitle) + fun verifyDeleteSnackBarText() = assertSnackBarText("Deleted") fun verifyUndoDeleteSnackBarButton() = assertUndoDeleteSnackBarButton() @@ -204,6 +206,12 @@ class BookmarksRobot { fun longTapDesktopFolder(title: String) = onView(withText(title)).perform(longClick()) + fun cancelDeletion() { + val cancelButton = mDevice.findObject(UiSelector().textContains("CANCEL")) + cancelButton.waitForExists(waitingTime) + cancelButton.click() + } + fun confirmDeletion() { onView(withText(R.string.delete_browsing_data_prompt_allow)) .inRoot(RootMatchers.isDialog()) @@ -352,6 +360,19 @@ private fun assertFolderTitle(expectedTitle: String) = private fun assertBookmarkTitle(expectedTitle: String) = onView(withText(expectedTitle)).check(matches(isDisplayed())) +private fun assertBookmarkIsDeleted(expectedTitle: String) { + mDevice.findObject( + UiSelector() + .resourceId("$packageName:id/bookmarks_wrapper") + ).waitForExists(waitingTime) + + assertFalse( + mDevice.findObject( + UiSelector() + .textContains(expectedTitle) + ).waitForExists(waitingTime) + ) +} private fun assertUndoDeleteSnackBarButton() = snackBarUndoButton().check(matches(withText("UNDO")))