Skip to content

Fixed e few test #3184

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
sosnovsky merged 6 commits into from
Mar 25, 2026
Merged

Fixed e few test #3184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8149408
Fixed ComposeScreenFlowTest.testSelectImportPublicKeyFromPopUp()
DenBond7 Mar 21, 2026
aaf43d7
Removed unused code
DenBond7 Mar 21, 2026
49545fb
Updated gradle plugin
DenBond7 Mar 21, 2026
9608686
wip
DenBond7 Mar 21, 2026
02b8460
wip
DenBond7 Mar 21, 2026
c7c9945
wip
DenBond7 Mar 22, 2026
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
3 changes: 2 additions & 1 deletion FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/ComposeScreenFlowTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,6 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
}

@Test
@Ignore("temporary disabled")
fun testSelectImportPublicKeyFromPopUp() {
activeActivityRule?.launch(intent)
intending(hasComponent(ComponentName(getTargetContext(), MainActivity::class.java)))
Expand Down Expand Up @@ -419,6 +418,8 @@ class ComposeScreenFlowTest : BaseComposeScreenTest() {
.check(matches(isDisplayed()))
.perform(click())

waitForObjectWithText(email, TimeUnit.SECONDS.toMillis(10))

onView(withId(R.id.recyclerViewChipsTo))
.perform(
RecyclerViewActions.scrollTo<RecyclerView.ViewHolder>(
Expand Down
8 changes: 6 additions & 2 deletions ...flowcrypt/email/ui/fragment/isolation/incontainer/CreateMessageFragmentInIsolationTest.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.fragment.isolation.incontainer
Expand Down Expand Up @@ -42,6 +42,7 @@ import org.junit.rules.RuleChain
import org.junit.rules.TestRule
import org.junit.runner.RunWith
import java.net.HttpURLConnection
import java.util.concurrent.TimeUnit

/**
* @author Denys Bondarenko
Expand Down Expand Up @@ -125,6 +126,8 @@ class CreateMessageFragmentInIsolationTest : BaseComposeScreenTest() {
.perform(typeText(char.toString()))
typedChars.add(char)

waitForObjectWithText(String(typedChars.toCharArray()), TimeUnit.SECONDS.toMillis(10))

onView(withId(R.id.recyclerViewAutocompleteTo))
.perform(
scrollTo<RecyclerView.ViewHolder>(
Expand All @@ -140,7 +143,8 @@ class CreateMessageFragmentInIsolationTest : BaseComposeScreenTest() {
companion object {
@get:ClassRule
@JvmStatic
val mockWebServerRule = FlowCryptMockWebServerRule(TestConstants.MOCK_WEB_SERVER_PORT,
val mockWebServerRule = FlowCryptMockWebServerRule(
TestConstants.MOCK_WEB_SERVER_PORT,
object : Dispatcher() {
override fun dispatch(request: RecordedRequest): MockResponse {
if (request.path?.startsWith("/attester/pub", ignoreCase = true) == true) {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
#
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading