test/test_helper.rb in seatbelt-1.0.0 vs test/test_helper.rb in seatbelt-2.0.0
- old
+ new
@@ -1,10 +1,10 @@
require 'maxitest/autorun'
require 'active_support'
require 'action_mailer'
require 'json'
-require 'mocha/setup'
+require 'mocha/minitest'
$:.push File.expand_path("../../lib", __FILE__)
require File.dirname(__FILE__) + '/../lib/seatbelt.rb'
# Requiring custom spec helpers
@@ -13,12 +13,8 @@
# Turn.config.format = :dot
class Minitest::Test
def assert_assertion_fails(&block)
- if Object.const_defined?(:MiniTest)
- assert_raises(MiniTest::Assertion, &block)
- else
- assert_raises(Test::Unit::AssertionFailedError, &block)
- end
+ assert_raises(::Minitest::Assertion, &block)
end
end