ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-02 21:33:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up mock creation. (#5627)

Browse Source 
* Use our standard XYZMock(.init()) pattern everywhere instead of XYZMock.default.

* Remove the configuration parameter label on mock convenience inits.

* Update the enterprise submodule.
This commit is contained in:
Doug
2026-05-22 17:34:35 +01:00
committed by GitHub
parent edd7130a97
commit 08d02001bf
146 changed files with 540 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Other/Pills/PillView.swift
+1 -1
View File
@@ -42,7 +42,7 @@ struct PillView: View {
}
struct PillView_Previews: PreviewProvider, TestablePreview {
static let mockMediaProvider = MediaProviderMock(configuration: .init())
static let mockMediaProvider = MediaProviderMock(.init())
static var previews: some View {
PillView(context: PillContext.mock(viewState: .mention(isOwnMention: false,
ElementX/Sources/Other/SwiftUI/Animation/ShimmerModifier.swift
+1 -1
View File
@@ -71,7 +71,7 @@ struct ShimmerOverlay_Previews: PreviewProvider, TestablePreview {
static var previews: some View {
VStack(spacing: 0) {
ForEach(0...8, id: \.self) { _ in
HomeScreenRoomCell(room: .placeholder(), isSelected: false, mediaProvider: MediaProviderMock(configuration: .init())) { _ in }
HomeScreenRoomCell(room: .placeholder(), isSelected: false, mediaProvider: MediaProviderMock(.init())) { _ in }
}
}
.redacted(reason: .placeholder)
ElementX/Sources/Other/SwiftUI/Views/AvatarHeaderView.swift
+6 -6
View File
@@ -256,7 +256,7 @@ struct AvatarHeaderView_Previews: PreviewProvider, TestablePreview {
isDirect: false,
historySharingState: nil),
avatarSize: .room(on: .details),
mediaProvider: MediaProviderMock(configuration: .init())) {
mediaProvider: MediaProviderMock(.init())) {
HStack(spacing: 32) {
ShareLink(item: "test") {
CompoundIcon(\.shareIos)
@@ -270,7 +270,7 @@ struct AvatarHeaderView_Previews: PreviewProvider, TestablePreview {
Form {
AvatarHeaderView(accountOwner: RoomMemberDetails(withProxy: RoomMemberProxyMock.mockMe), dmRecipient: RoomMemberDetails(withProxy: RoomMemberProxyMock.mockAlice),
mediaProvider: MediaProviderMock(configuration: .init())) {
mediaProvider: MediaProviderMock(.init())) {
HStack(spacing: 32) {
ShareLink(item: "test") {
CompoundIcon(\.shareIos)
@@ -285,16 +285,16 @@ struct AvatarHeaderView_Previews: PreviewProvider, TestablePreview {
VStack(spacing: 16) {
AvatarHeaderView(member: RoomMemberDetails(withProxy: RoomMemberProxyMock.mockAlice),
avatarSize: .room(on: .details),
mediaProvider: MediaProviderMock(configuration: .init())) { Text("") }
mediaProvider: MediaProviderMock(.init())) { Text("") }
AvatarHeaderView(member: RoomMemberDetails(withProxy: RoomMemberProxyMock.mockBob),
isVerified: true,
avatarSize: .room(on: .details),
mediaProvider: MediaProviderMock(configuration: .init())) { Text("") }
mediaProvider: MediaProviderMock(.init())) { Text("") }
AvatarHeaderView(member: RoomMemberDetails(withProxy: RoomMemberProxyMock.mockBanned[3]),
avatarSize: .room(on: .details),
mediaProvider: MediaProviderMock(configuration: .init())) { Text("") }
mediaProvider: MediaProviderMock(.init())) { Text("") }
}
.padding()
.background(Color.compound.bgSubtleSecondaryLevel0)
@@ -319,7 +319,7 @@ struct AvatarHeaderView_Previews: PreviewProvider, TestablePreview {
isDirect: false,
historySharingState: state),
avatarSize: .room(on: .details),
mediaProvider: MediaProviderMock(configuration: .init())) {
mediaProvider: MediaProviderMock(.init())) {
HStack(spacing: 32) {
ShareLink(item: "test") {
CompoundIcon(\.shareIos)
ElementX/Sources/Other/SwiftUI/Views/EditAvatarButtonStyle.swift
+2 -2
View File
@@ -50,7 +50,7 @@ struct EditAvatarButtonStyle_Previews: PreviewProvider {
LoadableAvatarImage(url: nil,
name: "Test", contentID: "test",
avatarSize: .user(on: .editUserDetails),
mediaProvider: MediaProviderMock(configuration: .init()))
mediaProvider: MediaProviderMock(.init()))
}
.buttonStyle(EditAvatarButtonStyle())
@@ -58,7 +58,7 @@ struct EditAvatarButtonStyle_Previews: PreviewProvider {
LoadableAvatarImage(url: nil,
name: "Test", contentID: "test",
avatarSize: .user(on: .editUserDetails),
mediaProvider: MediaProviderMock(configuration: .init()))
mediaProvider: MediaProviderMock(.init()))
}
.buttonStyle(EditAvatarButtonStyle())
.disabled(true)
ElementX/Sources/Other/SwiftUI/Views/JoinedMembersBadgeView.swift
+1 -1
View File
@@ -71,7 +71,7 @@ struct JoinedMembersBadgeView: View {
// MARK: - Previews
struct JoinedMembersBadgeView_Previews: PreviewProvider, TestablePreview {
static let mediaProvider = MediaProviderMock(configuration: .init())
static let mediaProvider = MediaProviderMock(.init())
static var previews: some View {
VStack(spacing: 16) {
ElementX/Sources/Other/SwiftUI/Views/LoadableImage.swift
+1 -1
View File
@@ -398,7 +398,7 @@ struct LoadableImage_Previews: PreviewProvider, TestablePreview {
}
static func makeMediaProvider(isLoading: Bool = false) -> MediaProviderProtocol {
let mediaProvider = MediaProviderMock(configuration: .init())
let mediaProvider = MediaProviderMock(.init())
if isLoading {
mediaProvider.imageFromSourceSizeClosure = { _, _ in nil }
ElementX/Sources/Other/SwiftUI/Views/LocationMarkerView.swift
+2 -2
View File
@@ -141,7 +141,7 @@ struct LocationMarkerView_Previews: PreviewProvider, TestablePreview {
// Static user with avatar
LocationMarkerView(kind: .staticUser(.mockDan),
mediaProvider: MediaProviderMock(configuration: .init()))
mediaProvider: MediaProviderMock(.init()))
// Static user without avatar
LocationMarkerView(kind: .staticUser(.init(userID: "@someone:matrix.org",
@@ -149,7 +149,7 @@ struct LocationMarkerView_Previews: PreviewProvider, TestablePreview {
// Live user with avatar
LocationMarkerView(kind: .liveUser(.mockDan),
mediaProvider: MediaProviderMock(configuration: .init()))
mediaProvider: MediaProviderMock(.init()))
// Live user without avatar
LocationMarkerView(kind: .liveUser(.init(userID: "@someone:matrix.org",
ElementX/Sources/Other/SwiftUI/Views/RoomAvatarImage.swift
+8 -8
View File
@@ -134,27 +134,27 @@ struct RoomAvatarImage_Previews: PreviewProvider, TestablePreview {
name: "Room",
avatarURL: nil),
avatarSize: .room(on: .chats),
mediaProvider: MediaProviderMock(configuration: .init()))
mediaProvider: MediaProviderMock(.init()))
RoomAvatarImage(avatar: .room(id: "!2:server.com",
name: "Room",
avatarURL: .mockMXCAvatar),
avatarSize: .room(on: .chats),
mediaProvider: MediaProviderMock(configuration: .init()))
mediaProvider: MediaProviderMock(.init()))
RoomAvatarImage(avatar: .space(id: "!space:server.com",
name: "Room",
avatarURL: nil),
avatarSize: .room(on: .chats),
mediaProvider: MediaProviderMock(configuration: .init()))
mediaProvider: MediaProviderMock(.init()))
RoomAvatarImage(avatar: .space(id: "!otherspace:server.com",
name: "Room",
avatarURL: .mockMXCAvatar),
avatarSize: .room(on: .chats),
mediaProvider: MediaProviderMock(configuration: .init()))
mediaProvider: MediaProviderMock(.init()))
RoomAvatarImage(avatar: .tombstoned, avatarSize: .room(on: .chats), mediaProvider: MediaProviderMock(configuration: .init()))
RoomAvatarImage(avatar: .tombstoned, avatarSize: .room(on: .chats), mediaProvider: MediaProviderMock(.init()))
}
HStack(spacing: 12) {
@@ -162,18 +162,18 @@ struct RoomAvatarImage_Previews: PreviewProvider, TestablePreview {
displayName: "User",
avatarURL: nil)]),
avatarSize: .room(on: .chats),
mediaProvider: MediaProviderMock(configuration: .init()))
mediaProvider: MediaProviderMock(.init()))
RoomAvatarImage(avatar: .heroes([.init(userID: "@user:server.com",
displayName: "User",
avatarURL: .mockMXCAvatar)]),
avatarSize: .room(on: .chats),
mediaProvider: MediaProviderMock(configuration: .init()))
mediaProvider: MediaProviderMock(.init()))
RoomAvatarImage(avatar: .heroes([.init(userID: "@alice:server.com", displayName: "Alice", avatarURL: nil),
.init(userID: "@bob:server.net", displayName: "Bob", avatarURL: nil)]),
avatarSize: .room(on: .chats),
mediaProvider: MediaProviderMock(configuration: .init()))
mediaProvider: MediaProviderMock(.init()))
}
}
}
ElementX/Sources/Other/SwiftUI/Views/RoomHeaderView.swift
+1 -1
View File
@@ -140,7 +140,7 @@ struct RoomHeaderView_Previews: PreviewProvider, TestablePreview {
dmRecipientVerificationState: verificationState,
roomHistorySharingState: historySharingState,
mediaProvider: MediaProviderMock(configuration: .init())) { }
mediaProvider: MediaProviderMock(.init())) { }
.padding()
}
}
ElementX/Sources/Other/SwiftUI/Views/RoomInviterLabel.swift
+4 -4
View File
@@ -65,13 +65,13 @@ struct RoomInviterLabel_Previews: PreviewProvider, TestablePreview {
static var previews: some View {
VStack(spacing: 10) {
RoomInviterLabel(inviter: .init(member: RoomMemberProxyMock.mockAlice),
mediaProvider: MediaProviderMock(configuration: .init()))
mediaProvider: MediaProviderMock(.init()))
RoomInviterLabel(inviter: .init(member: RoomMemberProxyMock.mockDan),
mediaProvider: MediaProviderMock(configuration: .init()))
mediaProvider: MediaProviderMock(.init()))
RoomInviterLabel(inviter: .init(member: RoomMemberProxyMock.mockNoName),
mediaProvider: MediaProviderMock(configuration: .init()))
mediaProvider: MediaProviderMock(.init()))
RoomInviterLabel(inviter: .init(member: RoomMemberProxyMock.mockCharlie),
mediaProvider: MediaProviderMock(configuration: .init()))
mediaProvider: MediaProviderMock(.init()))
.foregroundStyle(.compound.textPrimary)
}
.font(.compound.bodyMD)
ElementX/Sources/Other/SwiftUI/Views/UserProfileListRow.swift
+5 -5
View File
@@ -68,21 +68,21 @@ struct UserProfileCell_Previews: PreviewProvider, TestablePreview {
static var previews: some View {
Form {
UserProfileListRow(user: .mockAlice, membership: nil, mediaProvider: MediaProviderMock(configuration: .init()),
UserProfileListRow(user: .mockAlice, membership: nil, mediaProvider: MediaProviderMock(.init()),
kind: .multiSelection(isSelected: true, action: action))
UserProfileListRow(user: .mockBob, membership: nil, mediaProvider: MediaProviderMock(configuration: .init()),
UserProfileListRow(user: .mockBob, membership: nil, mediaProvider: MediaProviderMock(.init()),
kind: .multiSelection(isSelected: false, action: action))
UserProfileListRow(user: .mockCharlie, membership: .join, mediaProvider: MediaProviderMock(configuration: .init()),
UserProfileListRow(user: .mockCharlie, membership: .join, mediaProvider: MediaProviderMock(.init()),
kind: .multiSelection(isSelected: true, action: action))
.disabled(true)
UserProfileListRow(user: .init(userID: "@someone:matrix.org"), membership: .join, mediaProvider: MediaProviderMock(configuration: .init()),
UserProfileListRow(user: .init(userID: "@someone:matrix.org"), membership: .join, mediaProvider: MediaProviderMock(.init()),
kind: .multiSelection(isSelected: false, action: action))
.disabled(true)
UserProfileListRow(user: .init(userID: "@someone:matrix.org"), membership: nil, mediaProvider: MediaProviderMock(configuration: .init()),
UserProfileListRow(user: .init(userID: "@someone:matrix.org"), membership: nil, mediaProvider: MediaProviderMock(.init()),
kind: .multiSelection(isSelected: false, action: action))
}
.compoundList()