diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/test/unit/assertions.rb | 6 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Fri Nov 18 13:20:26 2011 NAKAMURA Usaku <usa@ruby-lang.org> + + * test/unit/assertions.rb (MINI_DIR): quick dirty hack to get rid of + warnings when using assert/assert_respond_to. + Fri Nov 18 13:03:38 2011 NAKAMURA Usaku <usa@ruby-lang.org> * io.c (rb_cloexec_open): set O_NOINHERIT instead of O_CLOEXEC if it is diff --git a/lib/test/unit/assertions.rb b/lib/test/unit/assertions.rb index 157cbac743..49987fab57 100644 --- a/lib/test/unit/assertions.rb +++ b/lib/test/unit/assertions.rb @@ -10,6 +10,8 @@ module Test obj.pretty_inspect.chomp end + MINI_DIR = File.join(File.dirname(File.dirname(File.expand_path(__FILE__))), "minitest") #:nodoc: + UNASSIGNED = Object.new # :nodoc: # :call-seq: @@ -30,7 +32,7 @@ module Test msg = nil when String, Proc else - bt = caller.reject { |s| s.rindex(MiniTest::MINI_DIR, 0) } + bt = caller.reject { |s| s.rindex(MINI_DIR, 0) } raise ArgumentError, "assertion message must be String or Proc, but #{msg.class} was given.", bt end super @@ -250,7 +252,7 @@ EOT # assert_respond_to("hello", :does_not_exist) #Fails def assert_respond_to obj, meth, msg = nil #get rid of overcounting - super if !caller[0].rindex(MiniTest::MINI_DIR, 0) || !obj.respond_to?(meth) + super if !caller[0].rindex(MINI_DIR, 0) || !obj.respond_to?(meth) end # :call-seq: |