|
|
@ -5,8 +5,6 @@
|
|
|
|
package org.mozilla.fenix.ui.robots
|
|
|
|
package org.mozilla.fenix.ui.robots
|
|
|
|
|
|
|
|
|
|
|
|
import androidx.test.espresso.Espresso.onView
|
|
|
|
import androidx.test.espresso.Espresso.onView
|
|
|
|
import androidx.test.espresso.NoMatchingViewException
|
|
|
|
|
|
|
|
import androidx.test.espresso.action.ViewActions.pressImeActionButton
|
|
|
|
|
|
|
|
import androidx.test.espresso.action.ViewActions.replaceText
|
|
|
|
import androidx.test.espresso.action.ViewActions.replaceText
|
|
|
|
import androidx.test.espresso.action.ViewActions.swipeLeft
|
|
|
|
import androidx.test.espresso.action.ViewActions.swipeLeft
|
|
|
|
import androidx.test.espresso.action.ViewActions.swipeRight
|
|
|
|
import androidx.test.espresso.action.ViewActions.swipeRight
|
|
|
@ -205,40 +203,40 @@ class CollectionRobot {
|
|
|
|
fun swipeToBottom() = onView(withId(R.id.sessionControlRecyclerView)).perform(swipeUp())
|
|
|
|
fun swipeToBottom() = onView(withId(R.id.sessionControlRecyclerView)).perform(swipeUp())
|
|
|
|
|
|
|
|
|
|
|
|
class Transition {
|
|
|
|
class Transition {
|
|
|
|
fun collapseCollection(
|
|
|
|
// fun collapseCollection(
|
|
|
|
title: String,
|
|
|
|
// title: String,
|
|
|
|
interact: HomeScreenRobot.() -> Unit
|
|
|
|
// interact: HomeScreenRobot.() -> Unit
|
|
|
|
): HomeScreenRobot.Transition {
|
|
|
|
// ): HomeScreenRobot.Transition {
|
|
|
|
try {
|
|
|
|
// try {
|
|
|
|
mDevice.waitNotNull(Until.findObject(By.text(title)), waitingTime)
|
|
|
|
// mDevice.waitNotNull(Until.findObject(By.text(title)), waitingTime)
|
|
|
|
onView(allOf(withId(R.id.chevron), hasSibling(withText(title)))).click()
|
|
|
|
// onView(allOf(withId(R.id.chevron), hasSibling(withText(title)))).click()
|
|
|
|
} catch (e: NoMatchingViewException) {
|
|
|
|
// } catch (e: NoMatchingViewException) {
|
|
|
|
scrollToElementByText(title)
|
|
|
|
// scrollToElementByText(title)
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
|
|
|
|
//
|
|
|
|
HomeScreenRobot().interact()
|
|
|
|
// HomeScreenRobot().interact()
|
|
|
|
return HomeScreenRobot.Transition()
|
|
|
|
// return HomeScreenRobot.Transition()
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
|
|
|
|
//
|
|
|
|
// names a collection saved from the 3dot menu
|
|
|
|
// // names a collection saved from the 3dot menu
|
|
|
|
fun typeCollectionNameAndSave(
|
|
|
|
// fun typeCollectionNameAndSave(
|
|
|
|
name: String,
|
|
|
|
// name: String,
|
|
|
|
interact: BrowserRobot.() -> Unit
|
|
|
|
// interact: BrowserRobot.() -> Unit
|
|
|
|
): BrowserRobot.Transition {
|
|
|
|
// ): BrowserRobot.Transition {
|
|
|
|
mDevice.findObject(UiSelector().resourceId("$packageName:id/name_collection_edittext"))
|
|
|
|
// mDevice.findObject(UiSelector().resourceId("$packageName:id/name_collection_edittext"))
|
|
|
|
.waitForExists(waitingTime)
|
|
|
|
// .waitForExists(waitingTime)
|
|
|
|
|
|
|
|
//
|
|
|
|
mainMenuEditCollectionNameField().perform(
|
|
|
|
// mainMenuEditCollectionNameField().perform(
|
|
|
|
replaceText(name),
|
|
|
|
// replaceText(name),
|
|
|
|
pressImeActionButton()
|
|
|
|
// pressImeActionButton()
|
|
|
|
)
|
|
|
|
// )
|
|
|
|
|
|
|
|
//
|
|
|
|
// wait for the collection creation wrapper to be dismissed
|
|
|
|
// // wait for the collection creation wrapper to be dismissed
|
|
|
|
mDevice.waitNotNull(Until.gone(By.res("$packageName:id/createCollectionWrapper")))
|
|
|
|
// mDevice.waitNotNull(Until.gone(By.res("$packageName:id/createCollectionWrapper")))
|
|
|
|
|
|
|
|
//
|
|
|
|
BrowserRobot().interact()
|
|
|
|
// BrowserRobot().interact()
|
|
|
|
return BrowserRobot.Transition()
|
|
|
|
// return BrowserRobot.Transition()
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
fun selectExistingCollection(
|
|
|
|
fun selectExistingCollection(
|
|
|
|
title: String,
|
|
|
|
title: String,
|
|
|
|