diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-07-06 15:14:27 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-07-11 22:54:48 +0200 |
| commit | a0f678c8b564efecad2338555cc9af66b72fac7e (patch) | |
| tree | 3489ca42eee81dd285f7b21e66491a88dd1a4459 /android/app/src/androidTest | |
| parent | 2d4f28072a976c513ac8a7e2f5657bdb347e6817 (diff) | |
| download | mullvadvpn-a0f678c8b564efecad2338555cc9af66b72fac7e.tar.xz mullvadvpn-a0f678c8b564efecad2338555cc9af66b72fac7e.zip | |
Remove subtitle from base cell
Diffstat (limited to 'android/app/src/androidTest')
| -rw-r--r-- | android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/Finders.kt | 8 | ||||
| -rw-r--r-- | android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt | 10 |
2 files changed, 7 insertions, 11 deletions
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/Finders.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/Finders.kt index 26ba0d5f4b..384f365e5e 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/Finders.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/Finders.kt @@ -2,18 +2,14 @@ package net.mullvad.mullvadvpn import androidx.compose.ui.test.SemanticsNodeInteraction import androidx.compose.ui.test.SemanticsNodeInteractionsProvider -import androidx.compose.ui.test.hasAnyChild import androidx.compose.ui.test.hasTestTag import androidx.compose.ui.test.hasText -fun SemanticsNodeInteractionsProvider.onNodeWithTagAndChildrenText( +fun SemanticsNodeInteractionsProvider.onNodeWithTagAndText( testTag: String, text: String, substring: Boolean = false, ignoreCase: Boolean = false, useUnmergedTree: Boolean = false ): SemanticsNodeInteraction = - onNode( - hasTestTag(testTag).and(hasAnyChild(hasText(text, substring, ignoreCase))), - useUnmergedTree - ) + onNode(hasTestTag(testTag).and(hasText(text, substring, ignoreCase)), useUnmergedTree) diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt index fd3be6092f..1b97a47914 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt @@ -26,7 +26,7 @@ import net.mullvad.mullvadvpn.model.Constraint import net.mullvad.mullvadvpn.model.Port import net.mullvad.mullvadvpn.model.PortRange import net.mullvad.mullvadvpn.model.QuantumResistantState -import net.mullvad.mullvadvpn.onNodeWithTagAndChildrenText +import net.mullvad.mullvadvpn.onNodeWithTagAndText import net.mullvad.mullvadvpn.viewmodel.CustomDnsItem import net.mullvad.mullvadvpn.viewmodel.StagedDns import org.junit.Before @@ -565,7 +565,7 @@ class VpnSettingsScreenTest { // Assert composeTestRule - .onNodeWithTagAndChildrenText(testTag = LAZY_LIST_QUANTUM_ITEM_ON_TEST_TAG, text = "On") + .onNodeWithTagAndText(testTag = LAZY_LIST_QUANTUM_ITEM_ON_TEST_TAG, text = "On") .assertExists() } @@ -590,7 +590,7 @@ class VpnSettingsScreenTest { // Assert composeTestRule - .onNodeWithTagAndChildrenText(testTag = LAZY_LIST_QUANTUM_ITEM_ON_TEST_TAG, text = "On") + .onNodeWithTagAndText(testTag = LAZY_LIST_QUANTUM_ITEM_ON_TEST_TAG, text = "On") .performClick() verify(exactly = 1) { mockSelectQuantumResistantSettingListener.invoke(QuantumResistantState.On) @@ -631,7 +631,7 @@ class VpnSettingsScreenTest { // Assert composeTestRule - .onNodeWithTagAndChildrenText( + .onNodeWithTagAndText( testTag = String.format(LAZY_LIST_WIREGUARD_PORT_ITEM_X_TEST_TAG, 51820), text = "51820" ) @@ -661,7 +661,7 @@ class VpnSettingsScreenTest { // Assert composeTestRule - .onNodeWithTagAndChildrenText( + .onNodeWithTagAndText( testTag = String.format(LAZY_LIST_WIREGUARD_PORT_ITEM_X_TEST_TAG, 51820), text = "51820" ) |