iv-org-mirror/shard-spectator
1
0
Fork 0
mirror of https://gitea.invidious.io/iv-org/shard-spectator.git synced 2024-08-15 00:53:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix string usage with contain matcher

Browse source
This commit is contained in:
Michael Miller 2020-12-23 14:11:50 -07:00
parent f6fc36f60a
commit de1af7178c
No known key found for this signature in database
GPG key ID: FB9F12F7C646A4AD
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/spectator/matchers/contain_matcher.cr
View file

@ -8,7 +8,7 @@ module Spectator::Matchers
private getter expected private getter expected
# Creates the matcher with an expected value. # Creates the matcher with an expected value.
def initialize(@expected : TestValue(Array(ExpectedType))) def initialize(@expected : TestValue(ExpectedType))
end end
# Short text about the matcher's purpose. # Short text about the matcher's purpose.
@ -23,9 +23,8 @@ module Spectator::Matchers
actual_value = actual.value actual_value = actual.value
return unexpected(actual_value, actual.label) unless actual_value.responds_to?(:includes?) return unexpected(actual_value, actual.label) unless actual_value.responds_to?(:includes?)
actual_elements = actual_value.to_a
missing = expected.value.reject do |item| missing = expected.value.reject do |item|
actual_elements.includes?(item) actual_value.includes?(item)
end end
if missing.empty? if missing.empty?
@ -35,7 +34,7 @@ module Spectator::Matchers
# Content is missing. # Content is missing.
FailedMatchData.new(description, "#{actual.label} does not contain #{expected.label}", FailedMatchData.new(description, "#{actual.label} does not contain #{expected.label}",
expected: expected.value.inspect, expected: expected.value.inspect,
actual: actual_elements.inspect, actual: actual_value.inspect,
missing: missing.inspect, missing: missing.inspect,
) )
end end
@ -47,16 +46,15 @@ module Spectator::Matchers
actual_value = actual.value actual_value = actual.value
return unexpected(actual_value, actual.label) unless actual_value.responds_to?(:includes?) return unexpected(actual_value, actual.label) unless actual_value.responds_to?(:includes?)
actual_elements = actual_value.to_a
missing = expected.value.reject do |item| missing = expected.value.reject do |item|
actual_elements.includes?(item) actual_value.includes?(item)
end end
if missing.empty? if missing.empty?
# Contents are identical. # Contents are identical.
FailedMatchData.new(description, "#{actual.label} contains #{expected.label}", FailedMatchData.new(description, "#{actual.label} contains #{expected.label}",
expected: "Not #{expected_elements.inspect}", expected: "Not #{expected.value.inspect}",
actual: actual_elements.inspect actual: actual_value.inspect
) )
else else
# Content differs. # Content differs.