Closes mozilla-mobile#25954: fix history UI test

mavduevskiy · Jul 10, 2022 · 425c3a4 · 425c3a4
1 parent ba13f1f
commit 425c3a4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HistoryRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HistoryRobot.kt
@@ -147,7 +147,7 @@ private fun assertPageUrl(expectedUrl: Uri) = pageUrl()
     .check(matches(withText(Matchers.containsString(expectedUrl.toString()))))
 
 private fun assertDeleteConfirmationMessage() =
-    onView(withText("This will delete all of your browsing data."))
+    onView(withText("Removes history (including history synced from other devices), cookies and other browsing data."))
         .inRoot(isDialog())
         .check(matches(isDisplayed()))
 

diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt
@@ -337,7 +337,8 @@ class HistoryFragment : LibraryPageFragment<History>(), UserInteractionHandler {
         DeleteConfirmationDialogFragment(
             historyView = historyView,
             historyStore = historyStore,
-            browserStore = requireComponents.core.store
+            browserStore = requireComponents.core.store,
+            parentView = requireView()
         ).show(childFragmentManager, null)
     }
 
@@ -366,7 +367,8 @@ class HistoryFragment : LibraryPageFragment<History>(), UserInteractionHandler {
     internal class DeleteConfirmationDialogFragment(
         private val historyView: HistoryView,
         private val historyStore: HistoryFragmentStore,
-        private val browserStore: BrowserStore
+        private val browserStore: BrowserStore,
+        private val parentView: View
     ) : DialogFragment() {
         override fun onCreateDialog(savedInstanceState: Bundle?): Dialog =
             AlertDialog.Builder(requireContext()).apply {
@@ -392,7 +394,7 @@ class HistoryFragment : LibraryPageFragment<History>(), UserInteractionHandler {
                                 historyView.historyAdapter.refresh()
                                 historyStore.dispatch(HistoryFragmentAction.ExitDeletionMode)
                                 showSnackBar(
-                                    requireView(),
+                                    parentView,
                                     getString(R.string.preferences_delete_browsing_data_snackbar)
                                 )
                             }
@@ -414,7 +416,7 @@ class HistoryFragment : LibraryPageFragment<History>(), UserInteractionHandler {
                                 historyView.historyAdapter.refresh()
                                 historyStore.dispatch(HistoryFragmentAction.ExitDeletionMode)
                                 showSnackBar(
-                                    requireView(),
+                                    parentView,
                                     getString(R.string.preferences_delete_browsing_data_snackbar)
                                 )
                             }