@@ -13,7 +13,12 @@ module Shoulda # end def should_fail(&block) context "should fail when trying to run:" do - Shoulda.expected_exceptions = [Test::Unit::AssertionFailedError] + if defined?(Test::Unit::AssertionFailedError) + failures = [Test::Unit::AssertionFailedError] + elsif defined?(MiniTest::Assertion) + failures = [MiniTest::Assertion] + end + Shoulda.expected_exceptions = failures yield block Shoulda.expected_exceptions = nil end test/fail_macros.rb f062a6924e4b4539eef1eb2d318f2b82367e692f Dean Strelau dean@mintdigital.com http://github.com/thoughtbot/shoulda/commit/13ff067422765a5e113da6e0188b4fc9ca9dccfb 13ff067422765a5e113da6e0188b4fc9ca9dccfb 2009-06-02T19:41:17-07:00 2009-06-02T19:41:17-07:00 When searching for test failure, accept either MiniTest::Assertion or Test::Unit::AssertionFailedError for Ruby 1.9 compatibility. dcd1b142d005d186332fb0d5f4015cce49475f9d Dean Strelau dean@mintdigital.com