From 73881d08138f23e20a119618b097b2b9f837827d Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 1 Sep 2021 14:52:28 +0200 Subject: [PATCH] Upgrade dependency on Barista. Should fix #3929 Barista has changed location since 4.0.0 --- vector/build.gradle | 2 +- .../vector/app/ui/UiAllScreensSanityTest.kt | 24 +++++++++---------- .../java/im/vector/app/ui/UiTestBase.kt | 10 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/vector/build.gradle b/vector/build.gradle index 36023c1dcc..9d3cc7ec3c 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -521,7 +521,7 @@ dependencies { // Plant Timber tree for test androidTestImplementation 'net.lachlanmckee:timber-junit-rule:1.0.1' // "The one who serves a great Espresso" - androidTestImplementation('com.schibsted.spain:barista:3.9.0') { + androidTestImplementation('com.adevinta.android:barista:4.1.0') { exclude group: 'org.jetbrains.kotlin' } } diff --git a/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt b/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt index 26365e0c72..19cded2948 100644 --- a/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt +++ b/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt @@ -30,18 +30,18 @@ import androidx.test.espresso.matcher.ViewMatchers.withText import androidx.test.ext.junit.rules.ActivityScenarioRule import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.LargeTest -import com.schibsted.spain.barista.assertion.BaristaListAssertions.assertListItemCount -import com.schibsted.spain.barista.assertion.BaristaVisibilityAssertions.assertDisplayed -import com.schibsted.spain.barista.interaction.BaristaClickInteractions.clickBack -import com.schibsted.spain.barista.interaction.BaristaClickInteractions.clickOn -import com.schibsted.spain.barista.interaction.BaristaClickInteractions.longClickOn -import com.schibsted.spain.barista.interaction.BaristaDialogInteractions.clickDialogNegativeButton -import com.schibsted.spain.barista.interaction.BaristaDialogInteractions.clickDialogPositiveButton -import com.schibsted.spain.barista.interaction.BaristaEditTextInteractions.writeTo -import com.schibsted.spain.barista.interaction.BaristaListInteractions.clickListItem -import com.schibsted.spain.barista.interaction.BaristaListInteractions.clickListItemChild -import com.schibsted.spain.barista.interaction.BaristaMenuClickInteractions.clickMenu -import com.schibsted.spain.barista.interaction.BaristaMenuClickInteractions.openMenu +import com.adevinta.android.barista.assertion.BaristaListAssertions.assertListItemCount +import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions.assertDisplayed +import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickBack +import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn +import com.adevinta.android.barista.interaction.BaristaClickInteractions.longClickOn +import com.adevinta.android.barista.interaction.BaristaDialogInteractions.clickDialogNegativeButton +import com.adevinta.android.barista.interaction.BaristaDialogInteractions.clickDialogPositiveButton +import com.adevinta.android.barista.interaction.BaristaEditTextInteractions.writeTo +import com.adevinta.android.barista.interaction.BaristaListInteractions.clickListItem +import com.adevinta.android.barista.interaction.BaristaListInteractions.clickListItemChild +import com.adevinta.android.barista.interaction.BaristaMenuClickInteractions.clickMenu +import com.adevinta.android.barista.interaction.BaristaMenuClickInteractions.openMenu import im.vector.app.EspressoHelper import im.vector.app.R import im.vector.app.SleepViewAction diff --git a/vector/src/androidTest/java/im/vector/app/ui/UiTestBase.kt b/vector/src/androidTest/java/im/vector/app/ui/UiTestBase.kt index ed174b50a2..2cef326501 100644 --- a/vector/src/androidTest/java/im/vector/app/ui/UiTestBase.kt +++ b/vector/src/androidTest/java/im/vector/app/ui/UiTestBase.kt @@ -20,11 +20,11 @@ import androidx.test.espresso.Espresso.closeSoftKeyboard import androidx.test.espresso.Espresso.onView import androidx.test.espresso.matcher.ViewMatchers.isRoot import androidx.test.espresso.matcher.ViewMatchers.withId -import com.schibsted.spain.barista.assertion.BaristaEnabledAssertions.assertDisabled -import com.schibsted.spain.barista.assertion.BaristaEnabledAssertions.assertEnabled -import com.schibsted.spain.barista.assertion.BaristaVisibilityAssertions.assertDisplayed -import com.schibsted.spain.barista.interaction.BaristaClickInteractions.clickOn -import com.schibsted.spain.barista.interaction.BaristaEditTextInteractions.writeTo +import com.adevinta.android.barista.assertion.BaristaEnabledAssertions.assertDisabled +import com.adevinta.android.barista.assertion.BaristaEnabledAssertions.assertEnabled +import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions.assertDisplayed +import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn +import com.adevinta.android.barista.interaction.BaristaEditTextInteractions.writeTo import im.vector.app.R import im.vector.app.espresso.tools.waitUntilActivityVisible import im.vector.app.features.home.HomeActivity