1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

Imported minitest 3.2.0 (r7598). Reviewed by drbrain

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36370 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ryan 2012-07-11 23:52:04 +00:00
parent 35784d1019
commit 9696b3eb16
8 changed files with 33 additions and 31 deletions

View file

@ -57,12 +57,12 @@ module MiniTest
self
end
def call name, data
def __call name, data
case data
when Hash then
"#{name}(#{data[:args].inspect[1..-2]}) => #{data[:retval].inspect}"
else
data.map { |d| call name, d }.join ", "
data.map { |d| __call name, d }.join ", "
end
end
@ -74,15 +74,16 @@ module MiniTest
def verify
@expected_calls.each do |name, calls|
calls.each do |expected|
msg1 = "expected #{call name, expected}"
msg2 = "#{msg1}, got [#{call name, @actual_calls[name]}]"
msg1 = "expected #{__call name, expected}"
msg2 = "#{msg1}, got [#{__call name, @actual_calls[name]}]"
raise MockExpectationError, msg2 if
@actual_calls.has_key? name and
@actual_calls.has_key?(name) and
not @actual_calls[name].include?(expected)
raise MockExpectationError, msg1 unless
@actual_calls.has_key? name and @actual_calls[name].include?(expected)
@actual_calls.has_key?(name) and
@actual_calls[name].include?(expected)
end
end
true
@ -163,7 +164,7 @@ class Object # :nodoc:
end
end
yield
yield self
ensure
metaclass.send :undef_method, name
metaclass.send :alias_method, name, new_name