No issue: Use same open tabs tray everywhere

upstream-sync
Jonathan Almeida 3 years ago committed by Jonathan Almeida
parent 1e09d50fd7
commit 0189fed012

@ -185,10 +185,10 @@ class NavigationToolbarRobot {
} }
fun openTabTray(interact: TabDrawerRobot.() -> Unit): TabDrawerRobot.Transition { fun openTabTray(interact: TabDrawerRobot.() -> Unit): TabDrawerRobot.Transition {
onView(withId(R.id.tab_button)) mDevice.waitForIdle(waitingTime)
.check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
tabTrayButton().click() tabTrayButton().click()
mDevice.waitNotNull(Until.findObject(By.res("$packageName:id/tab_layout")),
waitingTime)
TabDrawerRobot().interact() TabDrawerRobot().interact()
return TabDrawerRobot.Transition() return TabDrawerRobot.Transition()

@ -208,15 +208,10 @@ class TabDrawerRobot {
} }
fun openTabDrawer(interact: TabDrawerRobot.() -> Unit): TabDrawerRobot.Transition { fun openTabDrawer(interact: TabDrawerRobot.() -> Unit): TabDrawerRobot.Transition {
mDevice.findObject(UiSelector().resourceId("$packageName:id/tab_button")) mDevice.waitForIdle(waitingTime)
.waitForExists(waitingTime)
tabsCounter().click() tabsCounter().click()
mDevice.waitNotNull(Until.findObject(By.res("$packageName:id/tab_layout")),
org.mozilla.fenix.ui.robots.mDevice.waitNotNull( waitingTime)
Until.findObject(By.res("$packageName:id/tab_layout")),
waitingTime
)
TabDrawerRobot().interact() TabDrawerRobot().interact()
return TabDrawerRobot.Transition() return TabDrawerRobot.Transition()

Loading…
Cancel
Save