From cf70dd11ca80fe7bf08c28703e493e772d9c190a Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Tue, 6 Dec 2022 13:53:48 +0200
Subject: [PATCH] No issue: refactor verifyLinkFromClipboardNotDisplayedTest UI
 test

---
 .../java/org/mozilla/fenix/ui/ContextMenusTest.kt          | 5 +++--
 .../org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt  | 2 +-
 .../java/org/mozilla/fenix/ui/robots/SearchRobot.kt        | 7 -------
 3 files changed, 4 insertions(+), 10 deletions(-)

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 f97ffb50b3..e55b93effd 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ContextMenusTest.kt
@@ -135,7 +135,6 @@ class ContextMenusTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(pageLinks.url) {
-            mDevice.waitForIdle()
             longClickMatchingText("Link 3")
             verifyLinkContextMenuItems(genericURL.url)
             clickContextCopyLink()
@@ -145,7 +144,9 @@ class ContextMenusTest {
             verifyUrl(genericURL.url.toString())
         }.openTabDrawer {
         }.openNewTab {
-            verifyFillLinkButton()
+        }
+        navigationToolbar {
+            verifyClipboardSuggestionsAreDisplayed(shouldBeDisplayed = false)
         }
     }
 
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
index ed09b5a9cb..3d5818e64a 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
@@ -65,7 +65,7 @@ class NavigationToolbarRobot {
         readerViewToggle().click()
     }
 
-    fun verifyClipboardSuggestionsAreDisplayed(link: String, shouldBeDisplayed: Boolean) {
+    fun verifyClipboardSuggestionsAreDisplayed(link: String = "", shouldBeDisplayed: Boolean) {
         when (shouldBeDisplayed) {
             true -> {
                 assertTrue(
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt
index ddf9e6736e..eae28eb86b 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt
@@ -187,7 +187,6 @@ class SearchRobot {
         onView(withContentDescription(expectedText))
     }
     fun verifyDefaultSearchEngine(expectedText: String) = assertDefaultSearchEngine(expectedText)
-    fun verifyFillLinkButton() = assertFillLinkButton()
 
     fun verifyEnginesListShortcutContains(rule: ComposeTestRule, searchEngineName: String) = assertEngineListShortcutContains(rule, searchEngineName)
 
@@ -534,12 +533,6 @@ private fun assertTranslatedFocusedNavigationToolbar(toolbarHintString: String)
         ).waitForExists(waitingTime),
     )
 
-private fun assertFillLinkButton() {
-    mDevice.waitForIdle()
-    onView(withId(R.id.fill_link_from_clipboard))
-        .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.GONE)))
-}
-
 private val awesomeBar =
     mDevice.findObject(UiSelector().resourceId("$packageName:id/mozac_browser_toolbar_edit_url_view"))