From 1e520ed93d5f337c06dedf47a376faa00352ecd4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 12:01:43 +0100 Subject: [PATCH] Bump io.github.fornewid:placeholder-material3 from 1.0.1 to 2.0.0 (#130) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Martin Felber Co-authored-by: Martin Felber <45291671+FelberMartin@users.noreply.github.com> --- .../core/test/test_setup/TestVariables.kt | 2 +- .../ConversationMemberSettingsE2eTest.kt | 25 +++++++------------ gradle/libs.versions.toml | 4 +-- 3 files changed, 12 insertions(+), 19 deletions(-) diff --git a/core/core-test/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/test/test_setup/TestVariables.kt b/core/core-test/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/test/test_setup/TestVariables.kt index dbc20f4f4..af73193f5 100644 --- a/core/core-test/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/test/test_setup/TestVariables.kt +++ b/core/core-test/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/test/test_setup/TestVariables.kt @@ -1,3 +1,3 @@ package de.tum.informatics.www1.artemis.native_app.core.test.test_setup -val DefaultTimeoutMillis: Long get() = System.getenv("DEFAULT_TIMEOUT")?.toLong() ?: 10000L \ No newline at end of file +val DefaultTimeoutMillis: Long get() = System.getenv("DEFAULT_TIMEOUT")?.toLong() ?: 15000L \ No newline at end of file diff --git a/feature/metis/manage-conversations/src/test/kotlin/de/tum/informatics/www1/artemis/native_app/feature/metis/manageconversations/members/ConversationMemberSettingsE2eTest.kt b/feature/metis/manage-conversations/src/test/kotlin/de/tum/informatics/www1/artemis/native_app/feature/metis/manageconversations/members/ConversationMemberSettingsE2eTest.kt index b51c8f4e9..18223e902 100644 --- a/feature/metis/manage-conversations/src/test/kotlin/de/tum/informatics/www1/artemis/native_app/feature/metis/manageconversations/members/ConversationMemberSettingsE2eTest.kt +++ b/feature/metis/manage-conversations/src/test/kotlin/de/tum/informatics/www1/artemis/native_app/feature/metis/manageconversations/members/ConversationMemberSettingsE2eTest.kt @@ -6,7 +6,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.test.ExperimentalTestApi import androidx.compose.ui.test.assert import androidx.compose.ui.test.hasAnyAncestor -import androidx.compose.ui.test.hasAnyDescendant import androidx.compose.ui.test.hasContentDescription import androidx.compose.ui.test.hasTestTag import androidx.compose.ui.test.hasText @@ -15,10 +14,10 @@ import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performScrollTo import androidx.lifecycle.SavedStateHandle -import de.tum.informatics.www1.artemis.native_app.core.common.test.EndToEndTest import de.tum.informatics.www1.artemis.native_app.core.common.test.DefaultTestTimeoutMillis -import de.tum.informatics.www1.artemis.native_app.core.test.test_setup.DefaultTimeoutMillis +import de.tum.informatics.www1.artemis.native_app.core.common.test.EndToEndTest import de.tum.informatics.www1.artemis.native_app.core.common.test.testServerUrl +import de.tum.informatics.www1.artemis.native_app.core.test.test_setup.DefaultTimeoutMillis import de.tum.informatics.www1.artemis.native_app.feature.login.test.user1Username import de.tum.informatics.www1.artemis.native_app.feature.login.test.user2Username import de.tum.informatics.www1.artemis.native_app.feature.login.test.user3Username @@ -83,28 +82,24 @@ class ConversationMemberSettingsE2eTest : ConversationBaseTest() { composeTestRule .onNodeWithTag(testTagForMember(user1Username)) .performScrollTo() - .assert( - hasAnyDescendant(hasText(user1Username)) and hasAnyDescendant( - hasContentDescription(context.getString(R.string.conversation_members_content_description_moderator)) - ) - ) + .assert(hasText(user1Username)) + .assert(hasContentDescription(context.getString(R.string.conversation_members_content_description_moderator)) + ) composeTestRule .onNodeWithTag(testTagForMember(user2Username)) .performScrollTo() .assert( - hasAnyDescendant(hasText(user2Username)) and !hasAnyDescendant( + hasText(user2Username) and ! hasContentDescription(context.getString(R.string.conversation_members_content_description_moderator)) - ) ) composeTestRule .onNodeWithTag(testTagForMember(user2Username)) .performScrollTo() .assert( - hasAnyDescendant(hasText(user2Username)) and !hasAnyDescendant( + hasText(user2Username) and ! hasContentDescription(context.getString(R.string.conversation_members_content_description_moderator)) - ) ) } @@ -186,10 +181,8 @@ class ConversationMemberSettingsE2eTest : ConversationBaseTest() { ) .performClick() - val isModeratorCheck = hasAnyDescendant( - hasContentDescription( - context.getString(R.string.conversation_members_content_description_moderator) - ) + val isModeratorCheck = hasContentDescription( + context.getString(R.string.conversation_members_content_description_moderator) ) composeTestRule.waitUntilExactlyOneExists( diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5d0170b43..fc668c6d8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,7 @@ accompanist = "0.30.1" androidDesugarJdkLibs = "2.0.4" androidxActivity = "1.8.1" androidxAppCompat = "1.6.1" -androidxComposeBom = "2023.10.01" +androidxComposeBom = "2024.06.00" androidxLifecycle = "2.6.2" androidxNavigation = "2.7.5" androidGradlePlugin = "8.7.0" @@ -29,7 +29,7 @@ krossbow = "5.2.0" markwon = "4.6.2" mockk = "1.13.8" ossLicensesPlugin = "0.10.6" -placeholderMaterial = "1.0.1" +placeholderMaterial = "2.0.0" room = "2.6.0" sentry-android = "7.17.0" work = "2.10.0"