Merge branch 'e2e-test-to-test-pq-connection-droid-696'

2 files changed, 19 insertions, 0 deletions

diff --git a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/Story.kt b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/Story.kt
index 7f919ebaf2..c38fcd776b 100644
--- a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/Story.kt
+++ b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/Story.kt
@@ -25,6 +25,16 @@ fun ConnectPage.disablePostQuantumStory() {
     uiDevice.pressBackTwice()
 }
 
+fun ConnectPage.enablePostQuantumStory() {
+    clickSettings()
+    on<SettingsPage> { clickVpnSettings() }
+    on<VpnSettingsPage> {
+        scrollUntilPostQuantumOnCell()
+        clickPostQuantumOnCell()
+    }
+    uiDevice.pressBackTwice()
+}
+
 fun ConnectPage.enableShadowsocksStory() {
     clickSettings()
     on<SettingsPage> { clickVpnSettings() }
diff --git a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/VpnSettingsPage.kt b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/VpnSettingsPage.kt
index fbd05f483b..8232369cdb 100644
--- a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/VpnSettingsPage.kt
+++ b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/VpnSettingsPage.kt
@@ -4,6 +4,7 @@ import androidx.test.uiautomator.By
 import androidx.test.uiautomator.Direction
 import androidx.test.uiautomator.Until
 import net.mullvad.mullvadvpn.lib.ui.tag.LAZY_LIST_QUANTUM_ITEM_OFF_TEST_TAG
+import net.mullvad.mullvadvpn.lib.ui.tag.LAZY_LIST_QUANTUM_ITEM_ON_TEST_TAG
 import net.mullvad.mullvadvpn.lib.ui.tag.LAZY_LIST_VPN_SETTINGS_TEST_TAG
 import net.mullvad.mullvadvpn.lib.ui.tag.LAZY_LIST_WIREGUARD_CUSTOM_PORT_TEXT_TEST_TAG
 import net.mullvad.mullvadvpn.lib.ui.tag.SWITCH_TEST_TAG
@@ -42,6 +43,10 @@ class VpnSettingsPage internal constructor() : Page() {
         scrollUntilCell(LAZY_LIST_QUANTUM_ITEM_OFF_TEST_TAG)
     }
 
+    fun scrollUntilPostQuantumOnCell() {
+        scrollUntilCell(LAZY_LIST_QUANTUM_ITEM_ON_TEST_TAG)
+    }
+
     fun scrollUntilWireGuardObfuscationShadowsocksCell() {
         scrollUntilCell(WIREGUARD_OBFUSCATION_SHADOWSOCKS_CELL_TEST_TAG)
     }
@@ -58,6 +63,10 @@ class VpnSettingsPage internal constructor() : Page() {
         uiDevice.clickObjectAwaitIsChecked(By.res(LAZY_LIST_QUANTUM_ITEM_OFF_TEST_TAG))
     }
 
+    fun clickPostQuantumOnCell() {
+        uiDevice.clickObjectAwaitIsChecked(By.res(LAZY_LIST_QUANTUM_ITEM_ON_TEST_TAG))
+    }
+
     fun clickWireGuardObfuscationShadowsocksCell() {
         uiDevice.clickObjectAwaitIsChecked(By.res(WIREGUARD_OBFUSCATION_SHADOWSOCKS_CELL_TEST_TAG))
     }