Fixed link from clipboard open up from same URL on every new tab #15588

fork
Madalin Valceleanu 4 years ago committed by mergify[bot]
parent 0ea57ded11
commit 1b63240f99

@ -128,6 +128,27 @@ class ContextMenusTest {
} }
} }
@Test
fun verifyContextCopyLinkNotDisplayedAfterApplied() {
val pageLinks = TestAssetHelper.getGenericAsset(mockWebServer, 4)
val genericURL = TestAssetHelper.getGenericAsset(mockWebServer, 3)
navigationToolbar {
}.enterURLAndEnterToBrowser(pageLinks.url) {
mDevice.waitForIdle()
longClickMatchingText("Link 3")
verifyLinkContextMenuItems(genericURL.url)
clickContextCopyLink()
verifySnackBarText("Link copied to clipboard")
}.openNavigationToolbar {
}.visitLinkFromClipboard {
verifyUrl(genericURL.url.toString())
}.openTabDrawer {
}.openNewTab {
verifyFillLinkButton()
}
}
@Test @Test
fun verifyContextShareLink() { fun verifyContextShareLink() {
val pageLinks = val pageLinks =

@ -187,6 +187,7 @@ class SearchRobot {
onView(withContentDescription(expectedText)) onView(withContentDescription(expectedText))
} }
fun verifyDefaultSearchEngine(expectedText: String) = assertDefaultSearchEngine(expectedText) fun verifyDefaultSearchEngine(expectedText: String) = assertDefaultSearchEngine(expectedText)
fun verifyFillLinkButton() = assertFillLinkButton()
fun verifyEnginesListShortcutContains(rule: ComposeTestRule, searchEngineName: String) = assertEngineListShortcutContains(rule, searchEngineName) fun verifyEnginesListShortcutContains(rule: ComposeTestRule, searchEngineName: String) = assertEngineListShortcutContains(rule, searchEngineName)
@ -533,7 +534,15 @@ private fun assertTranslatedFocusedNavigationToolbar(toolbarHintString: String)
).waitForExists(waitingTime), ).waitForExists(waitingTime),
) )
private fun assertFillLinkButton() {
mDevice.waitForIdle()
onView(withId(R.id.fill_link_from_clipboard))
.check(matches(withEffectiveVisibility(ViewMatchers.Visibility.GONE)))
}
private val awesomeBar = private val awesomeBar =
mDevice.findObject(UiSelector().resourceId("$packageName:id/mozac_browser_toolbar_edit_url_view")) mDevice.findObject(UiSelector().resourceId("$packageName:id/mozac_browser_toolbar_edit_url_view"))
private val voiceSearchButton = mDevice.findObject(UiSelector().description("Voice search")) private val voiceSearchButton = mDevice.findObject(UiSelector().description("Voice search"))
private fun goBackButton() = onView(allOf(withContentDescription("Navigate up")))

@ -389,6 +389,7 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
from = BrowserDirection.FromSearchDialog, from = BrowserDirection.FromSearchDialog,
) )
} }
requireContext().components.clipboardHandler.text = null
} }
val stubListener = ViewStub.OnInflateListener { _, inflated -> val stubListener = ViewStub.OnInflateListener { _, inflated ->

Loading…
Cancel
Save