diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mini/mock.rb | 6 | ||||
| -rw-r--r-- | lib/mini/test.rb | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/lib/mini/mock.rb b/lib/mini/mock.rb index 7276125408..1b79146cb3 100644 --- a/lib/mini/mock.rb +++ b/lib/mini/mock.rb @@ -17,9 +17,9 @@ class Mini::Mock def expect(name, retval, args=[]) n, r, a = name, retval, args # for the closure below @expected_calls[name] = { :retval => retval, :args => args } - self.class.__send__(:define_method, name) { |*a| - raise ArgumentError unless @expected_calls[n][:args].size == a.size - @actual_calls[n] << { :retval => r, :args => a } + self.class.__send__(:define_method, name) { |*x| + raise ArgumentError unless @expected_calls[n][:args].size == x.size + @actual_calls[n] << { :retval => r, :args => x } retval } self diff --git a/lib/mini/test.rb b/lib/mini/test.rb index 1d76b40974..35a8df4a34 100644 --- a/lib/mini/test.rb +++ b/lib/mini/test.rb @@ -14,13 +14,15 @@ module Mini class Assertion < Exception; end class Skip < Assertion; end - file = if __FILE__ =~ /^[^\.]/ then # OMG ruby 1.9 is so lame (rubinius too) + file = if RUBY_VERSION =~ /^1\.9/ then # bt's expanded, but __FILE__ isn't :( + File.expand_path __FILE__ + elsif __FILE__ =~ /^[^\.]/ then # assume both relative require 'pathname' - pwd = Pathname.new(Dir.pwd) - pn = Pathname.new(File.expand_path(__FILE__)) + pwd = Pathname.new Dir.pwd + pn = Pathname.new File.expand_path(__FILE__) pn = File.join(".", pn.relative_path_from(pwd)) unless pn.relative? pn.to_s - else + else # assume both are expanded __FILE__ end @@ -36,10 +38,8 @@ module Mini new_bt << line end - new_bt = bt.reject { |line| line.rindex(MINI_DIR, 0) } if - new_bt.empty? + new_bt = bt.reject { |line| line.rindex(MINI_DIR, 0) } if new_bt.empty? new_bt = bt.dup if new_bt.empty? - new_bt end |