From b7e3cc493aba3d69b444c88c85a750578efc6999 Mon Sep 17 00:00:00 2001
From: Gergely Hegedus <hegedusgergely@yahoo.com>
Date: Thu, 14 Jul 2022 00:42:29 +0300
Subject: [PATCH] Issue#104 Change to Manual trigger and revert back temporary
 changes

---
 .github/workflows/pull-request-jobs.yml       | 114 +++++++++---------
 .github/workflows/screenshot-tests.yml        |   5 +-
 .../ui/AuthComposeInstrumentedTest.kt         |   2 +-
 3 files changed, 60 insertions(+), 61 deletions(-)

diff --git a/.github/workflows/pull-request-jobs.yml b/.github/workflows/pull-request-jobs.yml
index 0993b4a..c226468 100644
--- a/.github/workflows/pull-request-jobs.yml
+++ b/.github/workflows/pull-request-jobs.yml
@@ -74,60 +74,60 @@ jobs:
           path: ./**/build/reports/tests/**/index.html
           retention-days: 1
 
-#  run-tests-on-emulator:
-#    runs-on: macos-latest
-#    strategy:
-#      matrix:
-#        api-level: [ 21, 30 ]
-#      fail-fast: false
-#    steps:
-#      - name: checkout
-#        uses: actions/checkout@v3
-#      - name: Setup Java
-#        uses: actions/setup-java@v2
-#        with:
-#          distribution: 'adopt'
-#          java-version: '11'
-#      - name: Gradle cache
-#        uses: gradle/gradle-build-action@v2
-#      - name: AVD cache
-#        uses: actions/cache@v3
-#        id: avd-cache
-#        with:
-#          path: |
-#            ~/.android/avd/*
-#            ~/.android/adb*
-#          key: avd-${{ matrix.api-level }}
-#      - name: create AVD and generate snapshot for caching
-#        if: steps.avd-cache.outputs.cache-hit != 'true'
-#        uses: reactivecircus/android-emulator-runner@v2
-#        with:
-#          arch: 'x86_64'
-#          api-level: ${{ matrix.api-level }}
-#          force-avd-creation: false
-#          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-#          disable-animations: false
-#          script: echo "Generated AVD snapshot for caching."
-#      - name: Run Android Tests
-#        uses: reactivecircus/android-emulator-runner@v2
-#        with:
-#          arch: 'x86_64'
-#          api-level: ${{ matrix.api-level }}
-#          force-avd-creation: false
-#          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-#          disable-animations: true
-#          script: ./gradlew connectedDebugAndroidTest
-#      - name: Upload Test Results
-#        uses: actions/upload-artifact@v2
-#        if: always()
-#        with:
-#          name: Emulator-Test-Results-${{ matrix.api-level }}
-#          path: ./**/build/reports/androidTests/**/*.html
-#          retention-days: 1
-#      - name: Upload Test Screenshots
-#        uses: actions/upload-artifact@v2
-#        if: always()
-#        with:
-#          name: Emulator-Test-Results-${{ matrix.api-level }}
-#          path: ./**/build/testscreenshots/*
-#          retention-days: 1
\ No newline at end of file
+  run-tests-on-emulator:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        api-level: [ 21, 30 ]
+      fail-fast: false
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+      - name: Setup Java
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: '11'
+      - name: Gradle cache
+        uses: gradle/gradle-build-action@v2
+      - name: AVD cache
+        uses: actions/cache@v3
+        id: avd-cache
+        with:
+          path: |
+            ~/.android/avd/*
+            ~/.android/adb*
+          key: avd-${{ matrix.api-level }}
+      - name: create AVD and generate snapshot for caching
+        if: steps.avd-cache.outputs.cache-hit != 'true'
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          arch: 'x86_64'
+          api-level: ${{ matrix.api-level }}
+          force-avd-creation: false
+          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: false
+          script: echo "Generated AVD snapshot for caching."
+      - name: Run Android Tests
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          arch: 'x86_64'
+          api-level: ${{ matrix.api-level }}
+          force-avd-creation: false
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: true
+          script: ./gradlew connectedDebugAndroidTest
+      - name: Upload Test Results
+        uses: actions/upload-artifact@v2
+        if: always()
+        with:
+          name: Emulator-Test-Results-${{ matrix.api-level }}
+          path: ./**/build/reports/androidTests/**/*.html
+          retention-days: 1
+      - name: Upload Test Screenshots
+        uses: actions/upload-artifact@v2
+        if: always()
+        with:
+          name: Emulator-Test-Results-${{ matrix.api-level }}
+          path: ./**/build/testscreenshots/*
+          retention-days: 1
\ No newline at end of file
diff --git a/.github/workflows/screenshot-tests.yml b/.github/workflows/screenshot-tests.yml
index 6acc288..776ca31 100644
--- a/.github/workflows/screenshot-tests.yml
+++ b/.github/workflows/screenshot-tests.yml
@@ -1,9 +1,8 @@
 name: Verify Screenshots can be created and pulled
 
 on:
-  pull_request:
-    branches:
-      - develop
+  workflow_dispatch:
+
 
 env:
   GITHUB_USERNAME: "fknives"
diff --git a/app/src/androidTest/java/org/fnives/test/showcase/ui/AuthComposeInstrumentedTest.kt b/app/src/androidTest/java/org/fnives/test/showcase/ui/AuthComposeInstrumentedTest.kt
index afba776..f2666d7 100644
--- a/app/src/androidTest/java/org/fnives/test/showcase/ui/AuthComposeInstrumentedTest.kt
+++ b/app/src/androidTest/java/org/fnives/test/showcase/ui/AuthComposeInstrumentedTest.kt
@@ -57,7 +57,7 @@ class AuthComposeInstrumentedTest : KoinTest {
         composeTestRule.mainClock.advanceTimeUntil { anyResourceIdling() }
         navigationRobot.assertAuthScreen()
         robot.setPassword("alma")
-            .setUsername("banaxn")
+            .setUsername("banan")
             .assertUsername("banan")
             .assertPassword("alma")