Merge branch 'develop' into feature/fga/join_space

features/space/api/src/main/kotlin/io/element/android/features/space/api/SpaceEntryPoint.kt

@@ -11,6 +11,7 @@ import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
 import io.element.android.libraries.architecture.FeatureEntryPoint
+import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.matrix.api.core.RoomId
 
 interface SpaceEntryPoint : FeatureEntryPoint {
@@ -27,7 +28,7 @@ interface SpaceEntryPoint : FeatureEntryPoint {
 
     data class Inputs(
         val roomId: RoomId
-    ) : Plugin
+    ) : NodeInputs
 
     interface Callback : Plugin {
         fun onOpenRoom(roomId: RoomId)

features/space/impl/build.gradle.kts

@@ -1,4 +1,5 @@
 import extension.setupDependencyInjection
+import extension.testCommonDependencies
 
 /*
  * Copyright 2025 New Vector Ltd.
@@ -40,18 +41,9 @@ dependencies {
     implementation(projects.libraries.previewutils)
     api(projects.features.space.api)
 
-    testImplementation(libs.test.junit)
-    testImplementation(libs.test.mockk)
-    testImplementation(libs.coroutines.test)
-    testImplementation(libs.molecule.runtime)
-    testImplementation(libs.test.truth)
-    testImplementation(libs.test.turbine)
-    testImplementation(libs.test.robolectric)
+    testCommonDependencies(libs, true)
     testImplementation(projects.services.analytics.test)
     testImplementation(projects.libraries.matrix.test)
     testImplementation(projects.libraries.featureflag.test)
-    testImplementation(projects.tests.testutils)
-    testImplementation(libs.androidx.compose.ui.test.junit)
     testImplementation(projects.features.invite.test)
-    testReleaseImplementation(libs.androidx.compose.ui.test.manifest)
 }

features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceNode.kt

@@ -16,6 +16,7 @@ import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.Inject
 import io.element.android.annotations.ContributesNode
 import io.element.android.features.space.api.SpaceEntryPoint
+import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.di.SessionScope
 
 @ContributesNode(SessionScope::class)
@@ -25,7 +26,7 @@ class SpaceNode(
     @Assisted plugins: List<Plugin>,
     presenterFactory: SpacePresenter.Factory,
 ) : Node(buildContext, plugins = plugins) {
-    private val inputs = plugins.filterIsInstance<SpaceEntryPoint.Inputs>().single()
+    private val inputs: SpaceEntryPoint.Inputs = inputs()
     private val callback = plugins.filterIsInstance<SpaceEntryPoint.Callback>().single()
     private val presenter = presenterFactory.create(inputs)
 

features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpacePresenter.kt

@@ -39,7 +39,7 @@ class SpacePresenter(
     private val seenInvitesStore: SeenInvitesStore,
 ) : Presenter<SpaceState> {
     @AssistedFactory
-    interface Factory {
+    fun interface Factory {
         fun create(inputs: SpaceEntryPoint.Inputs): SpacePresenter
     }
 

features/space/impl/src/test/kotlin/io/element/android/features/space/impl/DefaultSpaceEntryPointTest.kt

@@ -0,0 +1,64 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.space.impl
+
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import com.bumble.appyx.core.modality.BuildContext
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.invite.test.InMemorySeenInvitesStore
+import io.element.android.features.space.api.SpaceEntryPoint
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.libraries.matrix.test.FakeMatrixClient
+import io.element.android.libraries.matrix.test.spaces.FakeSpaceRoomList
+import io.element.android.libraries.matrix.test.spaces.FakeSpaceService
+import io.element.android.tests.testutils.lambda.lambdaError
+import io.element.android.tests.testutils.node.TestParentNode
+import org.junit.Rule
+import org.junit.Test
+
+class DefaultSpaceEntryPointTest {
+    @get:Rule
+    val instantTaskExecutorRule = InstantTaskExecutorRule()
+
+    @Test
+    fun `test node builder`() {
+        val entryPoint = DefaultSpaceEntryPoint()
+        val nodeInputs = SpaceEntryPoint.Inputs(A_ROOM_ID)
+        val parentNode = TestParentNode.create { buildContext, plugins ->
+            SpaceNode(
+                buildContext = buildContext,
+                plugins = plugins,
+                presenterFactory = { inputs ->
+                    assertThat(inputs).isEqualTo(nodeInputs)
+                    SpacePresenter(
+                        inputs = inputs,
+                        client = FakeMatrixClient(
+                            spaceService = FakeSpaceService(
+                                spaceRoomListResult = { FakeSpaceRoomList() },
+                            )
+                        ),
+                        seenInvitesStore = InMemorySeenInvitesStore(),
+                    )
+                },
+            )
+        }
+        val callback = object : SpaceEntryPoint.Callback {
+            override fun onOpenRoom(roomId: RoomId) {
+                lambdaError()
+            }
+        }
+        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
+            .inputs(nodeInputs)
+            .callback(callback)
+            .build()
+        assertThat(result).isInstanceOf(SpaceNode::class.java)
+        assertThat(result.plugins).contains(nodeInputs)
+        assertThat(result.plugins).contains(callback)
+    }
+}