Fixes expectation regression & failure bugs. #428
Conversation
| @@ -15,8 +15,8 @@ func failsWithErrorMessage(_ messages: [String], file: FileString = #file, line: | |||
| var foundFailureMessage = false | |||
|
|
|||
| for assertion in recorder.assertions { | |||
| lastFailure = assertion | |||
| if assertion.message.stringValue == msg { | |||
| if assertion.message.stringValue == msg && !assertion.success { | |||
There was a problem hiding this comment.
For Where Violation: where clauses are preferred over a single if inside a for. (for_where)
| } | ||
|
|
||
|
|
There was a problem hiding this comment.
Vertical Whitespace Violation: Limit vertical whitespace to a single empty line. Currently 2. (vertical_whitespace)
| } | ||
| } | ||
|
|
||
|
|
There was a problem hiding this comment.
Vertical Whitespace Violation: Limit vertical whitespace to a single empty line. Currently 2. (vertical_whitespace)
| } | ||
| } | ||
|
|
||
|
|
There was a problem hiding this comment.
Vertical Whitespace Violation: Limit vertical whitespace to a single empty line. Currently 2. (vertical_whitespace)
| } | ||
| } | ||
|
|
||
|
|
There was a problem hiding this comment.
Vertical Whitespace Violation: Limit vertical whitespace to a single empty line. Currently 2. (vertical_whitespace)
| }.requireNonNil | ||
| } | ||
|
|
||
|
|
There was a problem hiding this comment.
Vertical Whitespace Violation: Limit vertical whitespace to a single empty line. Currently 2. (vertical_whitespace)
| /// error of the specified type | ||
| public func matchError<T: Error>(_ errorType: T.Type) -> Predicate<Error> { | ||
| return Predicate.fromDeprecatedClosure { actualExpression, failureMessage in | ||
| let actualError: Error? = try actualExpression.evaluate() | ||
|
|
||
| setFailureMessageForError(failureMessage, postfixMessageVerb: "match", actualError: actualError, errorType: errorType) | ||
| return errorMatchesNonNilFieldsOrClosure(actualError, errorType: errorType) | ||
| var matches = false | ||
| if let _ = actualError as? T { |
There was a problem hiding this comment.
Unused Optional Binding Violation: Prefer != nil over let _ = (unused_optional_binding)
| let location = actualExpression.location | ||
| let actualValue = try! actualExpression.evaluate() | ||
| failureMessage.postfixMessage = "be empty" | ||
|
|
||
|
|
There was a problem hiding this comment.
Vertical Whitespace Violation: Limit vertical whitespace to a single empty line. Currently 2. (vertical_whitespace)
- Fix regression where `expect(nil as [String]?).toEventuallyNot(beNil())` fails. (Closes Quick#424) - Fix bug in Nimble's internal failure checker: `failsWithErrorMessage`. (Closes Quick#425). Shout out to @chamander for finding the bug. - Fix `Error` failing to dispatch to `Equatable` equality checking (instead of `NSError`). What's left: Fix the failure cases that the `failsWithErrorMessage` fix reveals in `NMBObjCMatcher`. `NMBObjCMatcher` will need the same trinary behavior that `Predicate` has.
jeffh
force-pushed
the
expectation-regression
branch
from
546c32a to
e3726f7
Compare
jeffh
changed the title
Fixes expectation regression & failure bugs.
expect(nil as [String]?).toEventuallyNot(beNil())fails. (ClosestoEventuallyNotpasses when it should not on Nimble 7.0.0 #424)failsWithErrorMessage. (Closes Expectations are not behaving as expected! #425). Shout out to @chamander for finding the bug.Errorfailing to dispatch toEquatableequality checking (instead ofNSError).What's left:
Fix the failure cases that the
failsWithErrorMessagefix reveals inNMBObjCMatcher.NMBObjCMatcherwill need the same trinary behavior thatPredicatehas.