Merge pull request Carthage#2168 from Carthage/nimble-predicate

Use the new `Predicate` type for Nimble matchers
abrindam · Sep 22, 2017 · a8795b9 · a8795b9
2 parents 89a1133 + 1dd41f8
commit a8795b9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Tests/CarthageKitTests/ResolverSpec.swift b/Tests/CarthageKitTests/ResolverSpec.swift
@@ -102,7 +102,7 @@ private func ==<A: Equatable, B: Equatable>(lhs: [(A, B)], rhs: [(A, B)]) -> Boo
 	return true
 }
 
-private func equal<A: Equatable, B: Equatable>(_ expectedValue: [(A, B)]?) -> NonNilMatcherFunc<[(A, B)]> {
+private func equal<A: Equatable, B: Equatable>(_ expectedValue: [(A, B)]?) -> Predicate<[(A, B)]> {
 	return NonNilMatcherFunc { actualExpression, failureMessage in
 		failureMessage.postfixMessage = "equal <\(stringify(expectedValue))>"
 		let actualValue = try actualExpression.evaluate()
@@ -113,7 +113,7 @@ private func equal<A: Equatable, B: Equatable>(_ expectedValue: [(A, B)]?) -> No
 			return false
 		}
 		return expectedValue! == actualValue!
-	}
+	}.predicate
 }
 
 private func ==<A: Equatable, B: Equatable>(lhs: Expectation<[(A, B)]>, rhs: [(A, B)]) {

diff --git a/Tests/CarthageKitTests/XcodeSpec.swift b/Tests/CarthageKitTests/XcodeSpec.swift
@@ -400,7 +400,7 @@ class XcodeSpec: QuickSpec {
 
 // MARK: Matcher
 
-internal func beExistingDirectory() -> MatcherFunc<String> {
+internal func beExistingDirectory() -> Predicate<String> {
 	return MatcherFunc { actualExpression, failureMessage in
 		failureMessage.postfixMessage = "exist and be a directory"
 		let actualPath = try actualExpression.evaluate()
@@ -417,10 +417,10 @@ internal func beExistingDirectory() -> MatcherFunc<String> {
 		}
 
 		return exists && isDirectory.boolValue
-	}
+	}.predicate
 }
 
-internal func beRelativeSymlinkToDirectory(_ directory: URL) -> MatcherFunc<URL> {
+internal func beRelativeSymlinkToDirectory(_ directory: URL) -> Predicate<URL> {
 	return MatcherFunc { actualExpression, failureMessage in
 		failureMessage.postfixMessage = "be a relative symlink to \(directory)"
 		let actualURL = try actualExpression.evaluate()
@@ -454,5 +454,5 @@ internal func beRelativeSymlinkToDirectory(_ directory: URL) -> MatcherFunc<URL>
 		}
 
 		return urlsEqual
-	}
+	}.predicate
 }