diff --git a/app/src/androidTest/kotlin/data/TestData.kt b/app/src/androidTest/kotlin/data/TestData.kt index 406ffdb607..7ee6816f60 100644 --- a/app/src/androidTest/kotlin/data/TestData.kt +++ b/app/src/androidTest/kotlin/data/TestData.kt @@ -6,5 +6,5 @@ import kotlinx.serialization.Serializable data class TestData( val baseUrl: String, val email: String, - val password: String + val password: String, ) diff --git a/app/src/androidTest/kotlin/e2e/pageObjects/Page.kt b/app/src/androidTest/kotlin/e2e/pageObjects/Page.kt index 53d43f0f9c..704696ff7c 100644 --- a/app/src/androidTest/kotlin/e2e/pageObjects/Page.kt +++ b/app/src/androidTest/kotlin/e2e/pageObjects/Page.kt @@ -38,7 +38,7 @@ abstract class Page(protected val composeTestRule: ComposeTestRule) { return composeTestRule.onNodeWithTag(testTag) } - protected fun getElementByText(text: String): SemanticsNodeInteraction{ + protected fun getElementByText(text: String): SemanticsNodeInteraction { waitForIdle() waitUntil(TIMEOUT_MILLIS) { try { @@ -66,7 +66,7 @@ abstract class Page(protected val composeTestRule: ComposeTestRule) { */ protected fun waitUntil( timeoutMillis: Long, - condition: () -> Boolean + condition: () -> Boolean, ) { composeTestRule.waitUntil(timeoutMillis) { condition() } } diff --git a/app/src/androidTest/kotlin/e2e/pageObjects/login/EnvironmentSettingsPage.kt b/app/src/androidTest/kotlin/e2e/pageObjects/login/EnvironmentSettingsPage.kt index 556f1c3713..bb264f412d 100644 --- a/app/src/androidTest/kotlin/e2e/pageObjects/login/EnvironmentSettingsPage.kt +++ b/app/src/androidTest/kotlin/e2e/pageObjects/login/EnvironmentSettingsPage.kt @@ -6,12 +6,12 @@ import androidx.compose.ui.test.performTextInput import com.x8bit.bitwarden.e2e.pages.LoginPage import e2e.pageObjects.Page -class EnvironmentSettingsPage(composeTestRule: ComposeTestRule) : Page(composeTestRule){ +class EnvironmentSettingsPage(composeTestRule: ComposeTestRule) : Page(composeTestRule) { private val serverURLField by lazy { getElement("ServerUrlEntry") } private val saveButton by lazy { getElement("SaveButton") } - fun setupEnvironment(url: String) : LoginPage { + fun setupEnvironment(url: String): LoginPage { serverURLField .performClick() .performTextInput(url) diff --git a/app/src/androidTest/kotlin/e2e/pageObjects/login/LoginPage.kt b/app/src/androidTest/kotlin/e2e/pageObjects/login/LoginPage.kt index 1fd8cbe100..ac09489dc7 100644 --- a/app/src/androidTest/kotlin/e2e/pageObjects/login/LoginPage.kt +++ b/app/src/androidTest/kotlin/e2e/pageObjects/login/LoginPage.kt @@ -11,7 +11,7 @@ import e2e.pageObjects.vault.VaultPage * Page Object representing the Login screen of the Bitwarden app. * This class encapsulates all the UI elements and actions available on the login screen. */ -class LoginPage(composeTestRule: ComposeTestRule) : Page(composeTestRule){ +class LoginPage(composeTestRule: ComposeTestRule) : Page(composeTestRule) { // UI Elements private val emailField by lazy { getElement("EmailAddressEntry") } @@ -24,7 +24,6 @@ class LoginPage(composeTestRule: ComposeTestRule) : Page(composeTestRule){ private val allowScreenCaptureToggle by lazy { getElement("AllowScreenCaptureSwitch") } private val goBackButton by lazy { getElement("CloseButton") } - /** * Enters the master password in the password field * @param password The master password to enter @@ -43,14 +42,14 @@ class LoginPage(composeTestRule: ComposeTestRule) : Page(composeTestRule){ return VaultPage(composeTestRule) } - fun openEnvironmentSettings() : EnvironmentSettingsPage { + fun openEnvironmentSettings(): EnvironmentSettingsPage { regionSelectorButton.performClick() getElementByText("Self-hosted") .performClick() return EnvironmentSettingsPage(composeTestRule) } - fun turnOnScreenRecording() : LoginPage { + fun turnOnScreenRecording(): LoginPage { openSettingsButton.performClick() otherSettingsButton.performClick() allowScreenCaptureToggle.performClick() diff --git a/app/src/androidTest/kotlin/e2e/pageObjects/settings/SettingsPage.kt b/app/src/androidTest/kotlin/e2e/pageObjects/settings/SettingsPage.kt index 50a5312fc0..e72123a8a4 100644 --- a/app/src/androidTest/kotlin/e2e/pageObjects/settings/SettingsPage.kt +++ b/app/src/androidTest/kotlin/e2e/pageObjects/settings/SettingsPage.kt @@ -5,7 +5,7 @@ import androidx.compose.ui.test.* import e2e.pageObjects.Page import e2e.pageObjects.settings.accountSecurity.AccountSecurityPage -class SettingsPage (composeTestRule: ComposeTestRule) : Page(composeTestRule) { +class SettingsPage(composeTestRule: ComposeTestRule) : Page(composeTestRule) { // UI Elements private val accountSecurityButton by lazy { getElement("AccountSecuritySettingsButton") } diff --git a/app/src/androidTest/kotlin/e2e/pageObjects/settings/accountSecurity/AccountSecurityPage.kt b/app/src/androidTest/kotlin/e2e/pageObjects/settings/accountSecurity/AccountSecurityPage.kt index e29c6fa6ce..a1882e06c0 100644 --- a/app/src/androidTest/kotlin/e2e/pageObjects/settings/accountSecurity/AccountSecurityPage.kt +++ b/app/src/androidTest/kotlin/e2e/pageObjects/settings/accountSecurity/AccountSecurityPage.kt @@ -9,7 +9,7 @@ import e2e.pageObjects.vault.UnlockVaultPage * Page Object representing the Account Security screen of the Bitwarden app. * This class encapsulates all the UI elements and actions available on the account security screen. */ -class AccountSecurityPage(composeTestRule: ComposeTestRule) : Page(composeTestRule) { +class AccountSecurityPage(composeTestRule: ComposeTestRule) : Page(composeTestRule) { // UI Elements private val lockNowLabel by lazy { getElement("LockNowLabel") } diff --git a/app/src/androidTest/kotlin/e2e/pageObjects/vault/UnlockVaultPage.kt b/app/src/androidTest/kotlin/e2e/pageObjects/vault/UnlockVaultPage.kt index 1191aa4340..5ae610a3f5 100644 --- a/app/src/androidTest/kotlin/e2e/pageObjects/vault/UnlockVaultPage.kt +++ b/app/src/androidTest/kotlin/e2e/pageObjects/vault/UnlockVaultPage.kt @@ -13,7 +13,6 @@ class UnlockVaultPage(composeTestRule: ComposeTestRule) : Page(composeTestRule) private val passwordEntryTag by lazy { getElement("MasterPasswordEntry") } private val unlockVaultButtonTag by lazy { getElement("UnlockVaultButton") } - fun enterPassword(password: String): UnlockVaultPage { passwordEntryTag.performTextInput(password) return this