Skip to content

Commit dbc6313

Browse files
committed
Fix unit tests compilation issues
1 parent 9834878 commit dbc6313

2 files changed

Lines changed: 37 additions & 13 deletions

File tree

Modules/Tests/WordPressCoreTests/MockWordPressClientAPI.swift

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,10 @@ final class MockWordPressClientAPI: WordPressClientAPI, @unchecked Sendable {
8282
fatalError("Not implemented")
8383
}
8484

85-
func uploadMedia(params: MediaCreateParams, fulfilling progress: Progress) async throws -> MediaRequestCreateResponse {
85+
func uploadMedia(
86+
params: MediaCreateParams,
87+
fulfilling progress: Progress
88+
) async throws -> MediaRequestCreateResponse {
8689
fatalError("Not implemented")
8790
}
8891
}
@@ -118,7 +121,9 @@ final class MockUsersRequestExecutor: UsersRequestExecutor {
118121
super.init(unsafeFromHandle: handle)
119122
}
120123

121-
override func retrieveMeWithEditContextCancellation(context: RequestContext?) async throws -> UsersRequestRetrieveMeWithEditContextResponse {
124+
override func retrieveMeWithEditContextCancellation(
125+
context: RequestContext?
126+
) async throws -> UsersRequestRetrieveMeWithEditContextResponse {
122127
let mockUser = UserWithEditContext(
123128
id: UserId(1),
124129
username: "testuser",
@@ -134,7 +139,7 @@ final class MockUsersRequestExecutor: UsersRequestExecutor {
134139
slug: "testuser",
135140
registeredDate: "2024-01-01T00:00:00",
136141
roles: [],
137-
capabilities: [:],
142+
capabilities: UserCapabilitiesMap(map: [:]),
138143
extraCapabilities: [:],
139144
avatarUrls: nil
140145
)
@@ -156,7 +161,10 @@ final class MockThemesRequestExecutor: ThemesRequestExecutor {
156161
super.init(unsafeFromHandle: handle)
157162
}
158163

159-
override func listWithEditContextCancellation(params: ThemeListParams, context: RequestContext?) async throws -> ThemesRequestListWithEditContextResponse {
164+
override func listWithEditContextCancellation(
165+
params: ThemeListParams,
166+
context: RequestContext?
167+
) async throws -> ThemesRequestListWithEditContextResponse {
160168
let mockTheme = ThemeWithEditContext(
161169
stylesheet: ThemeStylesheet(value: "twentytwentyfour"),
162170
template: "twentytwentyfour",
@@ -196,7 +204,9 @@ final class MockSiteSettingsRequestExecutor: SiteSettingsRequestExecutor {
196204
super.init(unsafeFromHandle: handle)
197205
}
198206

199-
override func retrieveWithEditContextCancellation(context: RequestContext?) async throws -> SiteSettingsRequestRetrieveWithEditContextResponse {
207+
override func retrieveWithEditContextCancellation(
208+
context: RequestContext?
209+
) async throws -> SiteSettingsRequestRetrieveWithEditContextResponse {
200210
let mockSettings = SiteSettingsWithEditContext(
201211
title: "Test Site",
202212
description: "A test site",
@@ -217,7 +227,8 @@ final class MockSiteSettingsRequestExecutor: SiteSettingsRequestExecutor {
217227
defaultPingStatus: .open,
218228
defaultCommentStatus: .open,
219229
siteLogo: nil,
220-
siteIcon: 0
230+
siteIcon: 0,
231+
additionalFields: AnyJson(noHandle: AnyJson.NoHandle())
221232
)
222233
let mockHeaderMap = WpNetworkHeaderMap(noHandle: WpNetworkHeaderMap.NoHandle())
223234
return SiteSettingsRequestRetrieveWithEditContextResponse(data: mockSettings, headerMap: mockHeaderMap)

Tests/KeystoneTests/Tests/Services/BlogServiceRemoteCoreRESTSettingsTests.swift

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import Testing
22
import WordPressAPI
3+
import WordPressAPIInternal
34
@testable import WordPress
45
@testable import WordPressKit
56

@@ -19,15 +20,27 @@ struct BlogServiceRemoteCoreRESTSettingsTests {
1920
postsPerPage: UInt64 = 10
2021
) -> SiteSettingsWithEditContext {
2122
SiteSettingsWithEditContext(
22-
title: title, description: description, url: "", email: "",
23-
timezone: timezone, dateFormat: dateFormat, timeFormat: timeFormat,
24-
startOfWeek: startOfWeek, language: "", useSmilies: false,
25-
defaultCategory: defaultCategory, defaultPostFormat: defaultPostFormat,
26-
postsPerPage: postsPerPage, showOnFront: "posts",
27-
pageOnFront: 0, pageForPosts: 0,
23+
title: title,
24+
description: description,
25+
url: "",
26+
email: "",
27+
timezone: timezone,
28+
dateFormat: dateFormat,
29+
timeFormat: timeFormat,
30+
startOfWeek: startOfWeek,
31+
language: "",
32+
useSmilies: false,
33+
defaultCategory: defaultCategory,
34+
defaultPostFormat: defaultPostFormat,
35+
postsPerPage: postsPerPage,
36+
showOnFront: "posts",
37+
pageOnFront: 0,
38+
pageForPosts: 0,
2839
defaultPingStatus: .closed,
2940
defaultCommentStatus: .closed,
30-
siteLogo: nil, siteIcon: 0
41+
siteLogo: nil,
42+
siteIcon: 0,
43+
additionalFields: AnyJson(noHandle: AnyJson.NoHandle())
3144
)
3245
}
3346

0 commit comments

Comments
 (0)