From 85f0bd920ce3ed4d8f55fe7b2819e5df52b2f58a Mon Sep 17 00:00:00 2001
From: ifernandezdiaz <ifernandez.qa@gmail.com>
Date: Mon, 14 Jul 2025 15:41:09 -0300
Subject: [PATCH] Removing steps to test faster on Device Farm

---
 .github/workflows/test-device.yml             | 39 -------------------
 .../kotlin/e2e/tests/RealDeviceE2ETests.kt    |  5 ++-
 2 files changed, 3 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/test-device.yml b/.github/workflows/test-device.yml
index cde0434c7a..fd46898473 100644
--- a/.github/workflows/test-device.yml
+++ b/.github/workflows/test-device.yml
@@ -105,45 +105,6 @@ jobs:
           secrets: |
             63e93f73-5118-4a62-9db8-b3160176aa8a > TEST_ACCOUNT_CREDS
 
-      - name: Configure .json test data file
-        run: printf %s '${{ env.TEST_ACCOUNT_CREDS }}' > app/src/androidTest/assets/TestData.json
-
-      - name: Build release APK
-        env:
-          PLAY_KEYSTORE_PASSWORD: ${{ secrets.PLAY_KEYSTORE_PASSWORD }}
-        run: |
-          bundle exec fastlane assemblePlayStoreReleaseApk \
-            storeFile:app_play-keystore.jks \
-            storePassword:'${{ env.PLAY_KEYSTORE_PASSWORD }}' \
-            keyAlias:bitwarden \
-            keyPassword:'${{ env.PLAY_KEYSTORE_PASSWORD }}'
-
-      - name: Build test APK (espresso)
-        run: |
-          ./gradlew :app:assembleStandardReleaseAndroidTest
-
-      - name: Signing test APK
-        run: |
-          $ANDROID_SDK_ROOT/build-tools/34.0.0/apksigner sign \
-            --ks keystores/app_play-keystore.jks \
-            --ks-key-alias bitwarden \
-            --ks-pass pass:${{ secrets.PLAY_KEYSTORE_PASSWORD }} \
-            --key-pass pass:${{ secrets.PLAY_KEYSTORE_PASSWORD }} \
-            app/build/outputs/apk/androidTest/standard/release/com.x8bit.bitwarden-standard-release-androidTest.apk
-
-      - name: Upload app APK to SauceLabs storage
-        run: |
-          saucectl storage upload app/build/outputs/apk/standard/release/com.x8bit.bitwarden.apk
-        env:
-          SAUCE_USERNAME: ${{ steps.get-e2e-secrets.outputs.SAUCE-LABS-USERNAME }}
-          SAUCE_ACCESS_KEY: ${{ steps.get-e2e-secrets.outputs.SAUCE-LABS-ACCESS-KEY }}
-
-      - name: Upload test APK to SauceLabs storage
-        run: |
-          saucectl storage upload app/build/outputs/apk/androidTest/standard/release/com.x8bit.bitwarden-standard-release-androidTest.apk
-        env:
-          SAUCE_USERNAME: ${{ steps.get-e2e-secrets.outputs.SAUCE-LABS-USERNAME }}
-          SAUCE_ACCESS_KEY: ${{ steps.get-e2e-secrets.outputs.SAUCE-LABS-ACCESS-KEY }}
 
       - name: Run tests on SauceLabs
         run: saucectl run --config .sauce/config.yml
diff --git a/app/src/androidTest/kotlin/e2e/tests/RealDeviceE2ETests.kt b/app/src/androidTest/kotlin/e2e/tests/RealDeviceE2ETests.kt
index f9dddeff1c..33ac4824d5 100644
--- a/app/src/androidTest/kotlin/e2e/tests/RealDeviceE2ETests.kt
+++ b/app/src/androidTest/kotlin/e2e/tests/RealDeviceE2ETests.kt
@@ -11,13 +11,14 @@ class RealDeviceE2ETests : BaseE2ETest() {
 
     @Test
     fun testVaultLockUnlockFlow() {
-        MainPage(composeTestRule)
+        var vault = MainPage(composeTestRule)
             .startLogin()
             .turnOnScreenRecording()
             .openEnvironmentSettings()
             .setupEnvironment(testData.baseUrl)
             .performLogin(testData.email, testData.password)
-            .navigateToSettingsPage()
+        vault.assertVaultIsUnlocked()
+        vault.navigateToSettingsPage()
             .navigateToAccountSecurity()
             .lockVault()
             .performUnlockVault(testData.password)