diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index be0cf99c7..9d565ff7d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -81,7 +81,7 @@ jobs: ANDROID_EMULATOR_WAIT_TIME_BEFORE_KILL: 170 strategy: matrix: - arch: [[16, x86, ubuntu-latest], [21, x86, ubuntu-latest], [23, x86, ubuntu-latest], [28, x86, ubuntu-latest], [30, x86_64, macos-latest], [31, x86_64, macos-latest], [32, x86_64, macos-latest], [33, x86_64, macos-latest], [34, x86_64, macos-latest]] + arch: [[16, x86, ubuntu-latest], [21, x86, ubuntu-latest], [23, x86, ubuntu-latest], [28, x86, ubuntu-latest], [30, x86_64, macos-latest], [31, x86_64, macos-latest], [32, x86_64, macos-latest], [33, x86_64, macos-latest]] runs-on: ${{ matrix.arch[2] }} steps: - name: checkout diff --git a/orion-viewer/src/androidTest/kotlin/universe/constellation/orion/viewer/test/framework/BaseTest.kt b/orion-viewer/src/androidTest/kotlin/universe/constellation/orion/viewer/test/framework/BaseTest.kt index 579c7167a..635c912b5 100644 --- a/orion-viewer/src/androidTest/kotlin/universe/constellation/orion/viewer/test/framework/BaseTest.kt +++ b/orion-viewer/src/androidTest/kotlin/universe/constellation/orion/viewer/test/framework/BaseTest.kt @@ -10,7 +10,6 @@ import androidx.test.platform.app.InstrumentationRegistry import androidx.test.rule.GrantPermissionRule import androidx.test.uiautomator.By import androidx.test.uiautomator.UiDevice -import androidx.test.uiautomator.UiObject2 import androidx.test.uiautomator.Until import org.junit.Assert import org.junit.Assert.assertTrue @@ -46,11 +45,11 @@ abstract class BaseTest { return } - val grant: UiObject2 = device.findObject(By.textContains("Grant")) ?: error("Can't obtain read permissions") + val grant = device.wait(Until.findObject(By.textContains("Grant")), 30000) ?: error("Can't find grant action in warning dialog") + grant.click() - grant.clickAndWait(Until.newWindow(), 1000) - val findObject = device.findObject(By.textContains("Allow")) - findObject.click() + val allowField = device.wait(Until.findObject(By.textContains("Allow")), 10000) + allowField.click() assertTrue(device.findObject(By.checkable(true)).isChecked) device.pressBack() Espresso.onView(ViewMatchers.withId(R.id.view)).check(matches(ViewMatchers.isDisplayed()))