From 06b51d308101cd4b43c0eca79f64347566695d58 Mon Sep 17 00:00:00 2001
From: "h.malik144@gmail.com" <h.malik144@gmail.com>
Date: Fri, 15 Sep 2023 16:49:00 +0100
Subject: [PATCH]  - config.yml updated

---
 .../appttude/h_mal/farmr/ui/BaseTestRobot.kt  |  3 +++
 .../h_mal/farmr/ui/tests/ShiftTests.kt        | 22 +++----------------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/app/src/androidTest/java/com/appttude/h_mal/farmr/ui/BaseTestRobot.kt b/app/src/androidTest/java/com/appttude/h_mal/farmr/ui/BaseTestRobot.kt
index a85098f..7f68f6a 100644
--- a/app/src/androidTest/java/com/appttude/h_mal/farmr/ui/BaseTestRobot.kt
+++ b/app/src/androidTest/java/com/appttude/h_mal/farmr/ui/BaseTestRobot.kt
@@ -23,6 +23,7 @@ import androidx.test.espresso.contrib.RecyclerViewActions
 import androidx.test.espresso.matcher.RootMatchers.isDialog
 import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.platform.app.InstrumentationRegistry
+import com.appttude.h_mal.farmr.R
 import com.appttude.h_mal.farmr.ui.utils.EspressoHelper.waitForView
 import org.hamcrest.CoreMatchers.allOf
 import org.hamcrest.CoreMatchers.anything
@@ -58,6 +59,8 @@ open class BaseTestRobot {
 
     fun matchText(resId: Int, text: String): ViewInteraction = matchText(matchView(resId), text)
 
+    fun scrollTo(viewId: Int): ViewInteraction = matchView(viewId).perform(ViewActions.scrollTo())
+
     fun clickListItem(listRes: Int, position: Int) {
         onData(anything())
             .inAdapterView(allOf(withId(listRes)))
diff --git a/app/src/androidTest/java/com/appttude/h_mal/farmr/ui/tests/ShiftTests.kt b/app/src/androidTest/java/com/appttude/h_mal/farmr/ui/tests/ShiftTests.kt
index 9d0fd36..a6ac02d 100644
--- a/app/src/androidTest/java/com/appttude/h_mal/farmr/ui/tests/ShiftTests.kt
+++ b/app/src/androidTest/java/com/appttude/h_mal/farmr/ui/tests/ShiftTests.kt
@@ -1,5 +1,7 @@
 package com.appttude.h_mal.farmr.ui.tests
 
+import androidx.test.espresso.action.ViewActions
+import com.appttude.h_mal.farmr.R
 import com.appttude.h_mal.farmr.model.Order
 import com.appttude.h_mal.farmr.model.ShiftType
 import com.appttude.h_mal.farmr.model.Sortable
@@ -125,23 +127,6 @@ class ShiftTests : BaseTest<MainActivity>(MainActivity::class.java) {
         }
         listScreen {
             assertListCount(4)
-            homeScreen {
-                waitFor(600)
-                clickClearFilterInMenu()
-                waitFor(600)
-                assertListCount(8)
-                clickFilterInMenu()
-            }
-        }
-        filterScreen {
-            val calendar = Calendar.getInstance()
-            val year = calendar.get(YEAR)
-            val month = calendar.get(MONTH) + 1
-            setDateOut(year, month, 6)
-            submit()
-        }
-        listScreen {
-            assertListCount(5)
         }
     }
 
@@ -178,9 +163,8 @@ class ShiftTests : BaseTest<MainActivity>(MainActivity::class.java) {
             clickTab(HomeScreenRobot.Tab.CALENDAR)
         }
         calendarScreen {
-            waitFor(600)
             clickOnCalendarDay(1)
-            waitFor(600)
+            scrollTo(R.id.shifts_available_recycler)
             clickOnListItemAtPosition(0)
         }
         viewScreen {