From b23cddfa052040267d560c5a86319bb2ed20b668 Mon Sep 17 00:00:00 2001
From: Konstantin Aksenov <aksenov.kostya@gmail.com>
Date: Tue, 11 Jul 2023 10:52:23 +1000
Subject: [PATCH] feat(ci): fix ui tests for firebase

---
 ...ple-connected-checks.yml => pr-checks.yml} |   2 +-
 .../kakaocup/sample/TestActivityTest.kt       |  18 --
 .../main/res/layout/activity_alert_dialog.xml |   5 +
 sample/src/main/res/layout/activity_test.xml  | 205 +++++++++---------
 4 files changed, 109 insertions(+), 121 deletions(-)
 rename .github/workflows/{pr-sample-connected-checks.yml => pr-checks.yml} (97%)

diff --git a/.github/workflows/pr-sample-connected-checks.yml b/.github/workflows/pr-checks.yml
similarity index 97%
rename from .github/workflows/pr-sample-connected-checks.yml
rename to .github/workflows/pr-checks.yml
index 94b34b475..84c454bcb 100644
--- a/.github/workflows/pr-sample-connected-checks.yml
+++ b/.github/workflows/pr-checks.yml
@@ -57,7 +57,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        api: [ 26, 27, 28, 29, 30, 32, 33 ]
+        api: [ 26, 27, 28, 29, 30, 31, 32, 33 ]
     steps:
       - uses: actions/checkout@v1
       - name: Download APKs
