archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-20 11:03:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 33784:

Browse source 
* 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
This commit is contained in:
naruse 2012-02-06 12:21:54 +00:00
parent 7e82751c42
commit d95723ea9d
3 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> Mon Feb 6 20:38:19 2012 NARUSE, Yui <naruse@ruby-lang.org>
* file.c (file_expand_path): reset coderange after expanding path. * file.c (file_expand_path): reset coderange after expanding path.

6
lib/test/unit/assertions.rb
View file

@ -10,6 +10,8 @@ module Test
obj.pretty_inspect.chomp obj.pretty_inspect.chomp
end end
MINI_DIR = File.join(File.dirname(File.dirname(File.expand_path(__FILE__))), "minitest") #:nodoc:
UNASSIGNED = Object.new # :nodoc: UNASSIGNED = Object.new # :nodoc:
# :call-seq: # :call-seq:
@ -30,7 +32,7 @@ module Test
msg = nil msg = nil
when String, Proc when String, Proc
else 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 raise ArgumentError, "assertion message must be String or Proc, but #{msg.class} was given.", bt
end end
super super
@ -250,7 +252,7 @@ EOT
# assert_respond_to("hello", :does_not_exist) #Fails # assert_respond_to("hello", :does_not_exist) #Fails
def assert_respond_to obj, meth, msg = nil def assert_respond_to obj, meth, msg = nil
#get rid of overcounting #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 end
ms = instance_methods(true).map {|sym| sym.to_s } ms = instance_methods(true).map {|sym| sym.to_s }

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3" #define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 41 #define RUBY_PATCHLEVEL 42
#define RUBY_RELEASE_DATE "2012-02-06" #define RUBY_RELEASE_DATE "2012-02-06"
#define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_YEAR 2012