Merge branch 'leak-e2e-tests-fails-to-select-country-droid-2085'

1 files changed, 6 insertions, 1 deletions

diff --git a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/SelectLocationPage.kt b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/SelectLocationPage.kt
index 86e3c89a08..404a81f9a8 100644
--- a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/SelectLocationPage.kt
+++ b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/SelectLocationPage.kt
@@ -2,6 +2,7 @@ package net.mullvad.mullvadvpn.test.common.page
 
 import androidx.test.uiautomator.By
 import net.mullvad.mullvadvpn.lib.ui.tag.EXPAND_BUTTON_TEST_TAG
+import net.mullvad.mullvadvpn.lib.ui.tag.GEOLOCATION_NAME_TAG
 import net.mullvad.mullvadvpn.lib.ui.tag.SELECT_LOCATION_SCREEN_TEST_TAG
 import net.mullvad.mullvadvpn.test.common.extension.findObjectWithTimeout
 
@@ -11,7 +12,11 @@ class SelectLocationPage internal constructor() : Page() {
     }
 
     fun clickLocationExpandButton(locationName: String) {
-        val locationCell = uiDevice.findObjectWithTimeout(By.text(locationName)).parent.parent
+        val locationCell =
+            uiDevice
+                .findObjectWithTimeout(By.textContains(locationName).res(GEOLOCATION_NAME_TAG))
+                .parent
+                .parent
         val expandButton = locationCell.findObjectWithTimeout(By.res(EXPAND_BUTTON_TEST_TAG))
         expandButton.click()
     }