Skip to content

Commit 925a296

Browse files
committed
Fixed some tests
1 parent 68816bf commit 925a296

2 files changed

Lines changed: 6 additions & 9 deletions

File tree

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/SearchMessagesGmailApiFlowTest.kt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@
55

66
package com.flowcrypt.email.ui.gmailapi
77

8-
import android.view.KeyEvent
98
import androidx.recyclerview.widget.RecyclerView
109
import androidx.test.espresso.Espresso.onView
11-
import androidx.test.espresso.action.ViewActions.clearText
1210
import androidx.test.espresso.action.ViewActions.click
13-
import androidx.test.espresso.action.ViewActions.pressKey
11+
import androidx.test.espresso.action.ViewActions.pressImeActionButton
1412
import androidx.test.espresso.action.ViewActions.replaceText
1513
import androidx.test.espresso.assertion.ViewAssertions.matches
1614
import androidx.test.espresso.contrib.RecyclerViewActions
@@ -37,7 +35,6 @@ import okhttp3.mockwebserver.Dispatcher
3735
import okhttp3.mockwebserver.MockResponse
3836
import okhttp3.mockwebserver.RecordedRequest
3937
import org.hamcrest.Matchers.allOf
40-
import org.junit.Ignore
4138
import org.junit.Rule
4239
import org.junit.Test
4340
import org.junit.rules.RuleChain
@@ -89,7 +86,6 @@ class SearchMessagesGmailApiFlowTest : BaseGmailApiTest() {
8986
.around(ScreenshotTestRule())
9087

9188
@Test
92-
@Ignore("fix me")
9389
fun testSearchMessages() {
9490
//need to wait while the app loads the messages list
9591
waitForObjectWithText(SUBJECT_EXISTING_STANDARD, TimeUnit.SECONDS.toMillis(10))
@@ -99,9 +95,12 @@ class SearchMessagesGmailApiFlowTest : BaseGmailApiTest() {
9995
onView(withId(R.id.menuSearch))
10096
.check(matches(isDisplayed()))
10197
.perform(click())
98+
99+
onView(withId(getIdentifierByName("search_src_text")))
100+
.perform(replaceText(SUBJECT_EXISTING_STANDARD))
101+
102102
onView(withId(getIdentifierByName("search_src_text")))
103-
.perform(click(), clearText(), replaceText(SUBJECT_EXISTING_STANDARD))
104-
.perform(pressKey(KeyEvent.KEYCODE_ENTER))
103+
.perform(pressImeActionButton())
105104

106105
//need to wait while the app loads the search result
107106
waitForObjectWithText("From", TimeUnit.SECONDS.toMillis(10))

FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/gmailapi/StandardComposeGmailApiFlow.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import okhttp3.mockwebserver.Dispatcher
3232
import okhttp3.mockwebserver.MockResponse
3333
import okhttp3.mockwebserver.RecordedRequest
3434
import org.junit.Assert.assertEquals
35-
import org.junit.Ignore
3635
import org.junit.Rule
3736
import org.junit.Test
3837
import org.junit.rules.RuleChain
@@ -74,7 +73,6 @@ class StandardComposeGmailApiFlow : BaseComposeGmailFlow() {
7473
.around(ScreenshotTestRule())
7574

7675
@Test
77-
@Ignore("need to fix")
7876
fun testSending() {
7977
//switch to standard mode
8078
openActionBarOverflowOrOptionsMenu(getTargetContext())

0 commit comments

Comments
 (0)