Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump io.github.fornewid:placeholder-material3 from 1.0.1 to 2.0.0 #130

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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
val DefaultTimeoutMillis: Long get() = System.getenv("DEFAULT_TIMEOUT")?.toLong() ?: 15000L
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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))
)
)
}

Expand Down Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
Loading