Mirrors/inspec
2
0
Fork 0
mirror of https://github.com/inspec/inspec synced 2024-11-27 15:10:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #668 from chef/dr/format-cmp

Browse source 
bugfix: fix formatting of cmp expectations
This commit is contained in:
Stephan Renatus 2016-04-20 10:55:16 +02:00
commit bc8cebde73
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/matchers/matchers.rb
View file

@ -274,21 +274,27 @@ RSpec::Matchers.define :cmp do |first_expected|
try_match(actual, @operation, @expected)
end
[:==, :<, :<=, :>=, :>, :===, :=~].each do |op|
[:==, :'!=', :<, :<=, :>=, :>, :===, :=~].each do |op|
chain(op) do |x|
@operation = op
@expected = x
end
end
def format_expectation(negate)
return 'expected: '+@expected.inspect if @operation == :== && !negate
negate_str = negate ? 'not ' : ''
"expected it #{negate_str}to be #{@operation} #{@expected.inspect}"
end
failure_message do |actual|
actual = '0' + actual.to_s(8) if octal?(@expected)
"\nexpected: value #{@operation} #{@expected}\n got: #{actual}\n\n(compared using `cmp` matcher)\n"
"\n" + format_expectation(false) + "\n got: #{actual}\n\n(compared using `cmp` matcher)\n"
end
failure_message_when_negated do |actual|
actual = '0' + actual.to_s(8) if octal?(@expected)
"\nexpected: value ! #{@operation} #{@expected}\n got: #{actual}\n\n(compared using `cmp` matcher)\n"
"\n" + format_expectation(true) + "\n got: #{actual}\n\n(compared using `cmp` matcher)\n"
end
end