Merge branch gil/SP1_space_creation into gil/5230_SP2-Adding_Rooms_to_Spaces

This commit is contained in:
Gil Eluard
2022-02-04 16:43:43 +01:00
539 changed files with 20779 additions and 3503 deletions
@@ -30,7 +30,7 @@ class MatrixItemChooserService: MatrixItemChooserServiceProtocol {
// MARK: Private
private let processingQueue = DispatchQueue(label: "org.matrix.element.MatrixItemChooserService.processingQueue")
private let processingQueue = DispatchQueue(label: "io.element.element.MatrixItemChooserService.processingQueue")
private let completionQueue = DispatchQueue.main
private let session: MXSession
@@ -66,7 +66,7 @@ class MatrixItemChooserService: MatrixItemChooserServiceProtocol {
}
case .room:
self.items = session.rooms.compactMap { room in
if room.summary.roomType == .space || room.isDirect {
if room.summary.roomType == .space {
return nil
}
@@ -43,7 +43,6 @@ class MatrixItemChooserUITests: MockScreenTest {
func verifyEmptyScreen() {
XCTAssertEqual(app.staticTexts["titleText"].label, VectorL10n.spacesCreationAddRoomsTitle)
XCTAssertEqual(app.staticTexts["messageText"].label, VectorL10n.spacesCreationAddRoomsMessage)
XCTAssertEqual(app.collectionViews["itemsList"].exists, false)
XCTAssertEqual(app.staticTexts["emptyListMessage"].exists, true)
XCTAssertEqual(app.staticTexts["emptyListMessage"].label, VectorL10n.spacesNoResultFoundTitle)
XCTAssertEqual(app.buttons["doneButton"].label, VectorL10n.skip)
@@ -52,7 +51,6 @@ class MatrixItemChooserUITests: MockScreenTest {
func verifyPopulatedScreen() {
XCTAssertEqual(app.staticTexts["titleText"].label, VectorL10n.spacesCreationAddRoomsTitle)
XCTAssertEqual(app.staticTexts["messageText"].label, VectorL10n.spacesCreationAddRoomsMessage)
XCTAssertEqual(app.collectionViews["itemsList"].exists, true)
XCTAssertEqual(app.staticTexts["emptyListMessage"].exists, false)
XCTAssertEqual(app.buttons["doneButton"].label, VectorL10n.skip)
}
@@ -60,7 +58,6 @@ class MatrixItemChooserUITests: MockScreenTest {
func verifyPopulatedWithSelectionScreen() {
XCTAssertEqual(app.staticTexts["titleText"].label, VectorL10n.spacesCreationAddRoomsTitle)
XCTAssertEqual(app.staticTexts["messageText"].label, VectorL10n.spacesCreationAddRoomsMessage)
XCTAssertEqual(app.collectionViews["itemsList"].exists, true)
XCTAssertEqual(app.staticTexts["emptyListMessage"].exists, false)
XCTAssertEqual(app.buttons["doneButton"].label, VectorL10n.next)
}