Skip to content
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

Jump to bottom

Revert "Use the new appendURLString function in WordPressComRestApi" #729

Merged
merged 2 commits into from
Feb 20, 2024
Merged

Revert "Use the new appendURLString function in WordPressComRestApi" #729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2a9d63
Revert "Use the new appendURLString function in WordPressComRestApi"
crazytonyli Feb 19, 2024
dce187d
Add an unit test
crazytonyli Feb 19, 2024
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
4 changes: 4 additions & 0 deletions WordPressKit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@
4A6B4A862B269D0C00802316 /* URLSessionHelperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A6B4A852B269D0C00802316 /* URLSessionHelperTests.swift */; };
4AA5A1A32AA68F6B00969464 /* MediaLibraryTestSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AA5A1A22AA68F6B00969464 /* MediaLibraryTestSupport.swift */; };
4AA5A1A52AA695D700969464 /* LoadMediaLibraryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AA5A1A42AA695D700969464 /* LoadMediaLibraryTests.swift */; };
4AB6A3652B83191600769115 /* ReaderPostServiceRemote+FetchEndpointTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AB6A3642B83191600769115 /* ReaderPostServiceRemote+FetchEndpointTests.swift */; };
4AE278442B2FAF6200E4D9B1 /* HTTPProtocolHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AE278432B2FAF6200E4D9B1 /* HTTPProtocolHelpers.swift */; };
4AE278482B2FBF1100E4D9B1 /* HTTPBodyEncodingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AE278472B2FBF1100E4D9B1 /* HTTPBodyEncodingTests.swift */; };
4AE2784A2B2FC6C600E4D9B1 /* HTTPHeaderValueParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AE278492B2FC6C600E4D9B1 /* HTTPHeaderValueParserTests.swift */; };
Expand Down Expand Up @@ -903,6 +904,7 @@
4A6B4A852B269D0C00802316 /* URLSessionHelperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLSessionHelperTests.swift; sourceTree = "<group>"; };
4AA5A1A22AA68F6B00969464 /* MediaLibraryTestSupport.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaLibraryTestSupport.swift; sourceTree = "<group>"; };
4AA5A1A42AA695D700969464 /* LoadMediaLibraryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadMediaLibraryTests.swift; sourceTree = "<group>"; };
4AB6A3642B83191600769115 /* ReaderPostServiceRemote+FetchEndpointTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ReaderPostServiceRemote+FetchEndpointTests.swift"; sourceTree = "<group>"; };
4AE278432B2FAF6200E4D9B1 /* HTTPProtocolHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HTTPProtocolHelpers.swift; sourceTree = "<group>"; };
4AE278472B2FBF1100E4D9B1 /* HTTPBodyEncodingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HTTPBodyEncodingTests.swift; sourceTree = "<group>"; };
4AE278492B2FC6C600E4D9B1 /* HTTPHeaderValueParserTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HTTPHeaderValueParserTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1671,6 +1673,7 @@
FA87FE0624EB39C4003FBEE3 /* ReaderPostServiceRemote+SubscriptionTests.swift */,
3236F79924AE406D0088E8F3 /* ReaderTopicServiceRemote+InterestsTests.swift */,
8B16CE91252502C4007BE5A9 /* RemoteReaderPostTests+V2.swift */,
4AB6A3642B83191600769115 /* ReaderPostServiceRemote+FetchEndpointTests.swift */,
);
name = Reader;
sourceTree = "<group>";
Expand Down Expand Up @@ -3595,6 +3598,7 @@
740B23D31F17F6BB00067A2A /* PostServiceRemoteXMLRPCTests.swift in Sources */,
93188D221F2264E60028ED4D /* TaxonomyServiceRemoteRESTTests.m in Sources */,
F194E1232417ED9F00874408 /* AtomicAuthenticationServiceRemoteTests.swift in Sources */,
4AB6A3652B83191600769115 /* ReaderPostServiceRemote+FetchEndpointTests.swift in Sources */,
9817D9D426BC8AF000ECBD8C /* CommentServiceRemoteXMLRPCTests.swift in Sources */,
74FC6F3B1F191BB400112505 /* NotificationSyncServiceRemoteTests.swift in Sources */,
731BA83821DECD97000FDFCD /* SiteCreationResponseDecodingTests.swift in Sources */,
Expand Down
7 changes: 5 additions & 2 deletions WordPressKit/WordPressComRestApi.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,8 +484,11 @@ open class WordPressComRestApi: NSObject {
}

private func requestBuilder(URLString: String) throws -> HTTPRequestBuilder {
var builder = HTTPRequestBuilder(url: baseURL)
.appendURLString(URLString)
guard let url = URL(string: URLString, relativeTo: baseURL) else {
throw URLError(.badURL)
}

var builder = HTTPRequestBuilder(url: url)

if appendsPreferredLanguageLocale {
let preferredLanguageIdentifier = WordPressComLanguageDatabase().deviceLanguage.slug
Expand Down
40 changes: 40 additions & 0 deletions WordPressKitTests/ReaderPostServiceRemote+FetchEndpointTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import Foundation
import XCTest
import OHHTTPStubs

@testable import WordPressKit

class ReaderPostServiceRemoteFetchEndpointTests: XCTestCase {

override func tearDown() {
super.tearDown()

HTTPStubs.removeAllStubs()
}

func testEndpointIsFullURL() throws {
var request: URLRequest?
stub(condition: { _ in true }) {
request = $0
return HTTPStubsResponse(error: URLError(.networkConnectionLost))
}

let complete = expectation(description: "API call completes")
let service = ReaderPostServiceRemote(wordPressComRestApi: WordPressComRestApi())
let endpoint = URL(string: "https://public-api.wordpress.com/rest/v1.2/read/liked")!
service.fetchPosts(
fromEndpoint: endpoint,
algorithm: "none",
count: 1,
before: Date(),
success: { _,_ in complete.fulfill() },
failure: { _ in complete.fulfill() }
)
wait(for: [complete], timeout: 0.3)

var url = try XCTUnwrap(URLComponents(url: XCTUnwrap(request?.url), resolvingAgainstBaseURL: true))
url.query = nil
XCTAssertEqual(url.url?.absoluteString, "https://public-api.wordpress.com/rest/v1.2/read/liked")
}

}