Room navigation : fix tests on invite after the refactoring

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt

@@ -100,3 +100,4 @@ interface MatrixClient : Closeable {
     suspend fun trackRecentlyVisitedRoom(roomId: RoomId): Result<Unit>
     suspend fun getRecentlyVisitedRooms(): Result<List<RoomId>>
 }
+

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt

@@ -29,6 +29,7 @@ import io.element.android.libraries.matrix.api.notificationsettings.Notification
 import io.element.android.libraries.matrix.api.oidc.AccountManagementAction
 import io.element.android.libraries.matrix.api.pusher.PushersService
 import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.MatrixRoomInfo
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
 import io.element.android.libraries.matrix.api.roomdirectory.RoomDirectoryService
 import io.element.android.libraries.matrix.api.roomlist.RoomListService
@@ -51,7 +52,9 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.test.TestScope
+import java.util.Optional
 
 class FakeMatrixClient(
     override val sessionId: SessionId = A_SESSION_ID,
@@ -94,10 +97,14 @@ class FakeMatrixClient(
     private var setDisplayNameResult: Result<Unit> = Result.success(Unit)
     private var uploadAvatarResult: Result<Unit> = Result.success(Unit)
     private var removeAvatarResult: Result<Unit> = Result.success(Unit)
-    var joinRoomLambda: suspend (RoomId) -> Result<RoomId> = {
+    var joinRoomLambda: (RoomId) -> Result<RoomId> = {
         Result.success(it)
     }
 
+    var getRoomInfoFlowLambda = { _: RoomId ->
+        flowOf<Optional<MatrixRoomInfo>>(Optional.empty())
+    }
+
     override suspend fun getRoom(roomId: RoomId): MatrixRoom? {
         return getRoomResults[roomId]
     }
@@ -267,4 +274,7 @@ class FakeMatrixClient(
     override suspend fun getRecentlyVisitedRooms(): Result<List<RoomId>> {
         return Result.success(visitedRoomsId)
     }
+
+    override fun getRoomInfoFlow(roomId: RoomId) = getRoomInfoFlowLambda(roomId)
+
 }

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt

@@ -182,7 +182,7 @@ class FakeMatrixRoom(
     var removedAvatar: Boolean = false
         private set
 
-    private var leaveRoomError: Throwable? = null
+    var leaveRoomLambda: (() -> Result<Unit>) = { Result.success(Unit) }
 
     private val _roomInfoFlow: MutableSharedFlow<MatrixRoomInfo> = MutableSharedFlow(replay = 1)
     override val roomInfoFlow: Flow<MatrixRoomInfo> = _roomInfoFlow
@@ -315,8 +315,9 @@ class FakeMatrixRoom(
         return Result.success(Unit)
     }
 
-    override suspend fun leave(): Result<Unit> =
-        leaveRoomError?.let { Result.failure(it) } ?: Result.success(Unit)
+    override suspend fun leave(): Result<Unit> {
+        return leaveRoomLambda()
+    }
 
     override suspend fun join(): Result<Unit> {
         return joinRoomResult
@@ -542,10 +543,6 @@ class FakeMatrixRoom(
 
     override fun getWidgetDriver(widgetSettings: MatrixWidgetSettings): Result<MatrixWidgetDriver> = getWidgetDriverResult
 
-    fun givenLeaveRoomError(throwable: Throwable?) {
-        this.leaveRoomError = throwable
-    }
-
     fun givenRoomMembersState(state: MatrixRoomMembersState) {
         membersStateFlow.value = state
     }

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomlist/SimplePagedRoomList.kt

@@ -21,6 +21,7 @@ import io.element.android.libraries.matrix.api.roomlist.RoomList
 import io.element.android.libraries.matrix.api.roomlist.RoomListFilter
 import io.element.android.libraries.matrix.api.roomlist.RoomSummary
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.getAndUpdate
 
@@ -32,6 +33,8 @@ data class SimplePagedRoomList(
     override val pageSize: Int = Int.MAX_VALUE
     override val loadedPages = MutableStateFlow(1)
 
+    override val filteredSummaries: SharedFlow<List<RoomSummary>> = summaries
+
     override suspend fun loadMore() {
         // No-op
         loadedPages.getAndUpdate { it + 1 }

libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/TestTags.kt

@@ -105,4 +105,9 @@ object TestTags {
      * Search field.
      */
     val searchTextField = TestTag("search_text_field")
+
+    /**
+     * Generic call to action
+     */
+    val callToAction = TestTag("call_to_action")
 }