From d4043df61e9acc8cca294a943af16042b99ca041 Mon Sep 17 00:00:00 2001 From: DongHyeon Park Date: Thu, 15 Aug 2024 21:28:45 +0900 Subject: [PATCH 1/2] ISSUE-652: define ALLOW_ALL & ALLOW_SELECTED on Permissions.Button (#653) --- .../com/kaspersky/kaspresso/device/permissions/Permissions.kt | 2 ++ .../kaspersky/kaspresso/device/permissions/PermissionsImpl.kt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/kaspresso/src/main/kotlin/com/kaspersky/kaspresso/device/permissions/Permissions.kt b/kaspresso/src/main/kotlin/com/kaspersky/kaspresso/device/permissions/Permissions.kt index e0f0efa73..9862b14f0 100644 --- a/kaspresso/src/main/kotlin/com/kaspersky/kaspresso/device/permissions/Permissions.kt +++ b/kaspresso/src/main/kotlin/com/kaspersky/kaspresso/device/permissions/Permissions.kt @@ -29,6 +29,8 @@ interface Permissions { ALLOW, ALLOW_ALWAYS, ALLOW_FOREGROUND, + ALLOW_ALL, + ALLOW_SELECTED, DENY } } diff --git a/kaspresso/src/main/kotlin/com/kaspersky/kaspresso/device/permissions/PermissionsImpl.kt b/kaspresso/src/main/kotlin/com/kaspersky/kaspresso/device/permissions/PermissionsImpl.kt index 69990e326..684c96539 100644 --- a/kaspresso/src/main/kotlin/com/kaspersky/kaspresso/device/permissions/PermissionsImpl.kt +++ b/kaspresso/src/main/kotlin/com/kaspersky/kaspresso/device/permissions/PermissionsImpl.kt @@ -34,6 +34,8 @@ class PermissionsImpl( Permissions.Button.ALLOW to getResIdWithPackageName("permission_allow_button"), Permissions.Button.ALLOW_ALWAYS to getResIdWithPackageName("permission_allow_always_button"), Permissions.Button.ALLOW_FOREGROUND to getResIdWithPackageName("permission_allow_foreground_only_button"), + Permissions.Button.ALLOW_ALL to getResIdWithPackageName("permission_allow_all_button"), + Permissions.Button.ALLOW_SELECTED to getResIdWithPackageName("permission_allow_selected_button"), Permissions.Button.DENY to getResIdWithPackageName("permission_deny_button") ) From c9edb880332da04abc9d5ad42ef7efc8c83ed7a4 Mon Sep 17 00:00:00 2001 From: Nikita Date: Fri, 16 Aug 2024 10:20:34 +0300 Subject: [PATCH 2/2] TECH: Try to fix tests (#659) * TECH: Try to fix tests * TECH: Update docker image --- .cirrus.yml | 12 +++++++----- gradle/libs.versions.toml | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index d4ad0da78..da569ddb5 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -6,7 +6,7 @@ check_android_30_task: skip: "changesIncludeOnly('NOTICE.txt', 'LICENSE.txt', '**.{md,html}')" container: - image: ghcr.io/cirruslabs/flutter:latest + image: ghcr.io/cirruslabs/android-sdk:34 kvm: true cpu: 8 memory: 24G @@ -14,8 +14,9 @@ check_android_30_task: java -jar artifacts/adbserver-desktop.jar || true accept_licenses_script: echo yes | sdkmanager --licenses - install_emulator_script: + install_emulator_script: | # x86_64 somehow affect the "call" test + sdkmanager "emulator" sdkmanager --install "system-images;android-30;google_apis;x86" create_avd_script: | echo no | avdmanager create avd --force -n emulator -k "system-images;android-30;google_apis;x86" @@ -74,7 +75,7 @@ check_android_33_task: skip: "changesIncludeOnly('NOTICE.txt', 'LICENSE.txt', '**.{md,html}')" container: - image: ghcr.io/cirruslabs/flutter:latest + image: ghcr.io/cirruslabs/android-sdk:34 kvm: true cpu: 8 memory: 24G @@ -82,7 +83,8 @@ check_android_33_task: java -jar artifacts/adbserver-desktop.jar || true accept_licenses_script: echo yes | sdkmanager --licenses - install_emulator_script: + install_emulator_script: | + sdkmanager "emulator" sdkmanager --install "system-images;android-33;google_apis;x86_64" create_avd_script: | echo no | avdmanager create avd --force -n emulator -k "system-images;android-33;google_apis;x86_64" @@ -138,7 +140,7 @@ check_android_21_task: skip: "changesIncludeOnly('NOTICE.txt', 'LICENSE.txt', '**.{md,html}')" container: - image: ghcr.io/cirruslabs/flutter:latest + image: ghcr.io/cirruslabs/android-sdk:34 kvm: true cpu: 8 memory: 24G diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2e9f7b32d..386d26dae 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ allure = "2.4.0" compose = "1.5.4" composeCompiler = "1.4.8" activityCompose = "1.4.0" -androidXTest = "1.5.0" +androidXTest = "1.6.1" testOrchestrator = "1.4.2" lifecycle = "2.6.2" thirdPartyReport = "0.19.1035"