diff --git a/sample/src/androidTest/kotlin/io/github/kakaocup/sample/TestActivityTest.kt b/sample/src/androidTest/kotlin/io/github/kakaocup/sample/TestActivityTest.kt
index abf46b3c4..916aa07aa 100644
--- a/sample/src/androidTest/kotlin/io/github/kakaocup/sample/TestActivityTest.kt
+++ b/sample/src/androidTest/kotlin/io/github/kakaocup/sample/TestActivityTest.kt
@@ -31,7 +31,6 @@ class TestActivityTest {
             }
 
             textViewLarge {
-                scrollTo()
                 click()
                 isVisible()
                 hasText("LARGE")
@@ -41,7 +40,6 @@ class TestActivityTest {
             }
 
             textViewSmall {
-                scrollTo()
                 isVisible()
                 hasText("small")
                 isCompletelyBelow {
@@ -50,13 +48,11 @@ class TestActivityTest {
             }
 
             textViewHint {
-                scrollTo()
                 isVisible()
                 hasHint("hint")
             }
 
             buttonViewLeft {
-                scrollTo()
                 isVisible()
                 hasText("left")
                 isCompletelyLeftOf {
@@ -65,7 +61,6 @@ class TestActivityTest {
             }
 
             buttonViewRight {
-                scrollTo()
                 isVisible()
                 hasText("right")
                 isCompletelyRightOf {
@@ -74,7 +69,6 @@ class TestActivityTest {
             }
 
             textViewSmall {
-                scrollTo()
                 isVisible()
                 hasText("small")
                 isCompletelyBelow {
@@ -83,46 +77,38 @@ class TestActivityTest {
             }
 
             textViewColored {
-                scrollTo()
                 hasTextColor(R.color.background_color)
             }
 
             map {
-                scrollTo()
                 click()
                 hasAnyTag("test_tag", "non_test_tag")
             }
 
             multiTypeRecycler {
-                scrollTo()
                 hasText("MULTI TYPE RECYCLER")
             }
 
             singleTypeRecycler {
-                scrollTo()
                 hasText("SINGLE TYPE RECYCLER")
             }
 
             autoComplete {
-                scrollTo()
                 hasText("AUTO_COMPLETE")
             }
 
             ratingbar {
-                scrollTo()
                 hasRating(0f)
                 setRatingAt(3f)
                 hasRating(3f)
             }
 
             snackbarButton {
-                scrollTo()
                 click()
             }
 
             snackbar {
                 isDisplayed()
-
                 text { hasText("This is snackbar!") }
                 action {
                     hasText("DISMISS")
@@ -134,14 +120,12 @@ class TestActivityTest {
             }
 
             seekbar {
-                scrollTo()
                 hasProgress(70)
                 dragProgressTo(30)
                 hasProgress(30)
             }
 
             switch {
-                scrollTo()
                 isChecked()
                 click()
                 isNotChecked()
@@ -156,7 +140,6 @@ class TestActivityTest {
             }
 
             switchCompat {
-                scrollTo()
                 isChecked()
                 click()
                 isNotChecked()
@@ -175,7 +158,6 @@ class TestActivityTest {
             }
 
             searchView {
-                scrollTo()
                 hasHint("This is the HINT!")
                 hasHint(R.string.hint)
                 typeQuery("Hello")
diff --git a/sample/src/main/res/layout/activity_alert_dialog.xml b/sample/src/main/res/layout/activity_alert_dialog.xml
index 2576032fa..297f12524 100644
--- a/sample/src/main/res/layout/activity_alert_dialog.xml
+++ b/sample/src/main/res/layout/activity_alert_dialog.xml
@@ -4,6 +4,11 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
+  <!--Firebase API 29 emulator showing "Device is managed by your organization pop-up and overlapping buttons"-->
+  <View
+      android:layout_width="match_parent"
+      android:layout_height="100dp" />
+
   <Button
       android:id="@+id/show_alert_dialog"
       android:layout_width="match_parent"
diff --git a/sample/src/main/res/layout/activity_test.xml b/sample/src/main/res/layout/activity_test.xml
index 8cea7da69..e87b6d8bb 100644
--- a/sample/src/main/res/layout/activity_test.xml
+++ b/sample/src/main/res/layout/activity_test.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
+                                           android:id="@+id/drawer_layout"
+                                           android:layout_width="match_parent"
+                                           android:layout_height="match_parent"
+                                           android:fitsSystemWindows="true">
 
   <ScrollView
       android:layout_width="match_parent"
@@ -19,145 +19,146 @@
           android:id="@+id/text_view_large"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:text="LARGE" />
+          android:text="LARGE"/>
 
       <TextView
           android:id="@+id/text_view_small"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:text="small" />
+          android:text="small"/>
 
       <TextView
           android:id="@+id/text_view_hint"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:hint="hint" />
+          android:hint="hint"/>
 
-      <LinearLayout
+      <GridLayout
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:orientation="horizontal">
+          android:columnCount="3">
 
         <Button
-            android:id="@+id/button_view_left"
+            android:id="@+id/single_type_recycler"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="left" />
+            android:text="SINGLE TYPE RECYCLER"/>
 
         <Button
-            android:id="@+id/button_view_right"
+            android:id="@+id/multi_type_recycler"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="right" />
-      </LinearLayout>
+            android:text="MULTI TYPE RECYCLER"/>
 
-      <TextView
-          android:id="@+id/text_view_colored"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:text="colored"
-          android:textColor="@color/background_color" />
+        <Button
+            android:id="@+id/auto_complete"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="AUTO_COMPLETE"/>
 
-      <ImageView
-          android:id="@+id/map"
-          android:layout_width="48dp"
-          android:layout_height="48dp" />
+        <Button
+            android:id="@+id/drawableList"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="DRAWABLE LIST"/>
 
-      <LinearLayout
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:orientation="horizontal">
+        <Button
+            android:id="@+id/spinner_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="SPINNER"/>
 
         <Button
-            android:id="@+id/single_type_recycler"
+            android:id="@+id/web_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="SINGLE TYPE RECYCLER" />
+            android:text="WEB_BUTTON"/>
 
         <Button
-            android:id="@+id/multi_type_recycler"
+            android:id="@+id/view_pager_2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="MULTI TYPE RECYCLER" />
-      </LinearLayout>
+            android:text="VIEW PAGER 2"/>
 
-      <Button
-          android:id="@+id/auto_complete"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:text="AUTO_COMPLETE" />
+        <Button
+            android:id="@+id/snackbar_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="SNACKBAR"/>
 
-      <Button
-          android:id="@+id/drawableList"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:text="DRAWABLE LIST" />
+        <Button
+            android:id="@+id/picker_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="PICKERS"/>
 
-      <Button
-          android:id="@+id/spinner_button"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:text="SPINNER" />
+        <Button
+            android:id="@+id/alert_dialog_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="ALERT DIALOG"/>
 
-      <Button
-          android:id="@+id/web_button"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:text="WEB_BUTTON" />
+        <Button
+            android:id="@+id/slider_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="SLIDER"/>
 
-      <Button
-          android:id="@+id/view_pager_2"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:text="VIEW PAGER 2" />
+        <Button
+            android:id="@+id/google_maps"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="GOOGLE MAPS"/>
 
-      <Button
-          android:id="@+id/snackbar_button"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:text="SNACKBAR" />
+        <Button
+            android:id="@+id/text_input_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="TEXT INPUT LAYOUT"/>
 
-      <Button
-          android:id="@+id/picker_button"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:text="PICKERS" />
+        <Button
+            android:id="@+id/text_activity"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="TEXT VIEWS"/>
 
-      <Button
-          android:id="@+id/alert_dialog_button"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:text="ALERT DIALOG" />
+        <Button
+            android:id="@+id/switchers_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="SWITCHERS"/>
 
-      <Button
-          android:id="@+id/slider_button"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:text="SLIDER" />
+      </GridLayout>
 
-      <Button
-          android:id="@+id/google_maps"
-          android:layout_width="wrap_content"
+      <LinearLayout
+          android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:text="GOOGLE MAPS" />
+          android:orientation="horizontal">
 
-      <Button
-          android:id="@+id/text_input_layout"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:text="TEXT INPUT LAYOUT" />
+        <Button
+            android:id="@+id/button_view_left"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="left"/>
 
-      <Button
-          android:id="@+id/text_activity"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:text="TEXT VIEWS" />
+        <Button
+            android:id="@+id/button_view_right"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="right"/>
+      </LinearLayout>
 
-      <Button
-          android:id="@+id/switchers_button"
+      <TextView
+          android:id="@+id/text_view_colored"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:text="SWITCHERS" />
+          android:text="colored"
+          android:textColor="@color/background_color"/>
+
+      <ImageView
+          android:id="@+id/map"
+          android:layout_width="48dp"
+          android:layout_height="48dp"/>
 
       <RatingBar
           android:id="@+id/rating_bar"
@@ -165,7 +166,7 @@
           android:layout_height="wrap_content"
           android:numStars="5"
           android:rating="0"
-          android:stepSize="1" />
+          android:stepSize="1"/>
 
       <SeekBar
           android:id="@+id/seek_bar"
@@ -174,7 +175,7 @@
           android:max="100"
           android:paddingLeft="32dp"
           android:paddingRight="32dp"
-          android:progress="70" />
+          android:progress="70"/>
 
       <Switch
           android:id="@+id/switch_view"
@@ -183,7 +184,7 @@
           android:checked="true"
           android:paddingLeft="32dp"
           android:paddingRight="32dp"
-          android:text="Switch" />
+          android:text="Switch"/>
 
       <androidx.appcompat.widget.SwitchCompat
           android:id="@+id/switch_compat"
@@ -192,7 +193,7 @@
           android:checked="true"
           android:paddingLeft="32dp"
           android:paddingRight="32dp"
-          android:text="Switch compat" />
+          android:text="Switch compat"/>
 
       <androidx.core.widget.NestedScrollView
           android:layout_width="match_parent"
@@ -202,7 +203,7 @@
             android:id="@+id/nested_scroll_text_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Text in a nested scroll view" />
+            android:text="Text in a nested scroll view"/>
 
       </androidx.core.widget.NestedScrollView>
 
@@ -210,7 +211,7 @@
           android:id="@+id/search_view"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:hint="@string/hint" />
+          android:hint="@string/hint"/>
     </LinearLayout>
   </ScrollView>
 
@@ -225,7 +226,7 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Slide Menu Item" />
+        android:text="Slide Menu Item"/>
 
   </LinearLayout>
 </androidx.drawerlayout.widget.DrawerLayout>