Merge branch 'fix-override-flaky-tests'

Author: Pururun

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt

@@ -128,6 +128,9 @@ import net.mullvad.mullvadvpn.lib.ui.tag.LAZY_LIST_WIREGUARD_CUSTOM_PORT_TEXT_TE
 import net.mullvad.mullvadvpn.lib.ui.tag.LAZY_LIST_WIREGUARD_OBFUSCATION_TITLE_TEST_TAG
 import net.mullvad.mullvadvpn.lib.ui.tag.LAZY_LIST_WIREGUARD_PORT_ITEM_X_TEST_TAG
 import net.mullvad.mullvadvpn.lib.ui.tag.SERVER_IP_OVERRIDE_BUTTON_TEST_TAG
+import net.mullvad.mullvadvpn.lib.ui.tag.WIREGUARD_DEVICE_IP_AUTO_CELL_TEST_TAG
+import net.mullvad.mullvadvpn.lib.ui.tag.WIREGUARD_DEVICE_IP_IPV4_CELL_TEST_TAG
+import net.mullvad.mullvadvpn.lib.ui.tag.WIREGUARD_DEVICE_IP_IPV6_CELL_TEST_TAG
 import net.mullvad.mullvadvpn.lib.ui.tag.WIREGUARD_OBFUSCATION_LWO_CELL_TEST_TAG
 import net.mullvad.mullvadvpn.lib.ui.tag.WIREGUARD_OBFUSCATION_OFF_CELL_TEST_TAG
 import net.mullvad.mullvadvpn.lib.ui.tag.WIREGUARD_OBFUSCATION_QUIC_CELL_TEST_TAG
@@ -678,6 +681,12 @@ fun VpnSettingsContent(
                                 },
                             isSelected = it.selected,
                             onClick = { onSelectDeviceIpVersion(it.constraint) },
+                            testTag =
+                                when (it.constraint.getOrNull()) {
+                                    null -> WIREGUARD_DEVICE_IP_AUTO_CELL_TEST_TAG
+                                    IpVersion.IPV4 -> WIREGUARD_DEVICE_IP_IPV4_CELL_TEST_TAG
+                                    IpVersion.IPV6 -> WIREGUARD_DEVICE_IP_IPV6_CELL_TEST_TAG
+                                },
                         )
                     }
 

android/lib/ui/tag/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/tag/TestTagConstants.kt

@@ -39,6 +39,9 @@ const val WIREGUARD_OBFUSCATION_UDP_OVER_TCP_CELL_TEST_TAG =
 const val WIREGUARD_OBFUSCATION_QUIC_CELL_TEST_TAG = "wireguard_obfuscation_quic_cell_test_tag"
 const val WIREGUARD_OBFUSCATION_LWO_CELL_TEST_TAG = "wireguard_obfuscation_lwo_cell_test_tag"
 const val SERVER_IP_OVERRIDE_BUTTON_TEST_TAG = "server_ip_override_button_test_tag"
+const val WIREGUARD_DEVICE_IP_AUTO_CELL_TEST_TAG = "wireguard_device_ip_auto_cell_test_tag"
+const val WIREGUARD_DEVICE_IP_IPV4_CELL_TEST_TAG = "wireguard_device_ip_ipv4_cell_test_tag"
+const val WIREGUARD_DEVICE_IP_IPV6_CELL_TEST_TAG = "wireguard_device_ip_ipv6_cell_test_tag"
 // Account screen
 const val MANAGE_DEVICES_BUTTON_TEST_TAG = "manage_devices_button_test_tag"
 

android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/Story.kt

@@ -78,6 +78,13 @@ fun ConnectPage.enableServerIpOverrideStory(relay: String, overrideIp: String) {
     clickSettings()
     on<SettingsPage> { clickVpnSettings() }
     on<VpnSettingsPage> {
+        // Disable obfuscation
+        scrollUntilWireGuardObfuscationOffCell()
+        clickWireGuardObfuscationOffCell()
+        // Disable IPv6
+        scrollUntilDeviceIpVersionCell()
+        clickDeviceIpIpv4Cell()
+        // Open ServerIPOverrideScreen
         scrollUntilServerIpOverride()
         clickServerIpOverrideButton()
     }

android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/VpnSettingsPage.kt

@@ -12,6 +12,8 @@ import net.mullvad.mullvadvpn.lib.ui.tag.LAZY_LIST_WIREGUARD_CUSTOM_PORT_TEXT_TE
 import net.mullvad.mullvadvpn.lib.ui.tag.LAZY_LIST_WIREGUARD_PORT_ITEM_X_TEST_TAG
 import net.mullvad.mullvadvpn.lib.ui.tag.SERVER_IP_OVERRIDE_BUTTON_TEST_TAG
 import net.mullvad.mullvadvpn.lib.ui.tag.SWITCH_TEST_TAG
+import net.mullvad.mullvadvpn.lib.ui.tag.WIREGUARD_DEVICE_IP_IPV4_CELL_TEST_TAG
+import net.mullvad.mullvadvpn.lib.ui.tag.WIREGUARD_DEVICE_IP_IPV6_CELL_TEST_TAG
 import net.mullvad.mullvadvpn.lib.ui.tag.WIREGUARD_OBFUSCATION_LWO_CELL_TEST_TAG
 import net.mullvad.mullvadvpn.lib.ui.tag.WIREGUARD_OBFUSCATION_OFF_CELL_TEST_TAG
 import net.mullvad.mullvadvpn.lib.ui.tag.WIREGUARD_OBFUSCATION_QUIC_CELL_TEST_TAG
@@ -81,6 +83,10 @@ class VpnSettingsPage internal constructor() : Page() {
         scrollUntilCell(SERVER_IP_OVERRIDE_BUTTON_TEST_TAG)
     }
 
+    fun scrollUntilDeviceIpVersionCell() {
+        scrollUntilCell(WIREGUARD_DEVICE_IP_IPV6_CELL_TEST_TAG)
+    }
+
     fun clickWireguardObfuscationUdpOverTcpCell() {
         uiDevice.clickObjectAwaitIsChecked(By.res(WIREGUARD_OBFUSCATION_UDP_OVER_TCP_CELL_TEST_TAG))
     }
@@ -113,6 +119,10 @@ class VpnSettingsPage internal constructor() : Page() {
         uiDevice.findObjectWithTimeout(By.res(SERVER_IP_OVERRIDE_BUTTON_TEST_TAG)).click()
     }
 
+    fun clickDeviceIpIpv4Cell() {
+        uiDevice.clickObjectAwaitIsChecked(By.res(WIREGUARD_DEVICE_IP_IPV4_CELL_TEST_TAG))
+    }
+
     private fun scrollUntilCell(testTag: String) {
         val scrollView2 = uiDevice.findObjectWithTimeout(By.res(LAZY_LIST_VPN_SETTINGS_TEST_TAG))
         scrollView2.scrollUntil(Direction.DOWN, Until.hasObject(By.res(testTag)))