aboutsummaryrefslogtreecommitdiffstats
path: root/lib/minitest/unit.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/minitest/unit.rb')
-rw-r--r--lib/minitest/unit.rb11
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: