diff options
author | ryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-09-23 21:27:19 +0000 |
---|---|---|
committer | ryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-09-23 21:27:19 +0000 |
commit | 4c6551b7d36d8741ec5418de073a10d5c01e7246 (patch) | |
tree | a6ce3a02d90e3ce6a075074b13f4dcb2aa067848 /lib/minitest/unit.rb | |
parent | d1a4b542186800607a60490d3aef8e244e00ca0c (diff) | |
download | ruby-4c6551b7d36d8741ec5418de073a10d5c01e7246.tar.gz |
Imported minitest 1.7.2 r5879.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29327 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/minitest/unit.rb')
-rw-r--r-- | lib/minitest/unit.rb | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/minitest/unit.rb b/lib/minitest/unit.rb index c45dec3fc4..80c76c45f3 100644 --- a/lib/minitest/unit.rb +++ b/lib/minitest/unit.rb @@ -222,6 +222,14 @@ module MiniTest begin yield should_raise = true + rescue MiniTest::Skip => e + details = "#{msg}#{mu_pp(exp)} exception expected, not" + + if exp.include? MiniTest::Skip then + return e + else + raise e + end rescue Exception => e details = "#{msg}#{mu_pp(exp)} exception expected, not" assert(exp.any? { |ex| @@ -261,6 +269,7 @@ module MiniTest # +send_ary+ is a receiver, message and arguments. # # Fails unless the call returns a true value + # TODO: I should prolly remove this from specs def assert_send send_ary, m = nil recv, msg, *args = send_ary @@ -503,7 +512,7 @@ module MiniTest end class Unit - VERSION = "1.7.1" # :nodoc: + VERSION = "1.7.2" # :nodoc: attr_accessor :report, :failures, :errors, :skips # :nodoc: attr_accessor :test_count, :assertion_count # :nodoc: |