From db956b9b9190d229d877b3ee1885c152ce3192f6 Mon Sep 17 00:00:00 2001 From: David Perez Date: Wed, 14 May 2025 12:51:06 -0500 Subject: [PATCH] PM-21634: Update loading Dialog to be a real dialog (#5191) --- .../dialog/BitwardenLoadingDialog.kt | 12 ++++++---- .../accountsetup/SetupUnlockScreenTest.kt | 6 ++--- .../EnterpriseSignOnScreenTest.kt | 7 +++--- .../LoginWithDeviceScreenTest.kt | 7 +++--- .../RemovePasswordScreenTest.kt | 6 ++--- .../trusteddevice/TrustedDeviceScreenTest.kt | 11 ++++----- .../feature/search/SearchScreenTest.kt | 6 ++--- .../AccountSecurityScreenTest.kt | 8 +++---- .../deleteaccount/DeleteAccountScreenTest.kt | 23 +++++++++++-------- .../DeleteAccountConfirmationScreenTest.kt | 11 ++++----- .../exportvault/ExportVaultScreenTest.kt | 8 +++---- .../addedit/FolderAddEditScreenTest.kt | 10 ++++---- .../feature/settings/other/OtherScreenTest.kt | 6 ++--- .../ui/tools/feature/send/SendScreenTest.kt | 5 ++-- .../feature/send/addsend/AddSendScreenTest.kt | 8 +++---- .../send/viewsend/ViewSendScreenTest.kt | 3 +-- .../attachments/AttachmentsScreenTest.kt | 9 ++++---- .../importlogins/ImportLoginsScreenTest.kt | 8 +++---- .../vault/feature/item/VaultItemScreenTest.kt | 5 ++-- .../itemlisting/VaultItemListingScreenTest.kt | 5 ++-- .../VaultMoveToOrganizationScreenTest.kt | 10 ++++---- .../ui/vault/feature/vault/VaultScreenTest.kt | 5 ++-- .../VerificationCodeScreenTest.kt | 7 +++--- 23 files changed, 83 insertions(+), 103 deletions(-) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenLoadingDialog.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenLoadingDialog.kt index 41985339c0..a4f5209f64 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenLoadingDialog.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenLoadingDialog.kt @@ -8,8 +8,8 @@ import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.testTag import androidx.compose.ui.semantics.testTagsAsResourceId import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.window.Popup -import androidx.compose.ui.window.PopupProperties +import androidx.compose.ui.window.Dialog +import androidx.compose.ui.window.DialogProperties import com.x8bit.bitwarden.ui.platform.components.content.BitwardenLoadingContent import com.x8bit.bitwarden.ui.platform.theme.BitwardenTheme @@ -31,12 +31,14 @@ import com.x8bit.bitwarden.ui.platform.theme.BitwardenTheme fun BitwardenLoadingDialog( text: String, ) { - Popup( - properties = PopupProperties( + Dialog( + properties = DialogProperties( dismissOnBackPress = false, dismissOnClickOutside = false, - clippingEnabled = false, + usePlatformDefaultWidth = false, + decorFitsSystemWindows = false, ), + onDismissRequest = {}, ) { BitwardenLoadingContent( text = text, diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupUnlockScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupUnlockScreenTest.kt index 80d8115377..98da570bf6 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupUnlockScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupUnlockScreenTest.kt @@ -8,7 +8,6 @@ import androidx.compose.ui.test.assertIsOn import androidx.compose.ui.test.filterToOne import androidx.compose.ui.test.hasAnyAncestor import androidx.compose.ui.test.isDialog -import androidx.compose.ui.test.isPopup import androidx.compose.ui.test.onAllNodesWithText import androidx.compose.ui.test.onNodeWithContentDescription import androidx.compose.ui.test.onNodeWithText @@ -22,7 +21,6 @@ import com.x8bit.bitwarden.ui.platform.components.toggle.UnlockWithPinState import com.x8bit.bitwarden.ui.platform.manager.biometrics.BiometricSupportStatus import com.x8bit.bitwarden.ui.platform.manager.biometrics.BiometricsManager import com.x8bit.bitwarden.ui.util.assertNoDialogExists -import com.x8bit.bitwarden.ui.util.assertNoPopupExists import io.mockk.every import io.mockk.just import io.mockk.mockk @@ -573,14 +571,14 @@ class SetupUnlockScreenTest : BaseComposeTest() { @Test fun `Loading Dialog should be displayed according to state`() { val title = "title" - composeTestRule.assertNoPopupExists() + composeTestRule.assertNoDialogExists() mutableStateFlow.update { it.copy(dialogState = SetupUnlockState.DialogState.Loading(title = title.asText())) } composeTestRule .onAllNodesWithText(text = title) - .filterToOne(hasAnyAncestor(isPopup())) + .filterToOne(hasAnyAncestor(isDialog())) .assertIsDisplayed() mutableStateFlow.update { it.copy(dialogState = null) } diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnScreenTest.kt index 4680048b38..4882fb8a77 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnScreenTest.kt @@ -7,7 +7,6 @@ import androidx.compose.ui.test.assertTextEquals import androidx.compose.ui.test.filterToOne import androidx.compose.ui.test.hasAnyAncestor import androidx.compose.ui.test.isDialog -import androidx.compose.ui.test.isPopup import androidx.compose.ui.test.onAllNodesWithText import androidx.compose.ui.test.onNodeWithContentDescription import androidx.compose.ui.test.onNodeWithText @@ -17,7 +16,7 @@ import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager -import com.x8bit.bitwarden.ui.util.assertNoPopupExists +import com.x8bit.bitwarden.ui.util.assertNoDialogExists import io.mockk.every import io.mockk.just import io.mockk.mockk @@ -168,7 +167,7 @@ class EnterpriseSignOnScreenTest : BaseComposeTest() { @Test fun `loading dialog should be displayed according to state`() { - composeTestRule.assertNoPopupExists() + composeTestRule.assertNoDialogExists() composeTestRule.onNodeWithText("Loading").assertDoesNotExist() mutableStateFlow.update { @@ -182,7 +181,7 @@ class EnterpriseSignOnScreenTest : BaseComposeTest() { composeTestRule .onNodeWithText("Loading") .assertIsDisplayed() - .assert(hasAnyAncestor(isPopup())) + .assert(hasAnyAncestor(isDialog())) } @Test diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceScreenTest.kt index 8ce1302090..4638494c4a 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceScreenTest.kt @@ -6,7 +6,6 @@ import androidx.compose.ui.test.assertCountEquals import androidx.compose.ui.test.assertIsDisplayed import androidx.compose.ui.test.hasAnyAncestor import androidx.compose.ui.test.isDialog -import androidx.compose.ui.test.isPopup import androidx.compose.ui.test.onNodeWithContentDescription import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick @@ -17,7 +16,7 @@ import com.x8bit.bitwarden.R import com.x8bit.bitwarden.ui.auth.feature.loginwithdevice.model.LoginWithDeviceType import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager -import com.x8bit.bitwarden.ui.util.assertNoPopupExists +import com.x8bit.bitwarden.ui.util.assertNoDialogExists import com.x8bit.bitwarden.ui.util.isProgressBar import io.mockk.every import io.mockk.just @@ -148,11 +147,11 @@ class LoginWithDeviceScreenTest : BaseComposeTest() { } composeTestRule .onNodeWithText(loadingMessage) - .assert(hasAnyAncestor(isPopup())) + .assert(hasAnyAncestor(isDialog())) .assertIsDisplayed() mutableStateFlow.update { it.copy(dialogState = null) } - composeTestRule.assertNoPopupExists() + composeTestRule.assertNoDialogExists() } @Test diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/removepassword/RemovePasswordScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/removepassword/RemovePasswordScreenTest.kt index 2edecea782..b028ebbc76 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/removepassword/RemovePasswordScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/removepassword/RemovePasswordScreenTest.kt @@ -8,7 +8,6 @@ import androidx.compose.ui.test.filterToOne import androidx.compose.ui.test.hasAnyAncestor import androidx.compose.ui.test.isDialog import androidx.compose.ui.test.isDisplayed -import androidx.compose.ui.test.isPopup import androidx.compose.ui.test.onAllNodesWithText import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick @@ -18,7 +17,6 @@ import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest import com.x8bit.bitwarden.ui.util.assertNoDialogExists -import com.x8bit.bitwarden.ui.util.assertNoPopupExists import io.mockk.every import io.mockk.just import io.mockk.mockk @@ -83,12 +81,12 @@ class RemovePasswordScreenTest : BaseComposeTest() { composeTestRule .onNodeWithText(text = loadingMessage) - .assert(hasAnyAncestor(isPopup())) + .assert(hasAnyAncestor(isDialog())) .isDisplayed() mutableStateFlow.update { it.copy(dialogState = null) } - composeTestRule.assertNoPopupExists() + composeTestRule.assertNoDialogExists() } @Test diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/trusteddevice/TrustedDeviceScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/trusteddevice/TrustedDeviceScreenTest.kt index 362739f2e4..87797f4bbf 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/trusteddevice/TrustedDeviceScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/trusteddevice/TrustedDeviceScreenTest.kt @@ -6,7 +6,6 @@ import androidx.compose.ui.test.assertIsOff import androidx.compose.ui.test.assertIsOn import androidx.compose.ui.test.hasAnyAncestor import androidx.compose.ui.test.isDialog -import androidx.compose.ui.test.isPopup import androidx.compose.ui.test.onNodeWithContentDescription import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick @@ -14,7 +13,7 @@ import androidx.compose.ui.test.performScrollTo import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest -import com.x8bit.bitwarden.ui.util.assertNoPopupExists +import com.x8bit.bitwarden.ui.util.assertNoDialogExists import io.mockk.every import io.mockk.mockk import io.mockk.verify @@ -247,17 +246,17 @@ class TrustedDeviceScreenTest : BaseComposeTest() { @Test fun `dialog should update according to state`() { - composeTestRule.assertNoPopupExists() + composeTestRule.assertNoDialogExists() mutableStateFlow.update { it.copy( dialogState = TrustedDeviceState.DialogState.Loading(message = "Loading".asText()), ) } - composeTestRule.onNode(isPopup()).assertIsDisplayed() + composeTestRule.onNode(isDialog()).assertIsDisplayed() composeTestRule .onNodeWithText(text = "Loading") - .assert(hasAnyAncestor(isPopup())) + .assert(hasAnyAncestor(isDialog())) .assertIsDisplayed() mutableStateFlow.update { @@ -280,7 +279,7 @@ class TrustedDeviceScreenTest : BaseComposeTest() { .assertIsDisplayed() mutableStateFlow.update { it.copy(dialogState = null) } - composeTestRule.assertNoPopupExists() + composeTestRule.assertNoDialogExists() } } diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchScreenTest.kt index 781414be71..4e502aa1a7 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchScreenTest.kt @@ -9,7 +9,6 @@ import androidx.compose.ui.test.hasAnyAncestor import androidx.compose.ui.test.hasScrollToNodeAction import androidx.compose.ui.test.hasText import androidx.compose.ui.test.isDialog -import androidx.compose.ui.test.isPopup import androidx.compose.ui.test.onAllNodesWithText import androidx.compose.ui.test.onNodeWithContentDescription import androidx.compose.ui.test.onNodeWithText @@ -31,7 +30,6 @@ import com.x8bit.bitwarden.ui.tools.feature.send.model.SendItemType import com.x8bit.bitwarden.ui.tools.feature.send.viewsend.ViewSendRoute import com.x8bit.bitwarden.ui.util.assertMasterPasswordDialogDisplayed import com.x8bit.bitwarden.ui.util.assertNoDialogExists -import com.x8bit.bitwarden.ui.util.assertNoPopupExists import com.x8bit.bitwarden.ui.util.isProgressBar import com.x8bit.bitwarden.ui.vault.feature.addedit.VaultAddEditArgs import com.x8bit.bitwarden.ui.vault.feature.item.VaultItemArgs @@ -962,7 +960,7 @@ class SearchScreenTest : BaseComposeTest() { @Test fun `loading dialog should be displayed according to state`() { val loadingMessage = "syncing" - composeTestRule.assertNoPopupExists() + composeTestRule.assertNoDialogExists() composeTestRule.onNodeWithText(loadingMessage).assertDoesNotExist() mutableStateFlow.update { @@ -972,7 +970,7 @@ class SearchScreenTest : BaseComposeTest() { composeTestRule .onNodeWithText(loadingMessage) .assertIsDisplayed() - .assert(hasAnyAncestor(isPopup())) + .assert(hasAnyAncestor(isDialog())) } } diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityScreenTest.kt index 548e1fa93e..a703a65cfa 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityScreenTest.kt @@ -11,7 +11,6 @@ import androidx.compose.ui.test.hasAnyAncestor import androidx.compose.ui.test.hasTextExactly import androidx.compose.ui.test.isDialog import androidx.compose.ui.test.isDisplayed -import androidx.compose.ui.test.isPopup import androidx.compose.ui.test.isToggleable import androidx.compose.ui.test.onAllNodesWithText import androidx.compose.ui.test.onNodeWithContentDescription @@ -21,16 +20,15 @@ import androidx.compose.ui.test.performScrollTo import androidx.compose.ui.test.performTextInput import androidx.core.net.toUri import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow +import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.data.platform.repository.model.VaultTimeout import com.x8bit.bitwarden.data.platform.repository.model.VaultTimeoutAction import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest -import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.ui.platform.components.toggle.UnlockWithPinState import com.x8bit.bitwarden.ui.platform.manager.biometrics.BiometricSupportStatus import com.x8bit.bitwarden.ui.platform.manager.biometrics.BiometricsManager import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager import com.x8bit.bitwarden.ui.util.assertNoDialogExists -import com.x8bit.bitwarden.ui.util.assertNoPopupExists import io.mockk.coEvery import io.mockk.every import io.mockk.just @@ -1450,7 +1448,7 @@ class AccountSecurityScreenTest : BaseComposeTest() { @Test fun `loading dialog should be displayed according to state`() { val loadingMessage = "Loading" - composeTestRule.assertNoPopupExists() + composeTestRule.assertNoDialogExists() composeTestRule.onNodeWithText(loadingMessage).assertDoesNotExist() mutableStateFlow.update { @@ -1460,7 +1458,7 @@ class AccountSecurityScreenTest : BaseComposeTest() { composeTestRule .onNodeWithText("Loading") .assertIsDisplayed() - .assert(hasAnyAncestor(isPopup())) + .assert(hasAnyAncestor(isDialog())) } @Test diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/deleteaccount/DeleteAccountScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/deleteaccount/DeleteAccountScreenTest.kt index 07eaf8b02b..0d1d4eda1a 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/deleteaccount/DeleteAccountScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/deleteaccount/DeleteAccountScreenTest.kt @@ -6,15 +6,14 @@ import androidx.compose.ui.test.filterToOne import androidx.compose.ui.test.hasAnyAncestor import androidx.compose.ui.test.hasClickAction import androidx.compose.ui.test.isDialog -import androidx.compose.ui.test.isPopup import androidx.compose.ui.test.onAllNodesWithText import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performScrollTo import androidx.compose.ui.test.performTextInput import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow -import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest import com.bitwarden.ui.util.asText +import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest import io.mockk.every import io.mockk.mockk import io.mockk.verify @@ -72,7 +71,7 @@ class DeleteAccountScreenTest : BaseComposeTest() { fun `loading dialog presence should update with dialog state`() { composeTestRule .onAllNodesWithText("Loading") - .filterToOne(hasAnyAncestor(isPopup())) + .filterToOne(hasAnyAncestor(isDialog())) .assertDoesNotExist() mutableStateFlow.update { @@ -81,7 +80,7 @@ class DeleteAccountScreenTest : BaseComposeTest() { composeTestRule .onAllNodesWithText("Loading") - .filterToOne(hasAnyAncestor(isPopup())) + .filterToOne(hasAnyAncestor(isDialog())) .assertExists() } @@ -223,9 +222,11 @@ class DeleteAccountScreenTest : BaseComposeTest() { .assertDoesNotExist() composeTestRule - .onNodeWithText("This action cannot be completed because your account " + - "is owned by an organization. " + - "Contact your organization administrator for additional details.") + .onNodeWithText( + text = "This action cannot be completed because your account " + + "is owned by an organization. " + + "Contact your organization administrator for additional details.", + ) .assertDoesNotExist() composeTestRule @@ -242,9 +243,11 @@ class DeleteAccountScreenTest : BaseComposeTest() { .assertExists() composeTestRule - .onNodeWithText("This action cannot be completed because your account " + - "is owned by an organization. " + - "Contact your organization administrator for additional details.") + .onNodeWithText( + text = "This action cannot be completed because your account " + + "is owned by an organization. " + + "Contact your organization administrator for additional details.", + ) .assertExists() composeTestRule diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/deleteaccountconfirmation/DeleteAccountConfirmationScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/deleteaccountconfirmation/DeleteAccountConfirmationScreenTest.kt index cfe2ea58bf..63a63cd106 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/deleteaccountconfirmation/DeleteAccountConfirmationScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/deleteaccountconfirmation/DeleteAccountConfirmationScreenTest.kt @@ -3,15 +3,14 @@ package com.x8bit.bitwarden.ui.platform.feature.settings.accountsecurity.deletea import androidx.compose.ui.test.filterToOne import androidx.compose.ui.test.hasAnyAncestor import androidx.compose.ui.test.isDialog -import androidx.compose.ui.test.isPopup import androidx.compose.ui.test.onAllNodesWithText import androidx.compose.ui.test.onFirst import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performTextInput import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow -import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest import com.bitwarden.ui.util.asText +import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest import io.mockk.every import io.mockk.mockk import io.mockk.verify @@ -51,7 +50,7 @@ class DeleteAccountConfirmationScreenTest : BaseComposeTest() { fun `loading dialog presence should update with dialog state`() { composeTestRule .onAllNodesWithText("Loading") - .filterToOne(hasAnyAncestor(isPopup())) + .filterToOne(hasAnyAncestor(isDialog())) .assertDoesNotExist() mutableStateFlow.update { @@ -62,7 +61,7 @@ class DeleteAccountConfirmationScreenTest : BaseComposeTest() { composeTestRule .onAllNodesWithText("Loading") - .filterToOne(hasAnyAncestor(isPopup())) + .filterToOne(hasAnyAncestor(isDialog())) .assertExists() } @@ -99,7 +98,7 @@ class DeleteAccountConfirmationScreenTest : BaseComposeTest() { mutableStateFlow.update { DEFAULT_STATE.copy( dialog = - DeleteAccountConfirmationState.DeleteAccountConfirmationDialog.DeleteSuccess(), + DeleteAccountConfirmationState.DeleteAccountConfirmationDialog.DeleteSuccess(), ) } @@ -114,7 +113,7 @@ class DeleteAccountConfirmationScreenTest : BaseComposeTest() { mutableStateFlow.update { DEFAULT_STATE.copy( dialog = - DeleteAccountConfirmationState.DeleteAccountConfirmationDialog.DeleteSuccess(), + DeleteAccountConfirmationState.DeleteAccountConfirmationDialog.DeleteSuccess(), ) } diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/ExportVaultScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/ExportVaultScreenTest.kt index 5926914c9c..048741535d 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/ExportVaultScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/exportvault/ExportVaultScreenTest.kt @@ -7,7 +7,6 @@ import androidx.compose.ui.test.filterToOne import androidx.compose.ui.test.hasAnyAncestor import androidx.compose.ui.test.isDialog import androidx.compose.ui.test.isDisplayed -import androidx.compose.ui.test.isPopup import androidx.compose.ui.test.onAllNodesWithText import androidx.compose.ui.test.onFirst import androidx.compose.ui.test.onNodeWithContentDescription @@ -16,13 +15,12 @@ import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performScrollTo import androidx.compose.ui.test.performTextInput import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow +import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.ui.auth.feature.completeregistration.PasswordStrengthState import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest -import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.ui.platform.feature.settings.exportvault.model.ExportVaultFormat import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager import com.x8bit.bitwarden.ui.util.assertNoDialogExists -import com.x8bit.bitwarden.ui.util.assertNoPopupExists import io.mockk.every import io.mockk.mockk import io.mockk.verify @@ -90,11 +88,11 @@ class ExportVaultScreenTest : BaseComposeTest() { } composeTestRule .onNodeWithText(loadingMessage) - .assert(hasAnyAncestor(isPopup())) + .assert(hasAnyAncestor(isDialog())) .assertIsDisplayed() mutableStateFlow.update { it.copy(dialogState = null) } - composeTestRule.assertNoPopupExists() + composeTestRule.assertNoDialogExists() } @Test diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditScreenTest.kt index 62d5a9f228..7f5719cdd3 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditScreenTest.kt @@ -12,10 +12,10 @@ import androidx.compose.ui.test.onNodeWithContentDescription import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow -import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest import com.bitwarden.ui.util.asText +import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest import com.x8bit.bitwarden.ui.platform.feature.settings.folders.model.FolderAddEditType -import com.x8bit.bitwarden.ui.util.assertNoPopupExists +import com.x8bit.bitwarden.ui.util.assertNoDialogExists import io.mockk.every import io.mockk.mockk import io.mockk.verify @@ -204,7 +204,7 @@ class FolderAddEditScreenTest : BaseComposeTest() { @Test fun `loading dialog should display according to state`() { - composeTestRule.assertNoPopupExists() + composeTestRule.assertNoDialogExists() mutableStateFlow.update { it.copy( @@ -216,10 +216,10 @@ class FolderAddEditScreenTest : BaseComposeTest() { composeTestRule .onNodeWithText("Loading") - .assert(hasAnyAncestor(isPopup())) + .assert(hasAnyAncestor(isDialog())) .assertIsDisplayed() - composeTestRule.onNode(isPopup()).assertIsDisplayed() + composeTestRule.onNode(isDialog()).assertIsDisplayed() } @Test diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/other/OtherScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/other/OtherScreenTest.kt index 0e42083d4f..aaa5e67039 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/other/OtherScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/other/OtherScreenTest.kt @@ -5,7 +5,6 @@ import androidx.compose.ui.test.assertIsDisplayed import androidx.compose.ui.test.filterToOne import androidx.compose.ui.test.hasAnyAncestor import androidx.compose.ui.test.isDialog -import androidx.compose.ui.test.isPopup import androidx.compose.ui.test.onAllNodesWithText import androidx.compose.ui.test.onNodeWithContentDescription import androidx.compose.ui.test.onNodeWithText @@ -16,7 +15,6 @@ import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.data.platform.repository.model.ClearClipboardFrequency import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest import com.x8bit.bitwarden.ui.util.assertNoDialogExists -import com.x8bit.bitwarden.ui.util.assertNoPopupExists import io.mockk.every import io.mockk.mockk import io.mockk.verify @@ -153,7 +151,7 @@ class OtherScreenTest : BaseComposeTest() { @Test fun `loading dialog should be displayed according to state`() { val loadingMessage = "syncing" - composeTestRule.assertNoPopupExists() + composeTestRule.assertNoDialogExists() composeTestRule.onNodeWithText(loadingMessage).assertDoesNotExist() mutableStateFlow.update { @@ -163,7 +161,7 @@ class OtherScreenTest : BaseComposeTest() { composeTestRule .onNodeWithText(loadingMessage) .assertIsDisplayed() - .assert(hasAnyAncestor(isPopup())) + .assert(hasAnyAncestor(isDialog())) } @Test diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/SendScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/SendScreenTest.kt index 2a142da313..f8a2bc22d6 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/SendScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/SendScreenTest.kt @@ -30,7 +30,6 @@ import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager import com.x8bit.bitwarden.ui.tools.feature.send.model.SendItemType import com.x8bit.bitwarden.ui.tools.feature.send.viewsend.ViewSendRoute import com.x8bit.bitwarden.ui.util.assertNoDialogExists -import com.x8bit.bitwarden.ui.util.assertNoPopupExists import com.x8bit.bitwarden.ui.util.isProgressBar import io.mockk.every import io.mockk.just @@ -767,7 +766,7 @@ class SendScreenTest : BaseComposeTest() { @Test fun `loading dialog should be displayed according to state`() { val loadingMessage = "syncing" - composeTestRule.assertNoPopupExists() + composeTestRule.assertNoDialogExists() composeTestRule.onNodeWithText(loadingMessage).assertDoesNotExist() mutableStateFlow.update { @@ -777,7 +776,7 @@ class SendScreenTest : BaseComposeTest() { composeTestRule .onNodeWithText(loadingMessage) .assertIsDisplayed() - .assert(hasAnyAncestor(isPopup())) + .assert(hasAnyAncestor(isDialog())) } } diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendScreenTest.kt index 574f7bea30..29fe87a281 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendScreenTest.kt @@ -24,13 +24,13 @@ import androidx.compose.ui.test.performScrollTo import androidx.compose.ui.test.performSemanticsAction import androidx.compose.ui.test.performTextInput import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow -import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest import com.bitwarden.ui.util.asText +import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest import com.x8bit.bitwarden.ui.platform.manager.exit.ExitManager import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager import com.x8bit.bitwarden.ui.platform.manager.permissions.FakePermissionManager import com.x8bit.bitwarden.ui.tools.feature.send.addsend.model.AddSendType -import com.x8bit.bitwarden.ui.util.assertNoPopupExists +import com.x8bit.bitwarden.ui.util.assertNoDialogExists import com.x8bit.bitwarden.ui.util.isEditableText import com.x8bit.bitwarden.ui.util.isProgressBar import io.mockk.every @@ -842,7 +842,7 @@ class AddSendScreenTest : BaseComposeTest() { @Test fun `loading dialog should be displayed according to state`() { val loadingMessage = "syncing" - composeTestRule.assertNoPopupExists() + composeTestRule.assertNoDialogExists() composeTestRule.onNodeWithText(loadingMessage).assertDoesNotExist() mutableStateFlow.update { @@ -852,7 +852,7 @@ class AddSendScreenTest : BaseComposeTest() { composeTestRule .onNodeWithText(loadingMessage) .assertIsDisplayed() - .assert(hasAnyAncestor(isPopup())) + .assert(hasAnyAncestor(isDialog())) } @Test diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/viewsend/ViewSendScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/viewsend/ViewSendScreenTest.kt index b1c046068a..b94aa475ad 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/viewsend/ViewSendScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/viewsend/ViewSendScreenTest.kt @@ -7,7 +7,6 @@ import androidx.compose.ui.test.assertIsDisplayed import androidx.compose.ui.test.assertIsNotDisplayed import androidx.compose.ui.test.hasAnyAncestor import androidx.compose.ui.test.isDialog -import androidx.compose.ui.test.isPopup import androidx.compose.ui.test.onNodeWithContentDescription import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick @@ -307,7 +306,7 @@ class ViewSendScreenTest : BaseComposeTest() { } composeTestRule .onNodeWithText(text = loadingMessage) - .assert(hasAnyAncestor(isPopup())) + .assert(hasAnyAncestor(isDialog())) .assertIsDisplayed() mutableStateFlow.update { it.copy(dialogState = null) } diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsScreenTest.kt index b9128d2bde..6fae0d2af5 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsScreenTest.kt @@ -7,17 +7,16 @@ import androidx.compose.ui.test.filterToOne import androidx.compose.ui.test.hasAnyAncestor import androidx.compose.ui.test.hasClickAction import androidx.compose.ui.test.isDialog -import androidx.compose.ui.test.isPopup import androidx.compose.ui.test.onAllNodesWithText import androidx.compose.ui.test.onNodeWithContentDescription import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow +import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockCipherView import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest -import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager -import com.x8bit.bitwarden.ui.util.assertNoPopupExists +import com.x8bit.bitwarden.ui.util.assertNoDialogExists import com.x8bit.bitwarden.ui.util.isProgressBar import com.x8bit.bitwarden.ui.util.onNodeWithContentDescriptionAfterScroll import com.x8bit.bitwarden.ui.util.onNodeWithTextAfterScroll @@ -231,7 +230,7 @@ class AttachmentsScreenTest : BaseComposeTest() { @Test fun `loading dialog should be displayed according to state`() { val loadingMessage = "deleting" - composeTestRule.assertNoPopupExists() + composeTestRule.assertNoDialogExists() composeTestRule.onNodeWithText(loadingMessage).assertDoesNotExist() mutableStateFlow.update { @@ -241,7 +240,7 @@ class AttachmentsScreenTest : BaseComposeTest() { composeTestRule .onNodeWithText(loadingMessage) .assertIsDisplayed() - .assert(hasAnyAncestor(isPopup())) + .assert(hasAnyAncestor(isDialog())) } } diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreenTest.kt index 5e4f805823..bc487b1cf0 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreenTest.kt @@ -8,7 +8,6 @@ import androidx.compose.ui.test.hasAnyAncestor import androidx.compose.ui.test.hasAnySibling import androidx.compose.ui.test.hasText import androidx.compose.ui.test.isDialog -import androidx.compose.ui.test.isPopup import androidx.compose.ui.test.onAllNodesWithContentDescription import androidx.compose.ui.test.onAllNodesWithText import androidx.compose.ui.test.onNodeWithContentDescription @@ -18,14 +17,13 @@ import androidx.compose.ui.test.performScrollTo import androidx.compose.ui.test.performSemanticsAction import androidx.core.net.toUri import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow +import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.util.advanceTimeByAndRunCurrent import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest -import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager import com.x8bit.bitwarden.ui.platform.manager.snackbar.SnackbarRelay import com.x8bit.bitwarden.ui.util.assertNoDialogExists -import com.x8bit.bitwarden.ui.util.assertNoPopupExists import io.mockk.every import io.mockk.just import io.mockk.mockk @@ -352,14 +350,14 @@ class ImportLoginsScreenTest : BaseComposeTest() { @Test fun `Loading content is displayed when dialog state is syncing`() { - composeTestRule.assertNoPopupExists() + composeTestRule.assertNoDialogExists() mutableImportLoginsStateFlow.update { it.copy(dialogState = ImportLoginsState.DialogState.Syncing) } composeTestRule .onNodeWithText(text = "Syncing logins...") .assertIsDisplayed() - .assert(hasAnyAncestor(isPopup())) + .assert(hasAnyAncestor(isDialog())) } @Test diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreenTest.kt index 5fc4d22775..55d67a2591 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreenTest.kt @@ -35,7 +35,6 @@ import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest import com.x8bit.bitwarden.ui.platform.components.model.IconData import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager import com.x8bit.bitwarden.ui.util.assertNoDialogExists -import com.x8bit.bitwarden.ui.util.assertNoPopupExists import com.x8bit.bitwarden.ui.util.assertScrollableNodeDoesNotExist import com.x8bit.bitwarden.ui.util.isProgressBar import com.x8bit.bitwarden.ui.util.onFirstNodeWithTextAfterScroll @@ -210,7 +209,7 @@ class VaultItemScreenTest : BaseComposeTest() { @Test fun `loading dialog should be displayed according to state`() { - composeTestRule.assertNoPopupExists() + composeTestRule.assertNoDialogExists() composeTestRule.onNodeWithText("Loading").assertDoesNotExist() mutableStateFlow.update { @@ -220,7 +219,7 @@ class VaultItemScreenTest : BaseComposeTest() { composeTestRule .onNodeWithText("Loading") .assertIsDisplayed() - .assert(hasAnyAncestor(isPopup())) + .assert(hasAnyAncestor(isDialog())) } @Test diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt index 73cef9540a..214c4d15df 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt @@ -43,7 +43,6 @@ import com.x8bit.bitwarden.ui.util.assertLockOrLogoutDialogIsDisplayed import com.x8bit.bitwarden.ui.util.assertLogoutConfirmationDialogIsDisplayed import com.x8bit.bitwarden.ui.util.assertMasterPasswordDialogDisplayed import com.x8bit.bitwarden.ui.util.assertNoDialogExists -import com.x8bit.bitwarden.ui.util.assertNoPopupExists import com.x8bit.bitwarden.ui.util.assertRemovalConfirmationDialogIsDisplayed import com.x8bit.bitwarden.ui.util.assertSwitcherIsDisplayed import com.x8bit.bitwarden.ui.util.assertSwitcherIsNotDisplayed @@ -1613,7 +1612,7 @@ class VaultItemListingScreenTest : BaseComposeTest() { @Test fun `loading dialog should be displayed according to state`() { val loadingMessage = "syncing" - composeTestRule.assertNoPopupExists() + composeTestRule.assertNoDialogExists() composeTestRule.onNodeWithText(loadingMessage).assertDoesNotExist() mutableStateFlow.update { @@ -1627,7 +1626,7 @@ class VaultItemListingScreenTest : BaseComposeTest() { composeTestRule .onNodeWithText(loadingMessage) .assertIsDisplayed() - .assert(hasAnyAncestor(isPopup())) + .assert(hasAnyAncestor(isDialog())) } @Suppress("MaxLineLength") diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationScreenTest.kt index 89d727f1f0..f27db77bca 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationScreenTest.kt @@ -7,7 +7,6 @@ import androidx.compose.ui.test.assertIsOn import androidx.compose.ui.test.filterToOne import androidx.compose.ui.test.hasAnyAncestor import androidx.compose.ui.test.isDialog -import androidx.compose.ui.test.isPopup import androidx.compose.ui.test.onAllNodesWithText import androidx.compose.ui.test.onLast import androidx.compose.ui.test.onNodeWithContentDescription @@ -15,8 +14,8 @@ import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performScrollTo import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow -import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest import com.bitwarden.ui.util.asText +import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest import com.x8bit.bitwarden.ui.util.onNodeWithContentDescriptionAfterScroll import com.x8bit.bitwarden.ui.vault.feature.movetoorganization.util.createMockOrganizationList import com.x8bit.bitwarden.ui.vault.model.VaultCollection @@ -264,8 +263,7 @@ class VaultMoveToOrganizationScreenTest : BaseComposeTest() { organizations = createMockOrganizationList() .map { organization -> organization.copy( - collections = - if (organization.id == "mockOrganizationId-1") { + collections = if (organization.id == "mockOrganizationId-1") { organization .collections .map { collection -> @@ -292,7 +290,7 @@ class VaultMoveToOrganizationScreenTest : BaseComposeTest() { fun `loading dialog should display according to state`() { composeTestRule .onAllNodesWithText("loading") - .filterToOne(hasAnyAncestor(isPopup())) + .filterToOne(hasAnyAncestor(isDialog())) .assertIsNotDisplayed() mutableStateFlow.update { @@ -303,7 +301,7 @@ class VaultMoveToOrganizationScreenTest : BaseComposeTest() { composeTestRule .onAllNodesWithText("loading") - .filterToOne(hasAnyAncestor(isPopup())) + .filterToOne(hasAnyAncestor(isDialog())) .assertIsDisplayed() } diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreenTest.kt index b3591739a4..2ea41a799b 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultScreenTest.kt @@ -35,7 +35,6 @@ import com.x8bit.bitwarden.ui.platform.manager.snackbar.SnackbarRelay import com.x8bit.bitwarden.ui.util.assertLockOrLogoutDialogIsDisplayed import com.x8bit.bitwarden.ui.util.assertLogoutConfirmationDialogIsDisplayed import com.x8bit.bitwarden.ui.util.assertNoDialogExists -import com.x8bit.bitwarden.ui.util.assertNoPopupExists import com.x8bit.bitwarden.ui.util.assertRemovalConfirmationDialogIsDisplayed import com.x8bit.bitwarden.ui.util.assertScrollableNodeDoesNotExist import com.x8bit.bitwarden.ui.util.assertSwitcherIsDisplayed @@ -581,7 +580,7 @@ class VaultScreenTest : BaseComposeTest() { @Test fun `syncing dialog should be displayed according to state`() { - composeTestRule.assertNoPopupExists() + composeTestRule.assertNoDialogExists() composeTestRule.onNodeWithText("Loading").assertDoesNotExist() mutableStateFlow.update { @@ -591,7 +590,7 @@ class VaultScreenTest : BaseComposeTest() { composeTestRule .onNodeWithText("Syncing...") .assertIsDisplayed() - .assert(hasAnyAncestor(isPopup())) + .assert(hasAnyAncestor(isDialog())) } @Test diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeScreenTest.kt index 03e1a6bfed..3a3e2ee3f5 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeScreenTest.kt @@ -5,6 +5,7 @@ import androidx.compose.ui.test.assertIsDisplayed import androidx.compose.ui.test.assertIsNotDisplayed import androidx.compose.ui.test.filterToOne import androidx.compose.ui.test.hasAnyAncestor +import androidx.compose.ui.test.isDialog import androidx.compose.ui.test.isDisplayed import androidx.compose.ui.test.isPopup import androidx.compose.ui.test.onAllNodesWithText @@ -18,7 +19,7 @@ import com.bitwarden.data.repository.util.baseIconUrl import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.data.platform.manager.util.AppResumeStateManager import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest -import com.x8bit.bitwarden.ui.util.assertNoPopupExists +import com.x8bit.bitwarden.ui.util.assertNoDialogExists import com.x8bit.bitwarden.ui.vault.feature.item.VaultItemArgs import com.x8bit.bitwarden.ui.vault.feature.vault.model.VaultFilterType import com.x8bit.bitwarden.ui.vault.model.VaultItemCipherType @@ -357,7 +358,7 @@ class VerificationCodeScreenTest : BaseComposeTest() { @Test fun `loading dialog should be displayed according to state`() { val loadingMessage = "syncing" - composeTestRule.assertNoPopupExists() + composeTestRule.assertNoDialogExists() composeTestRule.onNodeWithText(loadingMessage).assertDoesNotExist() mutableStateFlow.update { @@ -371,7 +372,7 @@ class VerificationCodeScreenTest : BaseComposeTest() { composeTestRule .onNodeWithText(loadingMessage) .assertIsDisplayed() - .assert(hasAnyAncestor(isPopup())) + .assert(hasAnyAncestor(isDialog())) } }