Skip to content

Bump the espresso group with 5 updates #3074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FlowCryptRobot merged 2 commits into from
Aug 27, 2025
Merged

Bump the espresso group with 5 updates #3074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dede9e8
Bump the espresso group with 5 updates
dependabot[bot] Aug 27, 2025
20ee136
wip
DenBond7 Aug 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions FlowCrypt/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,10 +416,10 @@ dependencies {
uiTestsImplementation("androidx.fragment:fragment-testing:1.8.7")
uiTestsImplementation("androidx.test:core-ktx:1.6.1")

androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
androidTestImplementation("androidx.test.espresso:espresso-contrib:3.6.1")
androidTestImplementation("androidx.test.espresso:espresso-intents:3.6.1")
androidTestImplementation("androidx.test.espresso:espresso-web:3.6.1")
androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0")
androidTestImplementation("androidx.test.espresso:espresso-contrib:3.7.0")
androidTestImplementation("androidx.test.espresso:espresso-intents:3.7.0")
androidTestImplementation("androidx.test.espresso:espresso-web:3.7.0")
androidTestImplementation("androidx.test.ext:junit:1.3.0")
androidTestImplementation("androidx.test:runner:1.7.0")
androidTestImplementation("androidx.test:rules:1.6.1")
Expand Down Expand Up @@ -453,7 +453,7 @@ dependencies {
implementation("androidx.recyclerview:recyclerview:1.4.0")
implementation("androidx.recyclerview:recyclerview-selection:1.2.0")
implementation("androidx.constraintlayout:constraintlayout:2.2.1")
implementation("androidx.test.espresso:espresso-idling-resource:3.6.1")
implementation("androidx.test.espresso:espresso-idling-resource:3.7.0")
implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.2")
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.9.2")
Expand Down
4 changes: 1 addition & 3 deletions FlowCrypt/src/androidTest/java/com/flowcrypt/email/base/BaseTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,7 @@ import jakarta.mail.Session
import jakarta.mail.internet.MimeMessage
import kotlinx.coroutines.runBlocking
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers
import org.hamcrest.Matchers.allOf
import org.hamcrest.Matchers.hasItem
import org.hamcrest.Matchers.hasToString
import org.hamcrest.Matchers.`is`
import org.hamcrest.Matchers.not
Expand Down Expand Up @@ -356,7 +354,7 @@ abstract class BaseTest : BaseActivityTestImplementation {
intending(
allOf(
hasAction(Intent.ACTION_GET_CONTENT),
hasCategories(hasItem(Matchers.equalTo(Intent.CATEGORY_OPENABLE))),
hasCategories(setOf(Intent.CATEGORY_OPENABLE)),
hasType(type)
)
).respondWith(Instrumentation.ActivityResult(Activity.RESULT_OK, resultData))
Expand Down
5 changes: 2 additions & 3 deletions FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/PublicKeyDetailsFlowTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import androidx.test.espresso.action.ViewActions.click
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.intent.Intents.intending
import androidx.test.espresso.intent.matcher.IntentMatchers
import androidx.test.espresso.intent.matcher.IntentMatchers.hasCategories
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.espresso.matcher.ViewMatchers.withText
Expand All @@ -42,8 +43,6 @@ import com.flowcrypt.email.util.DateTimeUtil
import com.flowcrypt.email.util.GeneralUtil
import com.flowcrypt.email.util.PrivateKeysManager
import com.flowcrypt.email.util.TestGeneralUtil
import org.hamcrest.CoreMatchers
import org.hamcrest.Matchers
import org.hamcrest.Matchers.allOf
import org.junit.AfterClass
import org.junit.Rule
Expand Down Expand Up @@ -157,7 +156,7 @@ class PublicKeyDetailsFlowTest : BaseTest() {
intending(
allOf(
IntentMatchers.hasAction(Intent.ACTION_CREATE_DOCUMENT),
IntentMatchers.hasCategories(CoreMatchers.hasItem(Matchers.equalTo(Intent.CATEGORY_OPENABLE))),
hasCategories(setOf(Intent.CATEGORY_OPENABLE)),
IntentMatchers.hasType(Constants.MIME_TYPE_PGP_KEY)
)
)
Expand Down
4 changes: 1 addition & 3 deletions ...rypt/src/androidTest/java/com/flowcrypt/email/ui/PublicKeyDetailsHideArmorMetaFlowTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,7 @@ import jakarta.mail.internet.InternetAddress
import jakarta.mail.internet.MimeMessage
import kotlinx.coroutines.runBlocking
import org.bouncycastle.bcpg.ArmoredInputStream
import org.hamcrest.CoreMatchers.hasItem
import org.hamcrest.Matchers.allOf
import org.hamcrest.Matchers.equalTo
import org.junit.Assert.assertArrayEquals
import org.junit.Rule
import org.junit.Test
Expand Down Expand Up @@ -134,7 +132,7 @@ class PublicKeyDetailsHideArmorMetaFlowTest : BaseTest() {
intending(
allOf(
hasAction(Intent.ACTION_CREATE_DOCUMENT),
hasCategories(hasItem(equalTo(Intent.CATEGORY_OPENABLE))),
hasCategories(setOf(Intent.CATEGORY_OPENABLE)),
hasType(Constants.MIME_TYPE_PGP_KEY)
)
)
Expand Down
6 changes: 2 additions & 4 deletions FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseBackupKeysFragmentTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
* Contributors: DenBond7
* Contributors: denbond7
*/

package com.flowcrypt.email.ui.base
Expand All @@ -17,8 +17,6 @@ import com.flowcrypt.email.Constants
import com.flowcrypt.email.base.BaseTest
import com.flowcrypt.email.junit.annotations.FlowCryptTestSettings
import org.hamcrest.Matchers.allOf
import org.hamcrest.Matchers.equalTo
import org.hamcrest.Matchers.hasItem
import java.io.File

/**
Expand All @@ -32,7 +30,7 @@ abstract class BaseBackupKeysFragmentTest : BaseTest(), AddAccountToDatabaseRule
intending(
allOf(
hasAction(Intent.ACTION_CREATE_DOCUMENT),
hasCategories(hasItem(equalTo(Intent.CATEGORY_OPENABLE))),
hasCategories(setOf(Intent.CATEGORY_OPENABLE)),
hasType(Constants.MIME_TYPE_PGP_KEY)
)
).respondWith(Instrumentation.ActivityResult(Activity.RESULT_OK, resultData))
Expand Down
4 changes: 1 addition & 3 deletions ...crypt/email/ui/fragment/isolation/incontainer/PrivateKeyDetailsFragmentInIsolationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ import com.flowcrypt.email.util.DateTimeUtil
import com.flowcrypt.email.util.GeneralUtil
import com.flowcrypt.email.util.PrivateKeysManager
import org.hamcrest.Matchers.allOf
import org.hamcrest.Matchers.equalTo
import org.hamcrest.Matchers.hasItem
import org.junit.Before
import org.junit.Rule
import org.junit.Test
Expand Down Expand Up @@ -178,7 +176,7 @@ class PrivateKeyDetailsFragmentInIsolationTest : BaseTest() {
intending(
allOf(
hasAction(Intent.ACTION_CREATE_DOCUMENT),
hasCategories(hasItem(equalTo(Intent.CATEGORY_OPENABLE))),
hasCategories(setOf(Intent.CATEGORY_OPENABLE)),
hasType(Constants.MIME_TYPE_PGP_KEY)
)
).respondWith(Instrumentation.ActivityResult(Activity.RESULT_OK, resultData))
Expand Down