Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class OAuth2AuthorizationCodeTokenGrantStrategyTests: XCTestCase {
let customParameters: [String: String] = ["some_id": "123abc"]

private func makeStrategy() throws -> OAuth2AuthorizationCodeTokenGrantStrategy {
let mockServerEnvironment = OAuth2ServerEnvironment(tokenGrantURL: try URL(absoluteString: "https://httpbin.org/get"))
let mockServerEnvironment = OAuth2ServerEnvironment(tokenGrantURL: try URL(absoluteString: "https://httpbingo.org/get"))
let mockClientConfiguration = OAuth2ClientConfiguration(clientIdentifier: "herp", clientSecret: "derp",
environment: mockServerEnvironment, guestUsername: "clientuser", guestPassword: "abc123")
var strategy = OAuth2AuthorizationCodeTokenGrantStrategy(code: authCode, redirectURI: redirectURI, clientConfiguration: mockClientConfiguration)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class OAuth2ClientCredentialsTokenGrantTests: XCTestCase {
let customParameters: [String: String] = ["some_id": "123abc"]

private func makeStrategy() throws -> OAuth2ClientCredentialsTokenGrantStrategy {
let mockServerEnvironment = OAuth2ServerEnvironment(tokenGrantURL: try URL(absoluteString: "https://httpbin.org/get"))
let mockServerEnvironment = OAuth2ServerEnvironment(tokenGrantURL: try URL(absoluteString: "https://httpbingo.org/get"))
let mockClientConfiguration = OAuth2ClientConfiguration(clientIdentifier: "herp", clientSecret: "derp",
environment: mockServerEnvironment, guestUsername: "clientuser", guestPassword: "abc123")
var strategy = OAuth2ClientCredentialsTokenGrantStrategy(clientConfiguration: mockClientConfiguration)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class OAuth2ExtensionTokenGrantTests: XCTestCase {
let customParameters: [String: String] = ["assertion": "123abc"]

private func makeStrategy() throws -> OAuth2ExtensionTokenGrantStrategy {
let mockServerEnvironment = OAuth2ServerEnvironment(tokenGrantURL: try URL(absoluteString: "https://httpbin.org/get"))
let mockServerEnvironment = OAuth2ServerEnvironment(tokenGrantURL: try URL(absoluteString: "https://httpbingo.org/get"))
let mockClientConfiguration = OAuth2ClientConfiguration(clientIdentifier: "herp", clientSecret: "derp",
environment: mockServerEnvironment, guestUsername: "clientuser", guestPassword: "abc123")
let grantType = saml12GrantType
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class OAuth2PasswordTokenGrantTests: XCTestCase {
let customParameters: [String: String] = ["some_id": "123abc"]

private func makeStrategy() throws -> OAuth2PasswordTokenGrantStrategy {
let mockServerEnvironment = OAuth2ServerEnvironment(tokenGrantURL: try URL(absoluteString: "https://httpbin.org/get"))
let mockServerEnvironment = OAuth2ServerEnvironment(tokenGrantURL: try URL(absoluteString: "https://httpbingo.org/get"))
let mockClientConfiguration = OAuth2ClientConfiguration(clientIdentifier: "herp", clientSecret: "derp",
environment: mockServerEnvironment, guestUsername: "clientuser", guestPassword: "abc123")
var strategy = OAuth2PasswordTokenGrantStrategy(username: username, password: password, clientConfiguration: mockClientConfiguration)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class OAuth2RequestPipelineMiddlewareTests: XCTestCase {
let randomTokenAccessToken = "abc123!!"

private func makeMockClientConfiguration() throws -> OAuth2ClientConfiguration {
let mockServerEnvironment = OAuth2ServerEnvironment(scope: "urn:everything", tokenGrantURL: try URL(absoluteString: "https://httpbin.org/get"))
let mockServerEnvironment = OAuth2ServerEnvironment(scope: "urn:everything", tokenGrantURL: try URL(absoluteString: "https://httpbingo.org/get"))
let mockClientConfiguration = OAuth2ClientConfiguration(clientIdentifier: "herp", clientSecret: "derp", environment: mockServerEnvironment,
guestUsername: "clientuser", guestPassword: "abc123")
return mockClientConfiguration
Expand All @@ -57,7 +57,7 @@ class OAuth2RequestPipelineMiddlewareTests: XCTestCase {
}

private func makeDummyRequest() throws -> URLRequest {
let requestBuilder = HTTPRequestBuilder(url: try URL(absoluteString: "https://httpbin.org/post"))
let requestBuilder = HTTPRequestBuilder(url: try URL(absoluteString: "https://httpbingo.org/post"))
requestBuilder.bodyParameters = ["key": "value"]
requestBuilder.method = .POST
requestBuilder.serializer = JSONRequestSerializer()
Expand Down
2 changes: 1 addition & 1 deletion Tests/ConduitTests/Auth/OAuth2TokenGrantManagerTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class OAuth2TokenGrantManagerTests: XCTestCase {

typealias BadResponse = (response: HTTPURLResponse?, expectedError: OAuth2Error)

let dummyURL = URL(string: "https://httpbin.org/get")
let dummyURL = URL(string: "https://httpbingo.org/get")

func testErrorsGeneratedAsExpected() {
guard let url = dummyURL else {
Expand Down
2 changes: 1 addition & 1 deletion Tests/ConduitTests/Auth/OAuth2TokenStorageTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class OAuth2TokenStorageTests: XCTestCase {
let mockAuthorization = OAuth2Authorization(type: .bearer, level: .user)

private func makeMockClientConfiguration() throws -> OAuth2ClientConfiguration {
let mockServerEnvironment = OAuth2ServerEnvironment(tokenGrantURL: try URL(absoluteString: "https://httpbin.org/get"))
let mockServerEnvironment = OAuth2ServerEnvironment(tokenGrantURL: try URL(absoluteString: "https://httpbingo.org/get"))
let mockClientConfiguration = OAuth2ClientConfiguration(clientIdentifier: "herp", clientSecret: "derp",
environment: mockServerEnvironment, guestUsername: "clientuser", guestPassword: "abc123")
return mockClientConfiguration
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import Conduit
class AutoPurgingURLDataCacheTests: XCTestCase {

var mockDataRequest: URLRequest {
guard let url = URL(string: "https://httpbin.org/data/jpeg") else {
guard let url = URL(string: "https://httpbingo.org/data/jpeg") else {
XCTFail("Invalid url")
preconditionFailure("Invalid url")
}
Expand Down Expand Up @@ -63,7 +63,7 @@ class AutoPurgingURLDataCacheTests: XCTestCase {
func testRemovesAllCachedDatasWhenPurged() throws {
// GIVEN a list of cached images
let dataRequests = try (0..<10).map {
URLRequest(url: try URL(absoluteString: "https://httpbin.org/data/jpeg?id=\($0)"))
URLRequest(url: try URL(absoluteString: "https://httpbingo.org/data/jpeg?id=\($0)"))
}

guard let data = MockResource.evilSpaceshipImage.data else {
Expand Down
14 changes: 7 additions & 7 deletions Tests/ConduitTests/Networking/Data/DataDownloaderTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class DataDownloaderTests: XCTestCase {
func testOnlyHitsNetworkOncePerRequest() throws {
let monitoringSessionClient = MonitoringURLSessionClient()
let sut = DataDownloader(cache: AutoPurgingURLDataCache(), sessionClient: monitoringSessionClient)
let url = try URL(absoluteString: "https://httpbin.org/image/svg")
let url = try URL(absoluteString: "https://httpbingo.org/image/svg")
let dataRequest = URLRequest(url: url)
for _ in 0..<100 {
sut.downloadData(for: dataRequest) { _ in }
Expand All @@ -45,7 +45,7 @@ class DataDownloaderTests: XCTestCase {
attemptedAllDataRetrievalsExpectation.expectedFulfillmentCount = 100

let sut = DataDownloader(cache: AutoPurgingURLDataCache())
let url = try URL(absoluteString: "https://httpbin.org/image/svg")
let url = try URL(absoluteString: "https://httpbingo.org/image/svg")
let dataRequest = URLRequest(url: url)

sut.downloadData(for: dataRequest) { response in
Expand All @@ -64,7 +64,7 @@ class DataDownloaderTests: XCTestCase {

func testHandlesSimultaneousRequestsForDifferentDatas() {
let dataURLs = (0..<10).compactMap {
URL(string: "https://httpbin.org/image/svg?id=\($0)")
URL(string: "https://httpbingo.org/image/svg?id=\($0)")
}

let sut = DataDownloader(cache: AutoPurgingURLDataCache())
Expand All @@ -85,7 +85,7 @@ class DataDownloaderTests: XCTestCase {
func testPersistsWhileOperationsAreRunning() throws {
let dataDownloadedExpectation = expectation(description: "data downloaded")
var sut: DataDownloader? = DataDownloader(cache: AutoPurgingURLDataCache())
let url = try URL(absoluteString: "https://httpbin.org/image/svg")
let url = try URL(absoluteString: "https://httpbingo.org/image/svg")
let dataRequest = URLRequest(url: url)

weak var weakDataDownloader = sut
Expand All @@ -108,7 +108,7 @@ class DataDownloaderTests: XCTestCase {
// AND a configured Data Downloader instance
let dataDownloadedExpectation = expectation(description: "data downloaded")
let sut = DataDownloader(cache: AutoPurgingURLDataCache())
let url = try URL(absoluteString: "https://httpbin.org/image/svg")
let url = try URL(absoluteString: "https://httpbingo.org/image/svg")
let dataRequest = URLRequest(url: url)

// WHEN downloading an data
Expand All @@ -128,7 +128,7 @@ class DataDownloaderTests: XCTestCase {
// AND a configured Data Downloader instance
let dataDownloadedExpectation = expectation(description: "data downloaded")
let sut = DataDownloader(cache: AutoPurgingURLDataCache())
let url = try URL(absoluteString: "https://httpbin.org/image/svg")
let url = try URL(absoluteString: "https://httpbingo.org/image/svg")
let dataRequest = URLRequest(url: url)

// WHEN downloading an data from our background queue
Expand All @@ -150,7 +150,7 @@ class DataDownloaderTests: XCTestCase {
// AND a configured Data Downloader instance with our custom completion queue
let dataDownloadedExpectation = expectation(description: "data downloaded")
let sut = DataDownloader(cache: AutoPurgingURLDataCache(), completionQueue: customQueue)
let url = try URL(absoluteString: "https://httpbin.org/image/svg")
let url = try URL(absoluteString: "https://httpbingo.org/image/svg")
let dataRequest = URLRequest(url: url)

// WHEN downloading an data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ private class MockRequestSerializer: RequestSerializer {
class HTTPRequestBuilderTests: XCTestCase {

private func makeRequestBuilder() throws -> HTTPRequestBuilder {
let url = try URL(absoluteString: "https://httpbin.org")
let url = try URL(absoluteString: "https://httpbingo.org")
return HTTPRequestBuilder(url: url)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import Conduit
class AutoPurgingURLImageCacheTests: XCTestCase {

var mockImageRequest: URLRequest {
guard let url = URL(string: "https://httpbin.org/image/jpeg") else {
guard let url = URL(string: "https://httpbingo.org/image/jpeg") else {
XCTFail("Invalid url")
preconditionFailure("Invalid url")
}
Expand Down Expand Up @@ -53,7 +53,7 @@ class AutoPurgingURLImageCacheTests: XCTestCase {
let sut = AutoPurgingURLImageCache()

let imageRequests = try (0..<10).map {
URLRequest(url: try URL(absoluteString: "https://httpbin.org/image/jpeg?id=\($0)"))
URLRequest(url: try URL(absoluteString: "https://httpbingo.org/image/jpeg?id=\($0)"))
}

guard let image = MockResource.evilSpaceshipImage.image else {
Expand Down
14 changes: 7 additions & 7 deletions Tests/ConduitTests/Networking/Images/ImageDownloaderTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class ImageDownloaderTests: XCTestCase {
func testOnlyHitsNetworkOncePerRequest() throws {
let monitoringSessionClient = MonitoringURLSessionClient()
let sut = ImageDownloader(cache: AutoPurgingURLImageCache(), sessionClient: monitoringSessionClient)
let url = try URL(absoluteString: "https://httpbin.org/image/jpeg")
let url = try URL(absoluteString: "https://httpbingo.org/image/jpeg")
let imageRequest = URLRequest(url: url)
for _ in 0..<100 {
sut.downloadImage(for: imageRequest) { _ in }
Expand All @@ -44,7 +44,7 @@ class ImageDownloaderTests: XCTestCase {
let attemptedAllImageRetrievalsExpectation = expectation(description: "attempted all image retrievals")

let sut = ImageDownloader(cache: AutoPurgingURLImageCache())
let url = try URL(absoluteString: "https://httpbin.org/image/jpeg")
let url = try URL(absoluteString: "https://httpbingo.org/image/jpeg")
let imageRequest = URLRequest(url: url)

sut.downloadImage(for: imageRequest) { response in
Expand All @@ -71,7 +71,7 @@ class ImageDownloaderTests: XCTestCase {

func testHandlesSimultaneousRequestsForDifferentImages() {
let imageURLs = (0..<10).compactMap {
URL(string: "https://httpbin.org/image/jpeg?id=\($0)")
URL(string: "https://httpbingo.org/image/jpeg?id=\($0)")
}

let sut = ImageDownloader(cache: AutoPurgingURLImageCache())
Expand All @@ -98,7 +98,7 @@ class ImageDownloaderTests: XCTestCase {
func testPersistsWhileOperationsAreRunning() throws {
let imageDownloadedExpectation = expectation(description: "image downloaded")
var sut: ImageDownloader? = ImageDownloader(cache: AutoPurgingURLImageCache())
let url = try URL(absoluteString: "https://httpbin.org/image/jpeg")
let url = try URL(absoluteString: "https://httpbingo.org/image/jpeg")
let imageRequest = URLRequest(url: url)

weak var weakImageDownloader = sut
Expand All @@ -121,7 +121,7 @@ class ImageDownloaderTests: XCTestCase {
// AND a configured Image Downloader instance
let imageDownloadedExpectation = expectation(description: "image downloaded")
let sut = ImageDownloader(cache: AutoPurgingURLImageCache())
let url = try URL(absoluteString: "https://httpbin.org/image/jpeg")
let url = try URL(absoluteString: "https://httpbingo.org/image/jpeg")
let imageRequest = URLRequest(url: url)

// WHEN downloading an image
Expand All @@ -141,7 +141,7 @@ class ImageDownloaderTests: XCTestCase {
// AND a configured Image Downloader instance
let imageDownloadedExpectation = expectation(description: "image downloaded")
let sut = ImageDownloader(cache: AutoPurgingURLImageCache())
let url = try URL(absoluteString: "https://httpbin.org/image/jpeg")
let url = try URL(absoluteString: "https://httpbingo.org/image/jpeg")
let imageRequest = URLRequest(url: url)

// WHEN downloading an image from our background queue
Expand All @@ -163,7 +163,7 @@ class ImageDownloaderTests: XCTestCase {
// AND a configured Image Downloader instance with our custom completion queue
let imageDownloadedExpectation = expectation(description: "image downloaded")
let sut = ImageDownloader(cache: AutoPurgingURLImageCache(), completionQueue: customQueue)
let url = try URL(absoluteString: "https://httpbin.org/image/jpeg")
let url = try URL(absoluteString: "https://httpbingo.org/image/jpeg")
let imageRequest = URLRequest(url: url)

// WHEN downloading an image
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import Conduit
class FormEncodedRequestSerializerTests: XCTestCase {

private func makeRequest() throws -> URLRequest {
let url = try URL(absoluteString: "https://httpbin.org")
let url = try URL(absoluteString: "https://httpbingo.org")
var request = URLRequest(url: url)
request.httpMethod = "POST"
return request
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import XCTest
class HTTPRequestSerializerTests: XCTestCase {

private func makeRequest() throws -> URLRequest {
let url = try URL(absoluteString: "https://httpbin.org")
let url = try URL(absoluteString: "https://httpbingo.org")
let request = URLRequest(url: url)
return request
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class JSONRequestSerializerTests: XCTestCase {
let testJSONParameters = ["key1": "value1", "key2": 2, "key3": ["nested": true]] as [String: Any]

private func makeRequest() throws -> URLRequest {
let url = try URL(absoluteString: "https://httpbin.org")
let url = try URL(absoluteString: "https://httpbingo.org")
var request = URLRequest(url: url)
request.httpMethod = "POST"
return request
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class JSONResponseDeserializerTests: XCTestCase {
guard let validResponseData = json.data(using: .utf8) else {
throw TestError.invalidTest
}
let url = try URL(absoluteString: "https://httpbin.org")
let url = try URL(absoluteString: "https://httpbingo.org")
guard let validResponse = HTTPURLResponse(url: url, statusCode: 200, httpVersion: "1.1", headerFields: validResponseHeaders) else {
throw TestError.invalidTest
}
Expand All @@ -36,7 +36,7 @@ class JSONResponseDeserializerTests: XCTestCase {
if let contentType = contentType {
headerFields = ["Content-Type": contentType]
}
let url = try URL(absoluteString: "https://httpbin.org")
let url = try URL(absoluteString: "https://httpbingo.org")
guard let response = HTTPURLResponse(url: url, statusCode: 200, httpVersion: "1.1", headerFields: headerFields) else {
throw TestError.invalidTest
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ enum TestError: Error {
class MultipartFormRequestSerializerTests: XCTestCase {

private func makeRequest() throws -> URLRequest {
let url = try URL(absoluteString: "https://httpbin.org")
let url = try URL(absoluteString: "https://httpbingo.org")
var request = URLRequest(url: url)
request.httpMethod = "POST"
return request
Expand Down Expand Up @@ -56,7 +56,7 @@ class MultipartFormRequestSerializerTests: XCTestCase {
func testSerializesDataPerW3Spec() throws {
let serializer = try makeFormSerializer()

var newRequest = URLRequest(url: try URL(absoluteString: "https://httpbin.org/post"))
var newRequest = URLRequest(url: try URL(absoluteString: "https://httpbingo.org/post"))
newRequest.httpMethod = "POST"
guard let modifiedRequest = try? serializer.serialize(request: newRequest, bodyParameters: nil) else {
XCTFail("Serialization failed")
Expand All @@ -71,8 +71,8 @@ class MultipartFormRequestSerializerTests: XCTestCase {
client.begin(request: modifiedRequest) { data, response, _ in
do {
let json = try deserializer.deserialize(response: response, data: data) as? [String: Any]
let files = json?["files"] as? [String: String]
let forms = json?["form"] as? [String: String]
let files = json?["files"] as? [String: [String]]
let forms = json?["form"] as? [String: [String]]

XCTAssertEqual(files?.keys.count, 5)
XCTAssertEqual(forms?.keys.count, 1)
Expand All @@ -97,7 +97,7 @@ class MultipartFormRequestSerializerTests: XCTestCase {
formPart.contentType = nil
serializer.append(formPart: formPart)

var newRequest = URLRequest(url: try URL(absoluteString: "https://httpbin.org/post"))
var newRequest = URLRequest(url: try URL(absoluteString: "https://httpbingo.org/post"))
newRequest.httpMethod = "POST"
let modifiedRequest = try serializer.serialize(request: newRequest, bodyParameters: nil)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class XMLRequestSerializerTests: XCTestCase {
])

private func makeRequest() throws -> URLRequest {
let url = try URL(absoluteString: "https://httpbin.org")
let url = try URL(absoluteString: "https://httpbingo.org")
var request = URLRequest(url: url)
request.httpMethod = "POST"
return request
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class XMLResponseDeserializerTests: XCTestCase {
throw TestError.invalidTest
}

guard let url = URL(string: "https://httpbin.org"),
guard let url = URL(string: "https://httpbingo.org"),
let validResponse = HTTPURLResponse(url: url, statusCode: 200, httpVersion: "1.1", headerFields: validResponseHeaders) else {
throw TestError.invalidTest
}
Expand Down
Loading
Loading