Fixed UI tests

mozilla-lockwise · Nov 28, 2018 · 0398a82 · 0398a82
1 parent bcfe234
commit 0398a82
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/app/src/androidTest/java/mozilla/lockbox/Navigator.kt b/app/src/androidTest/java/mozilla/lockbox/Navigator.kt
@@ -13,6 +13,8 @@ import android.support.test.espresso.NoActivityResumedException
 import android.support.test.espresso.intent.Intents
 import br.com.concretesolutions.kappuccino.custom.intent.IntentMatcherInteractions.sentIntent
 import br.com.concretesolutions.kappuccino.custom.intent.IntentMatcherInteractions.stubIntent
+import io.reactivex.plugins.RxJavaPlugins
+import io.reactivex.schedulers.TestScheduler
 import mozilla.lockbox.robots.accountSettingScreen
 import mozilla.lockbox.robots.disconnectDisclaimer
 import mozilla.lockbox.robots.filteredItemList
@@ -24,6 +26,7 @@ import mozilla.lockbox.robots.securityDisclaimer
 import mozilla.lockbox.robots.settings
 import mozilla.lockbox.robots.welcome
 import org.junit.Assert
+import java.util.concurrent.TimeUnit
 
 class Navigator {
     fun gotoFxALogin() {
@@ -40,8 +43,11 @@ class Navigator {
     }
 
     fun gotoItemList() {
+        val scheduler = TestScheduler()
+        RxJavaPlugins.setComputationSchedulerHandler { scheduler }
         gotoFxALogin()
         fxaLogin { tapPlaceholderLogin() }
+        scheduler.advanceTimeBy(1200, TimeUnit.MILLISECONDS)
         checkAtItemList()
     }
 

diff --git a/app/src/main/res/drawable/rounded_corner_bg.xml b/app/src/main/res/drawable/rounded_corner_bg.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ This Source Code Form is subject to the terms of the Mozilla Public
+  ~ License, v. 2.0. If a copy of the MPL was not distributed with this
+  ~ file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="@color/dark_grey"/>
+    <corners android:radius="6dp"/>
+</shape>
diff --git a/app/src/main/res/layout/fragment_item_list.xml b/app/src/main/res/layout/fragment_item_list.xml
@@ -71,7 +71,7 @@
                 android:layout_height="48dp"
                 android:layout_alignParentBottom="true"
                 android:layout_margin="10dp"
-                android:background="@color/dark_grey"
+                android:background="@drawable/rounded_corner_bg"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">