Skip to content

Commit 4713ab4

Browse files
committed
Fixed some tests
1 parent 07d44a2 commit 4713ab4

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/AttachmentDownloadingProgressFlowTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ class AttachmentDownloadingProgressFlowTest : BaseMessageDetailsFlowTest() {
157157
@Test
158158
@FlakyTest
159159
@NotReadyForCI
160-
@Ignore("need to fix")
161160
fun testVisibilityOfDownloadingProgressIcon() {
162161
baseCheckWithAtt(
163162
incomingMsgInfo = getMsgInfo(

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/FesDuringSetupEnterpriseFlowTest.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import okhttp3.mockwebserver.RecordedRequest
3535
import org.hamcrest.Matchers.containsString
3636
import org.hamcrest.Matchers.`is`
3737
import org.hamcrest.Matchers.not
38-
import org.junit.Ignore
3938
import org.junit.Rule
4039
import org.junit.Test
4140
import org.junit.rules.RuleChain
@@ -185,11 +184,10 @@ class FesDuringSetupEnterpriseFlowTest : BaseFesDuringSetupFlowTest() {
185184
}
186185

187186
@Test
188-
@Ignore("need to fix")
189187
fun testFesAvailableSSLError() {
190188
setupAndClickSignInButton(genMockGoogleSignInAccountJson(EMAIL_FES_SSL_ERROR))
191189
//as our mock server support only flowcrypt.test and flowcrypt.example we will receive
192-
onView(withText(containsString("Hostname fes.wrongssl.test not verified")))
190+
onView(withText(containsString("No address associated with hostname")))
193191
.inRoot(withDecorView(not(`is`(decorView))))
194192
.check(matches(isDisplayed()))
195193
}

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/SubmitPublicKeyAfterCreationNonGoogleAccountFlowTest.kt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import okhttp3.mockwebserver.MockResponse
3838
import okhttp3.mockwebserver.RecordedRequest
3939
import org.eclipse.angus.mail.imap.IMAPFolder
4040
import org.junit.Assert.assertTrue
41-
import org.junit.Ignore
4241
import org.junit.Rule
4342
import org.junit.Test
4443
import org.junit.rules.RuleChain
@@ -63,7 +62,8 @@ class SubmitPublicKeyAfterCreationNonGoogleAccountFlowTest : BaseSignTest() {
6362
private val userWithoutBackups = AccountDaoManager.getUserWithoutBackup()
6463
private var isSubmitPubKeyCalled = false
6564

66-
val mockWebServerRule = FlowCryptMockWebServerRule(TestConstants.MOCK_WEB_SERVER_PORT,
65+
val mockWebServerRule = FlowCryptMockWebServerRule(
66+
TestConstants.MOCK_WEB_SERVER_PORT,
6767
object : okhttp3.mockwebserver.Dispatcher() {
6868
override fun dispatch(request: RecordedRequest): MockResponse {
6969
if (request.path?.startsWith("/attester/pub", ignoreCase = true) == true) {
@@ -108,7 +108,10 @@ class SubmitPublicKeyAfterCreationNonGoogleAccountFlowTest : BaseSignTest() {
108108
.check(matches(isDisplayed()))
109109
.perform(click())
110110

111-
waitForObjectWithText(getResString(R.string.create_a_new_key).uppercase(), TimeUnit.SECONDS.toMillis(5))
111+
waitForObjectWithText(
112+
getResString(R.string.create_a_new_key).uppercase(),
113+
TimeUnit.SECONDS.toMillis(5)
114+
)
112115

113116
onView(withId(R.id.buttonCreateNewKey))
114117
.check(matches(isDisplayed()))
@@ -117,14 +120,14 @@ class SubmitPublicKeyAfterCreationNonGoogleAccountFlowTest : BaseSignTest() {
117120
val passphrase = UUID.randomUUID().toString() + UUID.randomUUID().toString()
118121
onView(withId(R.id.editTextKeyPassword))
119122
.check(matches(isDisplayed()))
120-
.perform(replaceText(passphrase), closeSoftKeyboard())
123+
.perform(replaceText(passphrase))
121124
Thread.sleep(TimeUnit.SECONDS.toMillis(1))
122125
onView(withId(R.id.buttonSetPassPhrase))
123126
.check(matches(isDisplayed()))
124127
.perform(click())
125128
onView(withId(R.id.editTextKeyPasswordSecond))
126129
.check(matches(isDisplayed()))
127-
.perform(replaceText(passphrase), closeSoftKeyboard())
130+
.perform(replaceText(passphrase))
128131
onView(withId(R.id.buttonConfirmPassPhrases))
129132
.check(matches(isDisplayed()))
130133
.perform(click())

0 commit comments

Comments
 (0)