From e3ac4a0b6c7685b8e9f12386b94dd358e93887f8 Mon Sep 17 00:00:00 2001 From: Doug Date: Thu, 2 Jul 2026 10:12:56 +0100 Subject: [PATCH] Fix preview tests/snapshots. --- ElementX/Sources/Mocks/ClientProxyMock.swift | 3 ++- .../UserDetailsEditScreenViewModel.swift | 7 +++++-- .../View/UserDetailsEditScreen.swift | 13 ++++++++----- .../PreviewTests/spacesScreen.Empty-iPad-en-GB.png | 4 ++-- .../PreviewTests/spacesScreen.Empty-iPad-pseudo.png | 4 ++-- .../PreviewTests/spacesScreen.iPad-en-GB-0.png | 4 ++-- .../PreviewTests/spacesScreen.iPad-pseudo-0.png | 4 ++-- .../userDetailsEditScreen.Default-iPad-en-GB.png | 4 ++-- .../userDetailsEditScreen.Default-iPad-pseudo.png | 4 ++-- .../userDetailsEditScreen.Default-iPhone-en-GB.png | 4 ++-- .../userDetailsEditScreen.Default-iPhone-pseudo.png | 4 ++-- .../userDetailsEditScreen.Read-Only-iPad-en-GB.png | 4 ++-- .../userDetailsEditScreen.Read-Only-iPad-pseudo.png | 4 ++-- ...userDetailsEditScreen.Read-Only-iPhone-en-GB.png | 4 ++-- ...serDetailsEditScreen.Read-Only-iPhone-pseudo.png | 4 ++-- 15 files changed, 39 insertions(+), 32 deletions(-) diff --git a/ElementX/Sources/Mocks/ClientProxyMock.swift b/ElementX/Sources/Mocks/ClientProxyMock.swift index 5199e80b0..e97f8c6a9 100644 --- a/ElementX/Sources/Mocks/ClientProxyMock.swift +++ b/ElementX/Sources/Mocks/ClientProxyMock.swift @@ -14,6 +14,7 @@ struct ClientProxyMockConfiguration { var homeserver = "" var userIDServerName: String? var userID: String = RoomMemberProxyMock.mockMe.userID + var displayName: String? = "User display name" var deviceID: String? var roomSummaryProvider: RoomSummaryProviderProtocol = RoomSummaryProviderMock(.init()) var spaceServiceConfiguration: SpaceServiceProxyMock.Configuration = .init() @@ -64,7 +65,7 @@ extension ClientProxyMock { verificationStatePublisher = .init(.unknown) homeserverReachabilityPublisher = .init(.reachable) - userProfilePublisher = .init(UserProfile(userID: configuration.userID, displayName: "User display name")) + userProfilePublisher = .init(UserProfile(userID: configuration.userID, displayName: configuration.displayName)) ignoredUsersPublisher = .init([RoomMemberProxyMock].allMembers.map(\.userID)) diff --git a/ElementX/Sources/Screens/Settings/UserDetailsEditScreen/UserDetailsEditScreenViewModel.swift b/ElementX/Sources/Screens/Settings/UserDetailsEditScreen/UserDetailsEditScreenViewModel.swift index fef50aea0..a7ddc5d9e 100644 --- a/ElementX/Sources/Screens/Settings/UserDetailsEditScreen/UserDetailsEditScreenViewModel.swift +++ b/ElementX/Sources/Screens/Settings/UserDetailsEditScreen/UserDetailsEditScreenViewModel.swift @@ -28,8 +28,11 @@ class UserDetailsEditScreenViewModel: UserDetailsEditScreenViewModelType, UserDe self.mediaUploadingPreprocessor = mediaUploadingPreprocessor self.userIndicatorController = userIndicatorController - super.init(initialViewState: UserDetailsEditScreenViewState(currentUserProfile: clientProxy.userProfilePublisher.value, - bindings: .init()), mediaProvider: userSession.mediaProvider) + let profile = clientProxy.userProfilePublisher.value + super.init(initialViewState: UserDetailsEditScreenViewState(currentUserProfile: profile, + selectedAvatarURL: profile.avatarURL, + bindings: .init(name: profile.displayName ?? "")), + mediaProvider: userSession.mediaProvider) clientProxy.userProfilePublisher .receive(on: DispatchQueue.main) diff --git a/ElementX/Sources/Screens/Settings/UserDetailsEditScreen/View/UserDetailsEditScreen.swift b/ElementX/Sources/Screens/Settings/UserDetailsEditScreen/View/UserDetailsEditScreen.swift index 5a01cb424..9aa2aed35 100644 --- a/ElementX/Sources/Screens/Settings/UserDetailsEditScreen/View/UserDetailsEditScreen.swift +++ b/ElementX/Sources/Screens/Settings/UserDetailsEditScreen/View/UserDetailsEditScreen.swift @@ -138,10 +138,13 @@ struct UserDetailsEditScreen_Previews: PreviewProvider, TestablePreview { } static func makeViewModel(canChangeProfile: Bool = true) -> UserDetailsEditScreenViewModel { - UserDetailsEditScreenViewModel(userSession: UserSessionMock(.init(clientProxy: ClientProxyMock(.init(userID: "@stefan:matrix.org", - canChangeAvatar: canChangeProfile, - canChangeDisplayName: canChangeProfile)))), - mediaUploadingPreprocessor: .init(appSettings: .volatile()), - userIndicatorController: UserIndicatorControllerMock()) + let userSession = UserSessionMock(.init(clientProxy: ClientProxyMock(.init(userID: "@stefan:matrix.org", + displayName: "Stefan", + canChangeAvatar: canChangeProfile, + canChangeDisplayName: canChangeProfile)))) + + return UserDetailsEditScreenViewModel(userSession: userSession, + mediaUploadingPreprocessor: .init(appSettings: .volatile()), + userIndicatorController: UserIndicatorControllerMock()) } } diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spacesScreen.Empty-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spacesScreen.Empty-iPad-en-GB.png index 2cf681543..e72b0581b 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spacesScreen.Empty-iPad-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spacesScreen.Empty-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa1fa146de0f25c7743d233d3fe9fd987c2e46c6cd01d8b766feced06c8cf67c -size 114615 +oid sha256:e27fa446df33f4b718c19f00231fa293663d376db6944d2d0942221da39f5f66 +size 114220 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spacesScreen.Empty-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spacesScreen.Empty-iPad-pseudo.png index 168516575..aca6f594a 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spacesScreen.Empty-iPad-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spacesScreen.Empty-iPad-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e5a7889956adf519d313cbf0ff64ad9027e61e3a07cdeb62c67948cf4b3fbf3 -size 121956 +oid sha256:97d71b79f2d660d4d6d3c233658f71dd972b104b91ea48bf669556b7b68d440f +size 121565 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spacesScreen.iPad-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spacesScreen.iPad-en-GB-0.png index 733146fc2..ef2e1bb02 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spacesScreen.iPad-en-GB-0.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spacesScreen.iPad-en-GB-0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4cda062114a6ae3c5b7cdb35505f17eb722d685c5613702f501c5b0f1495ff5e -size 196187 +oid sha256:ca35d5ffe84d33bb1543afb28bd339b104baf5275071412ee8a7c05b9c9878e1 +size 195783 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spacesScreen.iPad-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spacesScreen.iPad-pseudo-0.png index 283928503..4dee5e932 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spacesScreen.iPad-pseudo-0.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spacesScreen.iPad-pseudo-0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c54de901975dcfccdbc9d59b3bb72367cd7a78c6b5634d9b992523da58aca64b -size 227152 +oid sha256:667c80f11b62c14610743421adbef716541a608634a6bde5cddd5f5c0ffcd7f8 +size 226754 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Default-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Default-iPad-en-GB.png index bc92eecba..71e877da7 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Default-iPad-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Default-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:145d98855ec52e57e84eeea9f0e9e830b17af9a1768e9e92b3fae89301c13363 -size 105772 +oid sha256:f88be94b9c74e2683b5a3ff88818b7613d7071dbdca20fe2b1d678baacd09160 +size 103325 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Default-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Default-iPad-pseudo.png index 3e611249e..91fa053a5 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Default-iPad-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Default-iPad-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c8082f4d427c5a6576823411f85dd435b994d067b97cfcaeff4ac2d1f6b0e6a -size 108812 +oid sha256:54120c7cd37fe5fc2f65c55690ad532a00dc1f4d11deace70b5b506c0b661d49 +size 105648 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Default-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Default-iPhone-en-GB.png index 4ff043fdc..cd3f980e6 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Default-iPhone-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Default-iPhone-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2be135c4d993374eba85f7c8035dea2d5318fe199627c4b59fc4af1a31daecb9 -size 54325 +oid sha256:fffde9f406949d19cd20dbeb4ab92d4ff8c67094fa445df1cba79b58963108ed +size 52110 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Default-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Default-iPhone-pseudo.png index 550787065..377d93692 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Default-iPhone-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Default-iPhone-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:947c3a92b8017c04740212ddd7da98138623c6ca0396b235ec4055ac57d24647 -size 59340 +oid sha256:50c7d5b3f25f15a598ff8f30ee5b5d5ff070535f2ef00b532a961517852c2815 +size 54779 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Read-Only-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Read-Only-iPad-en-GB.png index bc92eecba..71e877da7 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Read-Only-iPad-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Read-Only-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:145d98855ec52e57e84eeea9f0e9e830b17af9a1768e9e92b3fae89301c13363 -size 105772 +oid sha256:f88be94b9c74e2683b5a3ff88818b7613d7071dbdca20fe2b1d678baacd09160 +size 103325 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Read-Only-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Read-Only-iPad-pseudo.png index 3e611249e..91fa053a5 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Read-Only-iPad-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Read-Only-iPad-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c8082f4d427c5a6576823411f85dd435b994d067b97cfcaeff4ac2d1f6b0e6a -size 108812 +oid sha256:54120c7cd37fe5fc2f65c55690ad532a00dc1f4d11deace70b5b506c0b661d49 +size 105648 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Read-Only-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Read-Only-iPhone-en-GB.png index 4ff043fdc..cd3f980e6 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Read-Only-iPhone-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Read-Only-iPhone-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2be135c4d993374eba85f7c8035dea2d5318fe199627c4b59fc4af1a31daecb9 -size 54325 +oid sha256:fffde9f406949d19cd20dbeb4ab92d4ff8c67094fa445df1cba79b58963108ed +size 52110 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Read-Only-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Read-Only-iPhone-pseudo.png index 550787065..377d93692 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Read-Only-iPhone-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/userDetailsEditScreen.Read-Only-iPhone-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:947c3a92b8017c04740212ddd7da98138623c6ca0396b235ec4055ac57d24647 -size 59340 +oid sha256:50c7d5b3f25f15a598ff8f30ee5b5d5ff070535f2ef00b532a961517852c2815 +size 54779