diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d195dde..da71f16 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,6 +1,6 @@ name: Android CI -on: [push] +on: [push, pull_request] jobs: build: @@ -8,7 +8,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - uses: msfjarvis/setup-android@1.0 - with: - args: "./gradlew check assembleDebug" + - name: Git checkout + uses: actions/checkout@v2.3.3 + - name: Set up JDK + uses: actions/setup-java@v1.4.3 + with: + java-version: 1.8 + - name: Run check + run: "./gradlew check assembleDebug" diff --git a/presentation/src/test/java/com/jcaique/dialetus/presentation/regions/RegionsViewModelTest.kt b/presentation/src/test/java/com/jcaique/dialetus/presentation/regions/RegionsViewModelTest.kt index ae91515..5ea40fa 100644 --- a/presentation/src/test/java/com/jcaique/dialetus/presentation/regions/RegionsViewModelTest.kt +++ b/presentation/src/test/java/com/jcaique/dialetus/presentation/regions/RegionsViewModelTest.kt @@ -35,7 +35,7 @@ class RegionsViewModelTest { @Test fun `should report failure when fetching regions from remote`() = runBlockingTest { - service.stub { + service.stub { onBlocking { fetchRegions() } doThrow UnexpectedResponse } @@ -44,7 +44,7 @@ class RegionsViewModelTest { Failure(UnexpectedResponse), Finish ) - + val result = viewModel .showRegions() .toList() @@ -65,7 +65,7 @@ class RegionsViewModelTest { service.stub { onBlocking { fetchRegions() } doReturn regions } - + val expected = listOf( Start, Success(presentation),