From d95723ea9dccc43cf3d0391fe6349739f780125c Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 6 Feb 2012 12:21:54 +0000
Subject: [PATCH] merge revision(s) 33784:

	* test/unit/assertions.rb (MINI_DIR): quick dirty hack to get rid of
	  warnings when using assert/assert_respond_to.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34444 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                   | 5 +++++
 lib/test/unit/assertions.rb | 6 ++++--
 version.h                   | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a854034c26..dddc0a62b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Feb  6 21:21:46 2012  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.
+
 Mon Feb  6 20:38:19 2012  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* file.c (file_expand_path): reset coderange after expanding path.
diff --git a/lib/test/unit/assertions.rb b/lib/test/unit/assertions.rb
index b023a778b6..19d88d09c7 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
 
       ms = instance_methods(true).map {|sym| sym.to_s }
diff --git a/version.h b/version.h
index 8edf0eac88..9e0a7a6825 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 41
+#define RUBY_PATCHLEVEL 42
 
 #define RUBY_RELEASE_DATE "2012-02-06"
 #define RUBY_RELEASE_YEAR 2012