mirror of
https://gitea.invidious.io/iv-org/shard-spectator.git
synced 2024-08-15 00:53:35 +00:00
Fix most problems (hopefully) with ExceptionMatcher
This commit is contained in:
parent
2251168631
commit
c47b47ade9
1 changed files with 41 additions and 30 deletions
|
@ -25,50 +25,61 @@ module Spectator::Matchers
|
|||
|
||||
def match(actual)
|
||||
exception = capture_exception { actual.value }
|
||||
case exception
|
||||
when Nil
|
||||
FailedMatchData.new("#{actual.label} did not raise", expected: ExpectedType.inspect)
|
||||
when ExceptionType
|
||||
if expected.value.nil? || expected.value === exception.message
|
||||
if exception.nil?
|
||||
FailedMatchData.new("#{actual.label} did not raise", expected: ExceptionType.inspect)
|
||||
else
|
||||
if exception.is_a?(ExceptionType)
|
||||
if (value = expected.value).nil?
|
||||
SuccessfulMatchData.new
|
||||
else
|
||||
FailedMatchData.new("#{actual.label} raised #{ExpectedType}, but the message is not #{expected.label}",
|
||||
if value === exception.message
|
||||
SuccessfulMatchData.new
|
||||
else
|
||||
FailedMatchData.new("#{actual.label} raised #{exception.class}, but the message is not #{expected.label}",
|
||||
"expected type": ExceptionType.inspect,
|
||||
"actual type": exception.class.inspect,
|
||||
"expected message": expected.value.inspect,
|
||||
"actual message": exception.message
|
||||
"expected message": value.inspect,
|
||||
"actual message": exception.message.to_s
|
||||
)
|
||||
end
|
||||
end
|
||||
else
|
||||
FailedMatchData.new("#{actual.label} did not raise #{ExpectedType}",
|
||||
expected: ExpectedType.inspect,
|
||||
FailedMatchData.new("#{actual.label} did not raise #{ExceptionType}",
|
||||
expected: ExceptionType.inspect,
|
||||
actual: exception.class.inspect
|
||||
)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def negated_match(actual)
|
||||
exception = capture_exception { actual.value }
|
||||
case exception
|
||||
when Nil
|
||||
if exception.nil?
|
||||
SuccessfulMatchData.new
|
||||
when ExceptionType
|
||||
if expected.value.nil?
|
||||
FailedMatchData.new("#{actual.label} raised #{ExpectedType}")
|
||||
elsif expected.value === exception.message
|
||||
FailedMatchData.new("#{actual.label} raised #{ExpectedType} with message matching #{expected.label}",
|
||||
else
|
||||
if exception.is_a?(ExceptionType)
|
||||
if (value = expected.value).nil?
|
||||
FailedMatchData.new("#{actual.label} raised #{exception.class}",
|
||||
expected: "Not #{ExceptionType}",
|
||||
actual: exception.class.inspect
|
||||
)
|
||||
else
|
||||
if value === exception.message
|
||||
FailedMatchData.new("#{actual.label} raised #{exception.class} with message matching #{expected.label}",
|
||||
"expected type": ExceptionType.inspect,
|
||||
"actual type": exception.class.inspect,
|
||||
"expected message": expected.value.inspect,
|
||||
"actual message": exception.message
|
||||
"expected message": value.inspect,
|
||||
"actual message": exception.message.to_s
|
||||
)
|
||||
else
|
||||
SuccessfulMatchData.new
|
||||
end
|
||||
end
|
||||
else
|
||||
SuccessfulMatchData.new
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# Runs a block of code and returns the exception it threw.
|
||||
# If no exception was thrown, *nil* is returned.
|
||||
|
|
Loading…
Reference in a new issue