Merge pull request #587 from Quick/fix-predicate-fromdeprecatedclosure

[7.x] Fix `ExpectationMessage.update(failureMessage:)` not to update a `FailureMessage` instance with empty string

Author: ikesyo

Sources/Nimble/ExpectationMessage.swift

@@ -152,8 +152,10 @@ public indirect enum ExpectationMessage {
     // Backwards compatibility: converts ExpectationMessage tree to FailureMessage
     internal func update(failureMessage: FailureMessage) {
         switch self {
-        case let .fail(msg):
+        case let .fail(msg) where !msg.isEmpty:
             failureMessage.stringValue = msg
+        case .fail:
+            break
         case let .expectedTo(msg):
             failureMessage.actualValue = nil
             failureMessage.postfixMessage = msg

Tests/NimbleTests/SynchronousTests.swift

@@ -16,6 +16,7 @@ final class SynchronousTest: XCTestCase, XCTestCaseProvider {
             ("testToNotProvidesActualValueExpression", testToNotProvidesActualValueExpression),
             ("testToNotProvidesAMemoizedActualValueExpression", testToNotProvidesAMemoizedActualValueExpression),
             ("testToNotProvidesAMemoizedActualValueExpressionIsEvaluatedAtMatcherControl", testToNotProvidesAMemoizedActualValueExpressionIsEvaluatedAtMatcherControl),
+            ("testToNegativeMatches", testToNegativeMatches),
             ("testToNotNegativeMatches", testToNotNegativeMatches),
             ("testNotToMatchesLikeToNot", testNotToMatchesLikeToNot),
         ]
@@ -116,10 +117,22 @@ final class SynchronousTest: XCTestCase, XCTestCaseProvider {
         expect(callCount).to(equal(1))
     }
 
+    func testToNegativeMatches() {
+        failsWithErrorMessage("expected to match, got <1>") {
+            expect(1).to(MatcherFunc { _, _ in false })
+        }
+        failsWithErrorMessage("expected to match, got <1>") {
+            expect(1).to(MatcherFunc { _, _ in false }.predicate)
+        }
+    }
+
     func testToNotNegativeMatches() {
         failsWithErrorMessage("expected to not match, got <1>") {
             expect(1).toNot(MatcherFunc { _, _ in true })
         }
+        failsWithErrorMessage("expected to not match, got <1>") {
+            expect(1).toNot(MatcherFunc { _, _ in true }.predicate)
+        }
     }
 
     func testNotToMatchesLikeToNot() {