Update to Nimble 9.0 and Quick 3.0 (#811)

Author: andersio

Cartfile.private

@@ -1,3 +1,3 @@
 github "jspahrsummers/xcconfigs" == 0.12
-github "Quick/Quick" ~> 2.2.1
-github "Quick/Nimble" ~> 8.0.9
+github "Quick/Quick" ~> 3.0.0
+github "Quick/Nimble" ~> 9.0.0

Cartfile.resolved

@@ -1,3 +1,3 @@
-github "Quick/Nimble" "v8.0.9"
-github "Quick/Quick" "v2.2.1"
+github "Quick/Nimble" "v9.0.0"
+github "Quick/Quick" "v3.0.0"
 github "jspahrsummers/xcconfigs" "0.12"

Carthage/Checkouts/Nimble

@@ -11,7 +11,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/Quick/Quick.git", from: "3.0.0"),
-        .package(url: "https://github.com/Quick/Nimble.git", from: "8.0.9"),
+        .package(url: "https://github.com/Quick/Nimble.git", from: "9.0.0"),
     ],
     targets: [
         .target(name: "ReactiveSwift", dependencies: [], path: "Sources"),

Carthage/Checkouts/Quick

@@ -229,7 +229,7 @@ class SchedulerSpec: QuickSpec {
 					expect(count) == 0
 
 					scheduler.queue.resume()
-					expect(count).toEventually(equal(timesToIncrement), pollInterval: 0.1)
+					expect(count).toEventually(equal(timesToIncrement), pollInterval: .milliseconds(100))
 				}
 
 				it("should cancel repeatedly run actions on disposal") {

Package.resolved

@@ -44,15 +44,15 @@ public func sendValues<T: Equatable, E: Equatable>(_ values: [T], sendError mayb
 		if sentValues != values {
 			let message = ExpectationMessage.expectedCustomValueTo(
 				"send values <\(values)>",
-				"<\(sentValues)>"
+				actual: "<\(sentValues)>"
 			)
 			return PredicateResult(status: .doesNotMatch, message: message)
 		}
 
 		if sentError != maybeSendError {
 			let message = ExpectationMessage.expectedCustomValueTo(
 				"send error <\(String(describing: maybeSendError))>",
-				"<\(String(describing: sentError))>"
+				actual: "<\(String(describing: sentError))>"
 			)
 			return PredicateResult(status: .doesNotMatch, message: message)
 		}

Package.swift

@@ -2918,7 +2918,7 @@ class SignalProducerSpec: QuickSpec {
 				expect(result).to(beNil())
 
 				observer.send(value: 1)
-				expect(result).toEventually(equal(1), timeout: 5.0)
+				expect(result).toEventually(equal(1), timeout: .seconds(5))
 			}
 
 			it("should return a nil result if no values are sent before completion") {
@@ -3746,8 +3746,11 @@ class SignalProducerSpec: QuickSpec {
 // MARK: - Helpers
 
 private func == <T>(left: Expectation<T.Type>, right: Any.Type) {
-	left.to(Predicate.fromDeprecatedClosure { expression, _ in
-		return try expression.evaluate()! == right
+	left.to(Predicate { expression in
+		PredicateResult(
+			bool: try expression.evaluate()! == right,
+			message: ExpectationMessage.expectedActualValueTo("equal to")
+		)
 	}.requireNonNil)
 }
 

Tests/ReactiveSwiftTests/SchedulerSpec.swift

@@ -357,7 +357,7 @@ class SignalSpec: QuickSpec {
 				group.wait()
 
 				expect(executionCounter.value) == iterations * 2
-				expect(counter.value).toEventually(equal(iterations), timeout: 5)
+				expect(counter.value).toEventually(equal(iterations), timeout: .seconds(5))
 			}
 		}