@@ -135,11 +135,7 @@ class UploadTest {
135
135
val commonsFileName = " MobileTest " + dateFormat.format(Date ())
136
136
137
137
// Try to dismiss the error, if there is one (probably about duplicate files on Commons)
138
- try {
139
- onView(withText(" Yes" ))
140
- .check(matches(isDisplayed()))
141
- .perform(click())
142
- } catch (ignored: NoMatchingViewException ) {}
138
+ dismissWarning(" Yes" )
143
139
144
140
onView(allOf<View >(isDisplayed(), withId(R .id.et_title)))
145
141
.perform(replaceText(commonsFileName))
@@ -151,25 +147,27 @@ class UploadTest {
151
147
onView(allOf(isDisplayed(), withId(R .id.btn_next)))
152
148
.perform(click())
153
149
154
- try {
155
- onView(withText(" Yes" ))
156
- .check(matches(isDisplayed()))
157
- .perform(click())
158
- } catch (ignored: NoMatchingViewException ) {}
150
+ UITestHelper .sleep(5000 )
151
+ dismissWarning(" Yes" )
159
152
160
- UITestHelper .sleep(1000 )
153
+ UITestHelper .sleep(3000 )
161
154
162
155
onView(allOf(isDisplayed(), withId(R .id.et_search)))
163
156
.perform(replaceText(" Uploaded with Mobile/Android Tests" ))
164
157
165
158
UITestHelper .sleep(3000 )
166
159
167
- onView(allOf(isDisplayed(), withParent(withId(R .id.rv_categories))))
168
- .perform(click())
160
+ try {
161
+ onView(allOf(isDisplayed(), withParent(withId(R .id.rv_categories))))
162
+ .perform(click())
163
+ } catch (ignored: NoMatchingViewException ) {
164
+ }
169
165
170
166
onView(allOf(isDisplayed(), withId(R .id.btn_next)))
171
167
.perform(click())
172
168
169
+ dismissWarning(" Yes, Submit" )
170
+
173
171
UITestHelper .sleep(500 )
174
172
175
173
onView(allOf(isDisplayed(), withId(R .id.btn_submit)))
@@ -181,4 +179,13 @@ class UploadTest {
181
179
commonsFileName.replace(' ' , ' _' ) + " .jpg"
182
180
Timber .i(" File should be uploaded to $fileUrl " )
183
181
}
182
+
183
+ private fun dismissWarning (warningText : String ) {
184
+ try {
185
+ onView(withText(warningText))
186
+ .check(matches(isDisplayed()))
187
+ .perform(click())
188
+ } catch (ignored: NoMatchingViewException ) {
189
+ }
190
+ }
184
191
}
0 commit comments