diff options
| author | Albin <albin@mullvad.net> | 2024-06-07 18:51:56 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2024-06-10 10:36:18 +0200 |
| commit | f937ea54f41f947de8ddd606f6071f191fb1cdfb (patch) | |
| tree | ab5be555271de269a199dcfae85d6050610415b3 /android/test/common/src | |
| parent | 561c4d8262fde4d70c13fb1de0642bee521fbbe3 (diff) | |
| download | mullvadvpn-f937ea54f41f947de8ddd606f6071f191fb1cdfb.tar.xz mullvadvpn-f937ea54f41f947de8ddd606f6071f191fb1cdfb.zip | |
Unify account number naming
Use variations of "account number" rather than
"account token" throughout the kotlin code base.
Diffstat (limited to 'android/test/common/src')
| -rw-r--r-- | android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/interactor/AppInteractor.kt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/interactor/AppInteractor.kt b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/interactor/AppInteractor.kt index 0727d41dd3..07ea1aeca1 100644 --- a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/interactor/AppInteractor.kt +++ b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/interactor/AppInteractor.kt @@ -43,12 +43,12 @@ class AppInteractor( device.wait(Until.hasObject(By.pkg(targetPackageName).depth(0)), APP_LAUNCH_TIMEOUT) } - fun launchAndEnsureLoggedIn(accountToken: String) { + fun launchAndEnsureLoggedIn(accountNumber: String) { launch() device.clickAgreeOnPrivacyDisclaimer() device.clickAllowOnNotificationPermissionPromptIfApiLevel33AndAbove() waitForLoginPrompt() - attemptLogin(accountToken) + attemptLogin(accountNumber) ensureLoggedIn() } @@ -61,10 +61,10 @@ class AppInteractor( ensureAccountCreated() } - fun attemptLogin(accountToken: String) { + fun attemptLogin(accountNumber: String) { val loginObject = device.findObjectWithTimeout(By.clazz("android.widget.EditText")).apply { - text = accountToken + text = accountNumber } loginObject.parent.findObject(By.clazz(Button::class.java)).click() } @@ -73,10 +73,10 @@ class AppInteractor( device.findObjectWithTimeout(By.text("Create account")).click() } - fun ensureAccountCreated(accountToken: String? = null) { + fun ensureAccountCreated(accountNumber: String? = null) { device.findObjectWithTimeout(By.text("Congrats!"), LOGIN_TIMEOUT) - accountToken?.let { - device.findObjectWithTimeout(By.text(accountToken), DEFAULT_INTERACTION_TIMEOUT) + accountNumber?.let { + device.findObjectWithTimeout(By.text(accountNumber), DEFAULT_INTERACTION_TIMEOUT) } } |
