From b6ee8f35ab5774b76a559bf85ee2bc8faf700026 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Apr 2024 09:35:57 +0000 Subject: [PATCH 1/2] feat(deps): bump androidxFragment from 1.5.7 to 1.6.2 Bumps `androidxFragment` from 1.5.7 to 1.6.2. Updates `androidx.fragment:fragment-ktx` from 1.5.7 to 1.6.2 Updates `androidx.fragment:fragment-testing` from 1.5.7 to 1.6.2 --- updated-dependencies: - dependency-name: androidx.fragment:fragment-ktx dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: androidx.fragment:fragment-testing dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2cf413611ae..65747427a37 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,7 +10,7 @@ androidxContraintLayout = "2.1.4" androidxCore = "1.10.1" androidxEnterpriseFeedback = "1.1.0" androidxEspresso = "3.5.1" -androidxFragment = "1.5.7" +androidxFragment = "1.6.2" androidxLegacy = "1.0.0" androidxLifecycle = "2.5.1" androidxLifecycleExtensions = "2.2.0" From ad35faaa91556462483c37051b86ba6be320418c Mon Sep 17 00:00:00 2001 From: Aitorbp Date: Fri, 5 Apr 2024 12:04:32 +0100 Subject: [PATCH 2/2] feat: changed from launch to launchActivityForResult in a ReleaseNotesActivityTest, LoginActivityTest and PassCodeActivityTest --- .../owncloud/android/authentication/LoginActivityTest.kt | 5 +++-- .../android/settings/security/PassCodeActivityTest.kt | 9 +++++---- .../android/ui/activity/ReleaseNotesActivityTest.kt | 6 ++++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/authentication/LoginActivityTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/authentication/LoginActivityTest.kt index 40d91c5dcf3..9fc1a97768b 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/authentication/LoginActivityTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/authentication/LoginActivityTest.kt @@ -4,6 +4,7 @@ * @author Abel García de Prada * @author Juan Carlos Garrote Gascón * @author Jorge Aguado Recio + * @author Aitor Ballesteros Pavón * * Copyright (C) 2024 ownCloud GmbH. * @@ -193,9 +194,9 @@ class LoginActivityTest { every { ocContextProvider.getString(R.string.app_name) } returns BRANDED_APP_NAME activityScenario = if (intent == null) { - ActivityScenario.launch(LoginActivity::class.java) + ActivityScenario.launchActivityForResult(LoginActivity::class.java) } else { - ActivityScenario.launch(intent) + ActivityScenario.launchActivityForResult(intent) } } diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/PassCodeActivityTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/PassCodeActivityTest.kt index c63d232d5db..123284e7ca0 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/PassCodeActivityTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/PassCodeActivityTest.kt @@ -5,8 +5,9 @@ * @author Christian Schabesberger (@theScrabi) * @author Juan Carlos Garrote Gascón (@JuancaG05) * @author David Crespo Ríos (@davcres) + * @author Aitor Ballesteros Pavón (@Aitorbp) * - * Copyright (C) 2021 ownCloud GmbH. + * Copyright (C) 2024 ownCloud GmbH. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -38,12 +39,12 @@ import androidx.test.espresso.matcher.ViewMatchers.withText import com.owncloud.android.R import com.owncloud.android.db.PreferenceManager import com.owncloud.android.domain.utils.Event +import com.owncloud.android.presentation.security.biometric.BiometricViewModel import com.owncloud.android.presentation.security.passcode.PassCodeActivity +import com.owncloud.android.presentation.security.passcode.PassCodeViewModel import com.owncloud.android.presentation.security.passcode.PasscodeAction import com.owncloud.android.presentation.security.passcode.PasscodeType import com.owncloud.android.presentation.security.passcode.Status -import com.owncloud.android.presentation.security.biometric.BiometricViewModel -import com.owncloud.android.presentation.security.passcode.PassCodeViewModel import com.owncloud.android.testutil.security.OC_PASSCODE_4_DIGITS import com.owncloud.android.utils.matchers.isDisplayed import com.owncloud.android.utils.matchers.withChildCountAndId @@ -352,6 +353,6 @@ class PassCodeActivityTest { val intent = Intent(context, PassCodeActivity::class.java).apply { action = mode } - activityScenario = ActivityScenario.launch(intent) + activityScenario = ActivityScenario.launchActivityForResult(intent) } } diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/ui/activity/ReleaseNotesActivityTest.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/ui/activity/ReleaseNotesActivityTest.kt index 192fe47067d..5beba655e55 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/ui/activity/ReleaseNotesActivityTest.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/ui/activity/ReleaseNotesActivityTest.kt @@ -2,7 +2,9 @@ * ownCloud Android client application * * @author David Crespo Ríos - * Copyright (C) 2022 ownCloud GmbH. + * @author Aitor Ballesteros Pavón + * + * Copyright (C) 2024 ownCloud GmbH. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -70,7 +72,7 @@ class ReleaseNotesActivityTest { every { releaseNotesViewModel.getReleaseNotes() } returns releaseNotesList val intent = Intent(context, ReleaseNotesActivity::class.java) - activityScenario = ActivityScenario.launch(intent) + activityScenario = ActivityScenario.launchActivityForResult(intent) } @Test