From d856bd274bc2be898f1cbdb74b92392c8e19897b Mon Sep 17 00:00:00 2001 From: Pavan Koushik Nellore <pavankoushik.nellore@savoirfairelinux.com> Date: Mon, 12 May 2025 10:26:16 -0400 Subject: [PATCH] Revert "tests: fix UI tests" This reverts commit da9f52a428772e5bb1fb9a6a96680f186dbc5519. Reason for revert: Fix the Keyboard padding issue in Android 15 in the activity instead of handling it in tests. Change-Id: I9151d62695f50871b947181896d8a9dd816eee58 --- .../ring/client/settings/AccountSettings.kt | 6 +--- .../cx/ring/client/wizard/AccountCreation.kt | 32 ++++++++----------- 2 files changed, 14 insertions(+), 24 deletions(-) diff --git a/jami-android/app/src/androidTest/java/cx/ring/client/settings/AccountSettings.kt b/jami-android/app/src/androidTest/java/cx/ring/client/settings/AccountSettings.kt index 618228f1f..78c9021f2 100644 --- a/jami-android/app/src/androidTest/java/cx/ring/client/settings/AccountSettings.kt +++ b/jami-android/app/src/androidTest/java/cx/ring/client/settings/AccountSettings.kt @@ -660,11 +660,7 @@ class AccountSettings { onView(withId(R.id.existing_password)).perform(typeText("123456"), closeSoftKeyboard()) onView(withId(R.id.link_button)).perform(click()) - try { - AccountCreation.skipBiometrics() - } catch (e: Exception) { - Log.d(TAG, "Biometrics dialog not shown, skipping...") - } + AccountCreation.skipBiometrics() // Check that we are in the home activity. onView(withId(R.id.search_bar)).check(matches(isDisplayed())) diff --git a/jami-android/app/src/androidTest/java/cx/ring/client/wizard/AccountCreation.kt b/jami-android/app/src/androidTest/java/cx/ring/client/wizard/AccountCreation.kt index 5c9c963f5..f06194c74 100644 --- a/jami-android/app/src/androidTest/java/cx/ring/client/wizard/AccountCreation.kt +++ b/jami-android/app/src/androidTest/java/cx/ring/client/wizard/AccountCreation.kt @@ -114,7 +114,7 @@ class AccountCreation { fun accountCreation_SpecifyPasswordOnly() { onView(withId(R.id.ring_create_btn)).perform(scrollTo(), click()) - performClickWithKeyboardClosed(R.id.skip) + onView(allOf(withId(R.id.skip), isDisplayed())).perform(click()) onView(allOf(withId(R.id.ring_password_switch), isDisplayed())).perform(click()) @@ -162,7 +162,7 @@ class AccountCreation { fun accountCreation_SpecifyProfileName() { onView(withId(R.id.ring_create_btn)).perform(scrollTo(), click()) - performClickWithKeyboardClosed(R.id.skip) + onView(allOf(withId(R.id.skip), isDisplayed())).perform(click()) onView(allOf(withId(R.id.create_account_password), isDisplayed())).perform(click()) @@ -170,11 +170,13 @@ class AccountCreation { .perform(replaceText("Bonjour"), closeSoftKeyboard()) onView(allOf(withId(R.id.next_create_account), isDisplayed())).perform(click()) + // Check that we are in the home activity. waitForView(withId(R.id.search_bar)).perform(waitUntil(isDisplayed())) - Thread.sleep(1000) + // Go to account settings. Click on search bar menu. onView(withId(R.id.menu_overflow)).perform(click()) + // Click on account settings. Don't know why but doesn't work to select by ID. onView(allOf(withText(R.string.menu_item_account_settings), isDisplayed())).perform(click()) @@ -190,7 +192,7 @@ class AccountCreation { fun accountCreation_SpecifyProfilePictureViaCamera() { onView(withId(R.id.ring_create_btn)).perform(scrollTo(), click()) - performClickWithKeyboardClosed(R.id.skip) + onView(allOf(withId(R.id.skip), isDisplayed())).perform(click()) onView(allOf(withId(R.id.create_account_password), isDisplayed())).perform(click()) @@ -231,7 +233,6 @@ class AccountCreation { // Check that we are in the home activity. waitForView(withId(R.id.search_bar)).perform(waitUntil(isDisplayed())) - Thread.sleep(1000) // Go to account settings. Click on search bar menu. onView(withId(R.id.menu_overflow)).perform(click()) @@ -249,7 +250,7 @@ class AccountCreation { fun accountCreation_SpecifyProfilePictureViaGallery() { onView(withId(R.id.ring_create_btn)).perform(scrollTo(), click()) - performClickWithKeyboardClosed(R.id.skip) + onView(allOf(withId(R.id.skip), isDisplayed())).perform(click()) onView(allOf(withId(R.id.create_account_password), isDisplayed())).perform(click()) @@ -278,7 +279,6 @@ class AccountCreation { // Check that we are in the home activity. waitForView(withId(R.id.search_bar)).perform(waitUntil(isDisplayed())) - Thread.sleep(1000) // Go to account settings. Click on search bar menu. onView(withId(R.id.menu_overflow)).perform(click()) @@ -296,7 +296,7 @@ class AccountCreation { fun accountCreation_SpecifyProfilePicture_CanCancel(){ onView(withId(R.id.ring_create_btn)).perform(scrollTo(), click()) - performClickWithKeyboardClosed(R.id.skip) + onView(allOf(withId(R.id.skip), isDisplayed())).perform(click()) onView(allOf(withId(R.id.create_account_password), isDisplayed())).perform(click()) @@ -390,7 +390,7 @@ class AccountCreation { fun passwordSelection_EnableSection() { onView(withId(R.id.ring_create_btn)).perform(scrollTo(), click()) - performClickWithKeyboardClosed(R.id.skip) + onView(allOf(withId(R.id.skip), isDisplayed())).perform(click()) onView(allOf(withId(R.id.ring_password_switch), isDisplayed())).perform(click()) @@ -408,7 +408,7 @@ class AccountCreation { fun passwordSelection_LessThan6Characters_InvalidPassword() { onView(withId(R.id.ring_create_btn)).perform(scrollTo(), click()) - performClickWithKeyboardClosed(R.id.skip) + onView(allOf(withId(R.id.skip), isDisplayed())).perform(click()) onView(allOf(withId(R.id.ring_password_switch), isDisplayed())).perform(click()) @@ -431,7 +431,7 @@ class AccountCreation { fun passwordSelection_WrongRecopy() { onView(withId(R.id.ring_create_btn)).perform(scrollTo(), click()) - performClickWithKeyboardClosed(R.id.skip) + onView(allOf(withId(R.id.skip), isDisplayed())).perform(click()) onView(allOf(withId(R.id.ring_password_switch), isDisplayed())).perform(click()) @@ -456,7 +456,7 @@ class AccountCreation { fun passwordSelection_ValidPassword() { onView(withId(R.id.ring_create_btn)).perform(scrollTo(), click()) - performClickWithKeyboardClosed(R.id.skip) + onView(allOf(withId(R.id.skip), isDisplayed())).perform(click()) onView(allOf(withId(R.id.ring_password_switch), isDisplayed())).perform(click()) @@ -473,7 +473,7 @@ class AccountCreation { private fun createDefaultAccount() { onView(withId(R.id.ring_create_btn)).perform(scrollTo(), click()) - performClickWithKeyboardClosed(R.id.skip) + onView(allOf(withId(R.id.skip), isDisplayed())).perform(click()) onView(allOf(withId(R.id.create_account_password), isDisplayed())).perform(click()) @@ -516,12 +516,6 @@ class AccountCreation { Log.d(TAG, "Account created: $username") } - private fun performClickWithKeyboardClosed(viewId: Int) { - onView(isRoot()).perform(closeSoftKeyboard()) - onView(withId(viewId)).perform(waitUntil(isDisplayed()), click()) - } - - companion object { private val TAG = AccountCreation::class.java.simpleName -- GitLab