Skip to content

Commit a69b221

Browse files
committed
Fix filter tests and add RoomSummaryProvider tests for the default filters.
1 parent 1170109 commit a69b221

13 files changed

+185
-59
lines changed

ElementX.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -570,6 +570,7 @@
570570
6A54F52443EC52AC5CD772C0 /* JoinRoomScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 869A8A4632E511351BFE2EC4 /* JoinRoomScreen.swift */; };
571571
6A64546ABE648ED9E6DBB459 /* RemoteSettingsHook.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5D186A6DB8FAC5C9D0E4D61 /* RemoteSettingsHook.swift */; };
572572
6A916606A8B92FE8A990A219 /* XCTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85A1941B874A3BE9CDDF43EF /* XCTestCase.swift */; };
573+
6AB306367E56A6F6DFA0E2FF /* RoomSummaryProviderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F46E441BA50705E6CEC89FE0 /* RoomSummaryProviderTests.swift */; };
573574
6AD722DD92E465E56D2885AB /* BugReportScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA919F521E9F0EE3638AFC85 /* BugReportScreen.swift */; };
574575
6AEB650311F694A5702255C9 /* UserProfileScreenCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5B4932E4EFBC8FAC10972CD /* UserProfileScreenCoordinator.swift */; };
575576
6B31508C6334C617360C2EAB /* RoomMemberDetailsViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC589E641AE46EFB2962534D /* RoomMemberDetailsViewModelTests.swift */; };
@@ -2679,6 +2680,7 @@
26792680
F409D44C2E6BE50462E82F8A /* en-US */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-US"; path = "en-US.lproj/Localizable.strings"; sourceTree = "<group>"; };
26802681
F4469F6AE311BDC439B3A5EC /* UserSessionMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserSessionMock.swift; sourceTree = "<group>"; };
26812682
F4548A9BDE5CB3AB864BCA9F /* EffectsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EffectsView.swift; sourceTree = "<group>"; };
2683+
F46E441BA50705E6CEC89FE0 /* RoomSummaryProviderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomSummaryProviderTests.swift; sourceTree = "<group>"; };
26822684
F4CEB4590CCF70F0E3C0B171 /* GeneratedAccessibilityTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneratedAccessibilityTests.swift; sourceTree = "<group>"; };
26832685
F506C6ADB1E1DA6638078E11 /* UITests.xctest */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.cfbundle; path = UITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
26842686
F51D674A5B5F1FE1B878E20F /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -4498,6 +4500,7 @@
44984500
48FEFF746DB341CDB18D7AAA /* RoomRolesAndPermissionsScreenViewModelTests.swift */,
44994501
93CF7B19FFCF8EFBE0A8696A /* RoomScreenViewModelTests.swift */,
45004502
AEEAFB646E583655652C3D04 /* RoomStateEventStringBuilderTests.swift */,
4503+
F46E441BA50705E6CEC89FE0 /* RoomSummaryProviderTests.swift */,
45014504
046C0D3F53B0B5EF0A1F5BEA /* RoomSummaryTests.swift */,
45024505
2E88534A39781D76487D59DF /* SecureBackupKeyBackupScreenViewModelTests.swift */,
45034506
848F69921527D31CAACB93AF /* SecureBackupLogoutConfirmationScreenViewModelTests.swift */,
@@ -7168,6 +7171,7 @@
71687171
84C631E734FD2555B39B681C /* RoomRolesAndPermissionsScreenViewModelTests.swift in Sources */,
71697172
46562110EE202E580A5FFD9C /* RoomScreenViewModelTests.swift in Sources */,
71707173
CC0D088F505F33A20DC5590F /* RoomStateEventStringBuilderTests.swift in Sources */,
7174+
6AB306367E56A6F6DFA0E2FF /* RoomSummaryProviderTests.swift in Sources */,
71717175
15913A5B07118C1268A840E4 /* RoomSummaryTests.swift in Sources */,
71727176
7691233E3572A9173FD96CB3 /* SecureBackupKeyBackupScreenViewModelTests.swift in Sources */,
71737177
EB87DF90CF6F8D5D12404C6E /* SecureBackupLogoutConfirmationScreenViewModelTests.swift in Sources */,

ElementX/Sources/Screens/HomeScreen/View/Filters/RoomListFilterView.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,6 @@ struct RoomListFilterView: View {
1919
}
2020
}
2121

22-
struct RoomListFilterView_Previews: PreviewProvider, TestablePreview {
23-
static var previews: some View {
24-
RoomListFilterView(filter: .people, isActive: .constant(false))
25-
RoomListFilterView(filter: .people, isActive: .constant(true))
26-
RoomListFilterView(filter: .lowPriority, isActive: .constant(false))
27-
RoomListFilterView(filter: .lowPriority, isActive: .constant(true))
28-
}
29-
}
30-
3122
private struct FilterToggleStyle: ToggleStyle {
3223
private func strokeColor(isOn: Bool) -> Color {
3324
isOn ? .compound.bgActionPrimaryRest : .compound.borderInteractiveSecondary
@@ -61,3 +52,12 @@ private struct FilterToggleStyle: ToggleStyle {
6152
}
6253
}
6354
}
55+
56+
// MARK: - Previews
57+
58+
struct RoomListFilterView_Previews: PreviewProvider, TestablePreview {
59+
static var previews: some View {
60+
RoomListFilterView(filter: .people, isActive: .constant(false))
61+
RoomListFilterView(filter: .people, isActive: .constant(true))
62+
}
63+
}

ElementX/Sources/Screens/HomeScreen/View/Filters/RoomListFiltersView.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,5 @@ struct RoomListFiltersView_Previews: PreviewProvider, TestablePreview {
9292
appSettings: ServiceLocator.shared.settings)))
9393
RoomListFiltersView(state: .constant(.init(activeFilters: [.lowPriority],
9494
appSettings: ServiceLocator.shared.settings)))
95-
RoomListFiltersView(state: .constant(.init(activeFilters: [.unreads, .lowPriority],
96-
appSettings: ServiceLocator.shared.settings)))
9795
}
9896
}
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)