From 3cdcbe4af64890e5463b23a531a45a75da053e61 Mon Sep 17 00:00:00 2001 From: No-Jun Park Date: Thu, 12 Sep 2019 18:56:36 -0400 Subject: [PATCH] fix TabbedBrowsingTest.kt failure where Share Tabs element was not found (#5282) --- .../java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt | 4 ++-- .../java/org/mozilla/fenix/ui/robots/ThreeDotMenuRobot.kt | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt index 5ed6de4c5..8f5d1505a 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt @@ -76,7 +76,7 @@ class TabbedBrowsingTest { }.openTabsListThreeDotMenu { verifyCloseAllTabsButton() - verifyShareButton() + verifyShareTabButton() verifySaveCollection() } } @@ -130,7 +130,7 @@ class TabbedBrowsingTest { verifyExistingTabList() }.openTabsListThreeDotMenu { verifyCloseAllTabsButton() - verifyShareButton() + verifyShareTabButton() verifySaveCollection() }.closeAllTabs { verifyNoCollectionsHeader() diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuRobot.kt index c2c3b3ca4..af9a933eb 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuRobot.kt @@ -39,6 +39,7 @@ class ThreeDotMenuRobot { shareButton().click() mDevice.wait(Until.findObject(By.text("SHARE A LINK")), waitingTime) } + fun verifyShareTabButton() = assertShareTabButton() fun verifySaveCollection() = assertSaveCollectionButton() fun verifyFindInPageButton() = assertFindInPageButton() fun verifyShareDialogTitle() = assertShareDialogTitle() @@ -155,6 +156,9 @@ private fun closeAllTabsButton() = onView(allOf(withText("Close all tabs"))) private fun assertCloseAllTabsButton() = closeAllTabsButton() .check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))) +private fun shareTabButton() = onView(allOf(withText("Share tabs"))) +private fun assertShareTabButton() = shareTabButton() + .check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))) private fun shareButton() = onView(allOf(withText("Share"))) private fun assertShareButton() = shareButton() .check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))