From 5754762be9d9f862fff708bfb614b7895a6ab34d Mon Sep 17 00:00:00 2001 From: Simon-Kaz Date: Thu, 15 Nov 2018 11:15:44 +0000 Subject: [PATCH 1/2] add isMethodHEAD to swift helpers --- CHANGELOG.md | 5 +++++ OHHTTPStubs/Sources/Swift/OHHTTPStubsSwift.swift | 10 ++++++++++ .../UnitTests/Test Suites/SwiftHelpersTests.swift | 4 ++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7ef5eba..8c14ead1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # OHHTTPStubs — CHANGELOG +## [Future release] +* Added `isMethodHEAD()` to the `Swift` helpers. + [@Simon-Kaz](https://github.com/Simon-Kaz) + [#TEMP](https://github.com/AliSoftware/OHHTTPStubs/pull/TEMP) + ## [6.1.0](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/6.1.0) * Updated deployment target for the pod to 7.0 to remove warning for old APIs. diff --git a/OHHTTPStubs/Sources/Swift/OHHTTPStubsSwift.swift b/OHHTTPStubs/Sources/Swift/OHHTTPStubsSwift.swift index 963ac88a..7d9236e4 100644 --- a/OHHTTPStubs/Sources/Swift/OHHTTPStubsSwift.swift +++ b/OHHTTPStubs/Sources/Swift/OHHTTPStubsSwift.swift @@ -163,6 +163,16 @@ public func isMethodDELETE() -> OHHTTPStubsTestBlock { return { $0.httpMethod == "DELETE" } } +/** + * Matcher testing that the `NSURLRequest` is using the **HEAD** `HTTPMethod` + * + * - Returns: a matcher (OHHTTPStubsTestBlock) that succeeds only if the request + * is using the HEAD method + */ +public func isMethodHEAD() -> OHHTTPStubsTestBlock { + return { $0.httpMethod == "HEAD" } +} + /** * Matcher for testing an `NSURLRequest`'s **absolute url string**. * diff --git a/OHHTTPStubs/UnitTests/Test Suites/SwiftHelpersTests.swift b/OHHTTPStubs/UnitTests/Test Suites/SwiftHelpersTests.swift index 3b636466..b76b80f7 100644 --- a/OHHTTPStubs/UnitTests/Test Suites/SwiftHelpersTests.swift +++ b/OHHTTPStubs/UnitTests/Test Suites/SwiftHelpersTests.swift @@ -35,8 +35,8 @@ import XCTest class SwiftHelpersTests : XCTestCase { func testHTTPMethod() { - let methods = ["GET", "PUT", "PATCH", "POST", "DELETE", "FOO"] - let matchers = [isMethodGET(), isMethodPUT(), isMethodPATCH(), isMethodPOST(), isMethodDELETE()] + let methods = ["GET", "PUT", "PATCH", "POST", "DELETE", "HEAD", "FOO"] + let matchers = [isMethodGET(), isMethodPUT(), isMethodPATCH(), isMethodPOST(), isMethodDELETE(), isMethodHEAD()] for (idxMethod, method) in methods.enumerated() { #if swift(>=3.0) From 3a6b7c19f8190806de59191ec6e3e46682c557d2 Mon Sep 17 00:00:00 2001 From: Simon-Kaz Date: Thu, 15 Nov 2018 11:37:25 +0000 Subject: [PATCH 2/2] updated link to PR --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c14ead1..e6b8c4a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ## [Future release] * Added `isMethodHEAD()` to the `Swift` helpers. [@Simon-Kaz](https://github.com/Simon-Kaz) - [#TEMP](https://github.com/AliSoftware/OHHTTPStubs/pull/TEMP) + [#294](https://github.com/AliSoftware/OHHTTPStubs/pull/294) ## [6.1.0](https://github.com/AliSoftware/OHHTTPStubs/releases/tag/6.1.0)