diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-10 04:38:43 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-10 04:38:43 +0000 |
commit | 23abce4bff51a4abf6d54599df9038831c682f42 (patch) | |
tree | 6fce461d7f2232baf55a763c7b31924a1ada27db | |
parent | 9d742d7365cfde9317b8acf5c24c0b22bc916f9b (diff) |
* test/ruby/envutil.rb: remove duplicated method. this problem was introduced
at r47479.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47504 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | test/ruby/envutil.rb | 20 | ||||
-rw-r--r-- | version.h | 2 |
2 files changed, 1 insertions, 21 deletions
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb index 52879f8d8a..c330850e5c 100644 --- a/test/ruby/envutil.rb +++ b/test/ruby/envutil.rb @@ -423,26 +423,6 @@ eom clone.tap {|a| a.message = message} end end - - # derived from MiniTest 2.1.0 - def assert_raise_with_message(exception, expected, msg = nil, &block) - case expected - when String - assert = :assert_equal - when Regexp - assert = :assert_match - else - raise TypeError, "Expected #{expected.inspect} to be a kind of String or Regexp, not #{expected.class}" - end - - ex = assert_raise(exception, *msg) { yield } - if assert == :assert_equal - assert_equal(expected, ex.message, msg || "Expected exception(#{exception}) was raised, but the message doesn't match") - else - assert(expected =~ ex.message, msg || "Expected #{expected} to match #{ex.message}") - block.binding.eval("proc{|_|$~=_}").call($~) - end - end end end end @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-09-10" -#define RUBY_PATCHLEVEL 565 +#define RUBY_PATCHLEVEL 566 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 9 |