From d5968e442cdd3b49b8e97a3d39872b58a7f7cdc1 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 10 Jan 2022 14:31:29 +0100
Subject: [PATCH] Test: Fix test after change on OnBoarding screens

---
 .../im/vector/app/ui/robot/ElementRobot.kt     |  4 ++--
 .../im/vector/app/ui/robot/OnboardingRobot.kt  | 18 ++++++------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt
index a9fed81bd5..22a5a0790b 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt
@@ -32,7 +32,7 @@ import im.vector.app.espresso.tools.waitUntilDialogVisible
 import im.vector.app.espresso.tools.waitUntilViewVisible
 import im.vector.app.features.createdirect.CreateDirectRoomActivity
 import im.vector.app.features.home.HomeActivity
-import im.vector.app.features.login.LoginActivity
+import im.vector.app.features.onboarding.OnboardingActivity
 import im.vector.app.initialSyncIdlingResource
 import im.vector.app.ui.robot.settings.SettingsRobot
 import im.vector.app.withIdlingResource
@@ -123,7 +123,7 @@ class ElementRobot {
             clickDialogPositiveButton()
         }
 
-        waitUntilActivityVisible<LoginActivity> {
+        waitUntilActivityVisible<OnboardingActivity> {
             assertDisplayed(R.id.loginSplashLogo)
         }
     }
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt
index 8b87abadab..633d3cceab 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt
@@ -45,7 +45,11 @@ class OnboardingRobot {
                             homeServerUrl: String) {
         waitUntilViewVisible(withId(R.id.loginSplashSubmit))
         assertDisplayed(R.id.loginSplashSubmit, R.string.login_splash_submit)
-        clickOn(R.id.loginSplashSubmit)
+        if (createAccount) {
+            clickOn(R.id.loginSplashSubmit)
+        } else {
+            clickOn(R.id.loginSplashAlreadyHaveAccount)
+        }
         assertDisplayed(R.id.loginServerTitle, R.string.login_server_title)
         // Chose custom server
         clickOn(R.id.loginServerChoiceOther)
@@ -54,17 +58,7 @@ class OnboardingRobot {
         assertEnabled(R.id.loginServerUrlFormSubmit)
         closeSoftKeyboard()
         clickOn(R.id.loginServerUrlFormSubmit)
-        onView(isRoot()).perform(waitForView(withId(R.id.loginSignupSigninSubmit)))
-
-        if (createAccount) {
-            // Click on the signup button
-            assertDisplayed(R.id.loginSignupSigninSubmit)
-            clickOn(R.id.loginSignupSigninSubmit)
-        } else {
-            // Click on the signin button
-            assertDisplayed(R.id.loginSignupSigninSignIn)
-            clickOn(R.id.loginSignupSigninSignIn)
-        }
+        onView(isRoot()).perform(waitForView(withId(R.id.loginField)))
 
         // Ensure password flow supported
         assertDisplayed(R.id.loginField)