jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issue with ignored users. Preference Category and Preference title have the same value.

This commit is contained in:
Benoit Marty 2022-04-28 16:39:59 +02:00
parent f6fa794a18
commit f48be229c8
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vector/src/androidTest/java/im/vector/app/espresso/tools/EspressoPreference.kt
View File

@ -26,18 +26,26 @@ import androidx.test.espresso.action.ViewActions.click
import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItem
import androidx.test.espresso.matcher.PreferenceMatchers.withKey
import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
import androidx.test.espresso.matcher.ViewMatchers.isFocusable
import androidx.test.espresso.matcher.ViewMatchers.withClassName
import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.espresso.matcher.ViewMatchers.withText
import im.vector.app.R
import org.hamcrest.Matchers.`is`
import org.hamcrest.Matchers.allOf
import org.hamcrest.Matchers.instanceOf
import org.hamcrest.Matchers.`is`
fun clickOnPreference(@StringRes textResId: Int) {
onView(withId(R.id.recycler_view))
.perform(actionOnItem<RecyclerView.ViewHolder>(
hasDescendant(withText(textResId)), click()))
.perform(
actionOnItem<RecyclerView.ViewHolder>(
allOf(
hasDescendant(withText(textResId)),
// Avoid to click on the Preference Category
isFocusable()
), click()
)
)
}
fun clickOnSwitchPreference(preferenceKey: String) {

8
vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsSecurityRobot.kt
View File

@ -18,7 +18,6 @@ package im.vector.app.ui.robot.settings
import androidx.test.espresso.Espresso
import im.vector.app.R
import im.vector.app.clickOnAndGoBack
import im.vector.app.espresso.tools.clickOnPreference
class SettingsSecurityRobot {
@ -38,10 +37,7 @@ class SettingsSecurityRobot {
clickOnPreference(R.string.settings_opt_in_of_analytics)
Espresso.pressBack()
ignoredUsers()
}
private fun ignoredUsers(block: () -> Unit = {}) {
clickOnAndGoBack(R.string.settings_ignored_users) { block() }
clickOnPreference(R.string.settings_ignored_users)
Espresso.pressBack()
}
}