Update Nimble to 7.0.1. (#39)

Author: andersio

Cartfile.private

@@ -1,3 +1,3 @@
 github "jspahrsummers/xcconfigs" ~> 0.10
 github "Quick/Quick" ~> 1.1
-github "Quick/Nimble" ~> 6.1
+github "Quick/Nimble" ~> 7.0

Cartfile.resolved

@@ -1,4 +1,4 @@
-github "Quick/Nimble" "v6.1.0"
+github "Quick/Nimble" "v7.0.1"
 github "Quick/Quick" "v1.1.0"
 github "ReactiveCocoa/ReactiveCocoa" "6.0.0"
 github "ReactiveCocoa/ReactiveSwift" "2.0.0"

Package.swift

@@ -14,7 +14,7 @@ let package = Package(
         if isSwiftPackagerManagerTest {
             deps += [
                 .Package(url: "https://github.com/Quick/Quick.git", majorVersion: 1, minor: 1),
-                .Package(url: "https://github.com/Quick/Nimble.git", majorVersion: 6, minor: 1),
+                .Package(url: "https://github.com/Quick/Nimble.git", majorVersion: 7, minor: 0),
             ]
         }
 	return deps

Tests/ReactiveCollectionsTests/Delta+NimbleMatcher.swift

@@ -2,48 +2,46 @@ import Nimble
 import ReactiveCollections
 
 internal func ==<T: Equatable, C: Collection>(_ array: Expectation<ReactiveArray<T>>, _ collection: C) where C.Iterator.Element == T {
-	array.to(NonNilMatcherFunc { expression, failureMessage in
+	array.to(Predicate.define { expression in
 		let value = try expression.evaluate()!
+
 		if value.elementsEqual(collection, by: ==) {
-			return true
+			return PredicateResult(status: .matches, message: .expectedTo("succeeds"))
 		}
 
-		failureMessage.actualValue = String(reflecting: value)
-		failureMessage.expected = String(reflecting: collection)
-		return false
+		return PredicateResult(status: .doesNotMatch,
+		                       message: .expectedActualValueTo("match \(collection)"))
 	})
 }
 
 internal func ==<Snapshot, ChangeRepresentation>(
 	left: Expectation<Delta<Snapshot, ChangeRepresentation>>,
 	right: Delta<Snapshot, ChangeRepresentation>
 ) where Snapshot.Iterator.Element: Equatable, ChangeRepresentation: Equatable {
-	return left.to(NonNilMatcherFunc { expression, failureMessage in
+	return left.to(Predicate.define { expression in
 		let value = try expression.evaluate()!
+
 		if value == right {
-			return true
+			return PredicateResult(status: .matches, message: .expectedTo("succeeds"))
 		}
 
-		failureMessage.expected = "expected \(right.debugDescription)"
-		failureMessage.to = ""
-		failureMessage.actualValue = value.debugDescription
-		return false
+		return PredicateResult(status: .doesNotMatch,
+		                       message: .expectedActualValueTo("match \(right)"))
 	})
 }
 
 internal func ==<Snapshot, ChangeRepresentation>(
 	left: Expectation<[Delta<Snapshot, ChangeRepresentation>]>,
 	right: [Delta<Snapshot, ChangeRepresentation>]
 ) where Snapshot.Iterator.Element: Equatable, ChangeRepresentation: Equatable {
-	return left.to(NonNilMatcherFunc { expression, failureMessage in
+	return left.to(Predicate.define { expression in
 		let value = try expression.evaluate()!
+
 		if value.elementsEqual(right, by: ==) {
-			return true
+			return PredicateResult(status: .matches, message: .expectedTo("succeeds"))
 		}
 
-		failureMessage.expected = "expected \(right.debugDescription)"
-		failureMessage.to = ""
-		failureMessage.actualValue = value.debugDescription
-		return false
+		return PredicateResult(status: .doesNotMatch,
+		                       message: .expectedActualValueTo("match \(right)"))
 	})
 }