diff --git a/.github/workflows/functional-test.yml b/.github/workflows/functional-test.yml index 682618c40..aa92d4c06 100644 --- a/.github/workflows/functional-test.yml +++ b/.github/workflows/functional-test.yml @@ -12,18 +12,26 @@ jobs: fail-fast: false matrix: include: + - platformVersion: "13.0" + apiLevel: 33 + emuTag: google_apis + arch: x86_64 - platformVersion: "11.0" apiLevel: 30 emuTag: google_apis + arch: x86 - platformVersion: "9.0" apiLevel: 28 emuTag: default + arch: x86 - platformVersion: "7.1" apiLevel: 25 emuTag: default + arch: x86 - platformVersion: "5.1" apiLevel: 22 emuTag: default + arch: x86 env: CI: true @@ -58,6 +66,7 @@ jobs: api-level: ${{ matrix.apiLevel }} disable-spellchecker: true target: ${{ matrix.emuTag }} + arch: ${{ matrix.arch }} - name: Save logcat output if: ${{ always() }} uses: actions/upload-artifact@master diff --git a/app/src/androidTestE2eTest/java/io/appium/uiautomator2/unittest/test/AlertCommandsTest.java b/app/src/androidTestE2eTest/java/io/appium/uiautomator2/unittest/test/AlertCommandsTest.java index d279a19fa..2e0b3cedf 100644 --- a/app/src/androidTestE2eTest/java/io/appium/uiautomator2/unittest/test/AlertCommandsTest.java +++ b/app/src/androidTestE2eTest/java/io/appium/uiautomator2/unittest/test/AlertCommandsTest.java @@ -66,7 +66,11 @@ public void verifyDismissingAnAlertWithButton() throws JSONException { Response response = findElement(By.accessibilityId("OK Cancel dialog with a long message")); clickAndWaitForStaleness(response.getElementId()); - response = dismissAlert("CANCEL"); + if (Build.VERSION.SDK_INT >= 33) { + response = dismissAlert("Cancel"); + } else { + response = dismissAlert("CANCEL"); + } assertTrue(response.isSuccessful()); }