From 15f04071c72fbfb5e88e93b2176552f72a9ba0c7 Mon Sep 17 00:00:00 2001 From: Kemin Date: Fri, 20 Dec 2024 02:20:59 +0100 Subject: [PATCH 1/2] fix(e2e): add back all the end2end --- .../java/com/android/streetworkapp/end2end/End2EndGeneral.kt | 2 -- .../java/com/android/streetworkapp/end2end/End2EndParks.kt | 2 -- 2 files changed, 4 deletions(-) diff --git a/app/src/androidTest/java/com/android/streetworkapp/end2end/End2EndGeneral.kt b/app/src/androidTest/java/com/android/streetworkapp/end2end/End2EndGeneral.kt index 7e5ea8bde..33912a92a 100644 --- a/app/src/androidTest/java/com/android/streetworkapp/end2end/End2EndGeneral.kt +++ b/app/src/androidTest/java/com/android/streetworkapp/end2end/End2EndGeneral.kt @@ -36,7 +36,6 @@ import com.android.streetworkapp.ui.navigation.Route import com.android.streetworkapp.utils.GoogleAuthService import com.google.firebase.auth.FirebaseAuth import org.junit.Before -import org.junit.Ignore import org.junit.Rule import org.junit.Test import org.mockito.InjectMocks @@ -117,7 +116,6 @@ class End2EndGeneral { } /** Tests everything included up to M2 except for everything that involves parks */ - @Ignore("google maps API can be slow sometimes, wouldn't want the CI to fail because of this") @Test fun e2eNavigationAndDisplaysCorrectDetailsExceptForParks() { diff --git a/app/src/androidTest/java/com/android/streetworkapp/end2end/End2EndParks.kt b/app/src/androidTest/java/com/android/streetworkapp/end2end/End2EndParks.kt index b4d1c89cd..12a7a6a78 100644 --- a/app/src/androidTest/java/com/android/streetworkapp/end2end/End2EndParks.kt +++ b/app/src/androidTest/java/com/android/streetworkapp/end2end/End2EndParks.kt @@ -49,7 +49,6 @@ import io.mockk.every import io.mockk.mockk import org.junit.After import org.junit.Before -import org.junit.Ignore import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -106,7 +105,6 @@ class End2EndParks { IdlingRegistry.getInstance().unregister(idlingResource) } - @Ignore("google maps API can be slow sometimes, wouldn't want the CI to fail because of this") @Test fun E2ECanClickParkAncAccessSpecificParkOverview() { idlingResource.increment() From 1df90d49c00537cb5380ece96323ea72f4b67bef Mon Sep 17 00:00:00 2001 From: Kemin Date: Fri, 20 Dec 2024 02:27:10 +0100 Subject: [PATCH 2/2] fix(e2e): add back the ignore in end2endparks --- .../java/com/android/streetworkapp/end2end/End2EndParks.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/androidTest/java/com/android/streetworkapp/end2end/End2EndParks.kt b/app/src/androidTest/java/com/android/streetworkapp/end2end/End2EndParks.kt index 12a7a6a78..b4d1c89cd 100644 --- a/app/src/androidTest/java/com/android/streetworkapp/end2end/End2EndParks.kt +++ b/app/src/androidTest/java/com/android/streetworkapp/end2end/End2EndParks.kt @@ -49,6 +49,7 @@ import io.mockk.every import io.mockk.mockk import org.junit.After import org.junit.Before +import org.junit.Ignore import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -105,6 +106,7 @@ class End2EndParks { IdlingRegistry.getInstance().unregister(idlingResource) } + @Ignore("google maps API can be slow sometimes, wouldn't want the CI to fail because of this") @Test fun E2ECanClickParkAncAccessSpecificParkOverview() { idlingResource.increment()