mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2025-03-18 20:29:10 +03:00
moving verification dismissing to the robot
This commit is contained in:
parent
2d1aed1839
commit
579963733b
2 changed files with 20 additions and 28 deletions
|
@ -16,24 +16,14 @@
|
|||
|
||||
package im.vector.app.ui
|
||||
|
||||
import android.view.View
|
||||
import androidx.test.espresso.matcher.ViewMatchers.withId
|
||||
import androidx.test.espresso.matcher.ViewMatchers.withText
|
||||
import androidx.test.ext.junit.rules.ActivityScenarioRule
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.filters.LargeTest
|
||||
import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions.assertDisplayed
|
||||
import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
|
||||
import im.vector.app.EspressoHelper
|
||||
import im.vector.app.R
|
||||
import im.vector.app.espresso.tools.waitUntilViewVisible
|
||||
import im.vector.app.features.MainActivity
|
||||
import im.vector.app.ui.robot.ElementRobot
|
||||
import org.junit.Rule
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import timber.log.Timber
|
||||
import java.lang.Thread.sleep
|
||||
import java.util.UUID
|
||||
|
||||
/**
|
||||
|
@ -94,25 +84,8 @@ class UiAllScreensSanityTest {
|
|||
|
||||
// Login again on the same account
|
||||
elementRobot.login(userId)
|
||||
|
||||
ignoreVerification()
|
||||
elementRobot.dismissVerificationIfPresent()
|
||||
// TODO Deactivate account instead of logout?
|
||||
elementRobot.signout()
|
||||
}
|
||||
|
||||
private fun ignoreVerification() {
|
||||
kotlin.runCatching {
|
||||
sleep(6000)
|
||||
val activity = EspressoHelper.getCurrentActivity()!!
|
||||
val popup = activity.findViewById<View>(com.tapadoo.alerter.R.id.llAlertBackground)!!
|
||||
activity.runOnUiThread { popup.performClick() }
|
||||
|
||||
waitUntilViewVisible(withId(R.id.bottomSheetFragmentContainer))
|
||||
waitUntilViewVisible(withText(R.string.skip))
|
||||
clickOn(R.string.skip)
|
||||
assertDisplayed(R.string.are_you_sure)
|
||||
clickOn(R.string.skip)
|
||||
waitUntilViewVisible(withId(R.id.bottomSheetFragmentContainer))
|
||||
}.onFailure { Timber.w("Verification popup missing", it) }
|
||||
}
|
||||
}
|
||||
|
|
|
@ -16,7 +16,9 @@
|
|||
|
||||
package im.vector.app.ui.robot
|
||||
|
||||
import android.view.View
|
||||
import androidx.test.espresso.Espresso.pressBack
|
||||
import androidx.test.espresso.matcher.ViewMatchers
|
||||
import androidx.test.espresso.matcher.ViewMatchers.withId
|
||||
import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions.assertDisplayed
|
||||
import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
|
||||
|
@ -33,6 +35,7 @@ import im.vector.app.features.login.LoginActivity
|
|||
import im.vector.app.initialSyncIdlingResource
|
||||
import im.vector.app.ui.robot.settings.SettingsRobot
|
||||
import im.vector.app.withIdlingResource
|
||||
import timber.log.Timber
|
||||
|
||||
class ElementRobot {
|
||||
|
||||
|
@ -115,4 +118,20 @@ class ElementRobot {
|
|||
assertDisplayed(R.id.loginSplashLogo)
|
||||
}
|
||||
}
|
||||
|
||||
fun dismissVerificationIfPresent() {
|
||||
kotlin.runCatching {
|
||||
Thread.sleep(6000)
|
||||
val activity = EspressoHelper.getCurrentActivity()!!
|
||||
val popup = activity.findViewById<View>(com.tapadoo.alerter.R.id.llAlertBackground)!!
|
||||
activity.runOnUiThread { popup.performClick() }
|
||||
|
||||
waitUntilViewVisible(withId(R.id.bottomSheetFragmentContainer))
|
||||
waitUntilViewVisible(ViewMatchers.withText(R.string.skip))
|
||||
clickOn(R.string.skip)
|
||||
assertDisplayed(R.string.are_you_sure)
|
||||
clickOn(R.string.skip)
|
||||
waitUntilViewVisible(withId(R.id.bottomSheetFragmentContainer))
|
||||
}.onFailure { Timber.w("Verification popup missing", it) }
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue