diff options
author | Álvaro Brey <alvaro.brey@nextcloud.com> | 2022-08-03 18:36:48 +0300 |
---|---|---|
committer | Álvaro Brey <alvaro.brey@nextcloud.com> | 2022-08-03 18:36:48 +0300 |
commit | 0bdf0fdd53b019a2be5e5a1b949e6f3cd3869e77 (patch) | |
tree | 75ef2834a7208936c1423946c383ffbbd2b1e035 | |
parent | ac948df165a52b4efec418e5ee851de62cf4c421 (diff) |
LoginIT: fix for new accessibility changes in server masterfix/loginit-master
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
-rw-r--r-- | app/src/androidTest/java/com/owncloud/android/ui/LoginIT.kt | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/app/src/androidTest/java/com/owncloud/android/ui/LoginIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/LoginIT.kt index 2f62bbf336..ddb5ac29b2 100644 --- a/app/src/androidTest/java/com/owncloud/android/ui/LoginIT.kt +++ b/app/src/androidTest/java/com/owncloud/android/ui/LoginIT.kt @@ -58,7 +58,7 @@ class LoginIT : AbstractIT() { @Test @Throws(InterruptedException::class) - @Suppress("MagicNumber") + @Suppress("MagicNumber", "SwallowedException") fun login() { val arguments = InstrumentationRegistry.getArguments() val baseUrl = arguments.getString("TEST_SERVER_URL")!! @@ -71,9 +71,17 @@ class LoginIT : AbstractIT() { Web.onWebView().forceJavascriptEnabled() // click on login - Web.onWebView() - .withElement(DriverAtoms.findElement(Locator.XPATH, "//p[@id='redirect-link']/a")) - .perform(DriverAtoms.webClick()) + try { + // NC 25+ + Web.onWebView() + .withElement(DriverAtoms.findElement(Locator.XPATH, "//form[@id='login-form']/input[@type='submit']")) + .perform(DriverAtoms.webClick()) + } catch (e: RuntimeException) { + // NC < 25 + Web.onWebView() + .withElement(DriverAtoms.findElement(Locator.XPATH, "//p[@id='redirect-link']/a")) + .perform(DriverAtoms.webClick()) + } // username Web.onWebView() @@ -86,9 +94,18 @@ class LoginIT : AbstractIT() { .perform(DriverAtoms.webKeys(password)) // click login - Web.onWebView() - .withElement(DriverAtoms.findElement(Locator.XPATH, "//input[@type='submit']")) - .perform(DriverAtoms.webClick()) + try { + // NC 25+ + Web.onWebView() + .withElement(DriverAtoms.findElement(Locator.XPATH, "//button[@type='submit']")) + .perform(DriverAtoms.webClick()) + } catch (e: RuntimeException) { + // NC < 25 + Web.onWebView() + .withElement(DriverAtoms.findElement(Locator.XPATH, "//input[@type='submit']")) + .perform(DriverAtoms.webClick()) + } + Thread.sleep(2000) // grant access |