Skip to content

Fix MastodonSDK package tests #1498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aokj4ck wants to merge 8 commits into
base: develop
Choose a base branch
from
+17 −28
Open

Fix MastodonSDK package tests #1498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2465212
Fix MastodonSDKTests sources (tests target still failing to test)
aokj4ck Jan 2, 2026
0811a47
Improve MastodonSDKTests dependency linking, L10n errors remain
aokj4ck Jan 2, 2026
4077329
Fix package errors
aokj4ck Jan 2, 2026
0c24568
Move CoreDataStack and MastodonLocalization dependencies to MastodonS…
aokj4ck Jan 2, 2026
80c0f4a
Remove duplicated and non-existent AppStoreSnapshotTestPlan\ copy.xct…
aokj4ck Jan 2, 2026
58d444b
Restore MastodonSDK.xctestplan to main project Mastodon iOS build sch…
aokj4ck Jan 2, 2026
df61b4c
Merge branch 'develop' into tests/fix-MastodonSDKTests-sources
aokj4ck Jan 6, 2026
1a44784
Fix typo in testCreateAnApplication
aokj4ck Jan 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Mastodon.xcodeproj/xcshareddata/xcschemes/Mastodon.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
reference = "container:Mastodon/Mastodon.xctestplan"
default = "YES">
</TestPlanReference>
<TestPlanReference
reference = "container:MastodonSDK.xctestplan">
</TestPlanReference>
</TestPlans>
<Testables>
<TestableReference
Expand Down
2 changes: 1 addition & 1 deletion MastodonSDK.xctestplan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"testTargets" : [
{
"skippedTests" : [
"MastodonSDKTests\/testCreateAnAnpplication()",
"MastodonSDKTests\/testCreateAnApplication()",
"MastodonSDKTests\/testHomeTimeline()",
"MastodonSDKTests\/testOAuthAuthorize()",
"MastodonSDKTests\/testRetrieveAccountInfo()",
Expand Down
4 changes: 3 additions & 1 deletion MastodonSDK/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,9 @@ let package = Package(
name: "MastodonSDK",
dependencies: [
.product(name: "NIOHTTP1", package: "swift-nio"),
"MastodonCommon"
"MastodonCommon",
"CoreDataStack",
"MastodonLocalization"
]
),
.target(
Expand Down
30 changes: 7 additions & 23 deletions MastodonSDK/Tests/MastodonSDKTests/API/MastodonSDK+API+AppTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,36 +11,20 @@ import Combine

extension MastodonSDKTests {

func testCreateAnAnpplication() throws {
try _testCreateAnAnpplication(domain: domain)
func testCreateAnApplication() async throws {
try await _testCreateAnApplication(domain: domain)
}

func _testCreateAnAnpplication(domain: String) throws {
let theExpectation = expectation(description: "Create An Application")

func _testCreateAnApplication(domain: String) async throws {
let query = Mastodon.API.App.CreateQuery(
clientName: "XCTest",
redirectURIs: "mastodon://joinmastodon.org/oauth",
website: nil
)
Mastodon.API.App.create(session: session, domain: domain, query: query)
.receive(on: DispatchQueue.main)
.sink { completion in
switch completion {
case .failure(let error):
XCTFail(error.localizedDescription)
case .finished:
break
}
} receiveValue: { response in
XCTAssertEqual(response.value.name, "XCTest")
XCTAssertEqual(response.value.website, nil)
XCTAssertEqual(response.value.redirectURI, "urn:ietf:wg:oauth:2.0:oob")
theExpectation.fulfill()
}
.store(in: &disposeBag)

wait(for: [theExpectation], timeout: 5.0)
let response = try await Mastodon.API.App.create(session: session, domain: domain, query: query)
XCTAssertEqual(response.name, "XCTest")
XCTAssertEqual(response.website, nil)
XCTAssertEqual(response.redirectURI, "urn:ietf:wg:oauth:2.0:oob")
}

}
Expand Down
6 changes: 3 additions & 3 deletions MastodonSDK/Tests/MastodonSDKTests/API/MastodonSDK+API+Instance.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ extension MastodonSDKTests {

func _testInstance(domain: String) throws {
let theExpectation = expectation(description: "Fetch Instance Infomation")
Mastodon.API.Instance.instance(session: session, domain: domain)

Mastodon.API.Instance.instance(session: session, authorization: .none, domain: domain)
.receive(on: DispatchQueue.main)
.sink { completion in
switch completion {
Expand Down Expand Up @@ -49,7 +49,7 @@ extension MastodonSDKTests {
func _testInstanceRules(domain: String) throws {
let theExpectation = expectation(description: "Fetch Instance Infomation")

Mastodon.API.Instance.instance(session: session, domain: domain)
Mastodon.API.Instance.instance(session: session, authorization: .none, domain: domain)
.receive(on: DispatchQueue.main)
.sink { completion in
switch completion {
Expand Down
Loading