You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
29 lines
977 B
29 lines
977 B
commit e4a88348dde432201611292802537b590d6734ea
|
|
Author: Ken Dreyer <ktdreyer@ktdreyer.com>
|
|
Date: Sat Jul 27 21:19:53 2013 -0600
|
|
|
|
require "mocha/setup" in test_helper
|
|
|
|
We must require mocha/setup before referring to classes named "Mocha".
|
|
|
|
diff --git a/test/test_helper.rb b/test/test_helper.rb
|
|
index 092ac73..047288b 100644
|
|
--- a/test/test_helper.rb
|
|
+++ b/test/test_helper.rb
|
|
@@ -23,6 +23,7 @@ if defined?(::Minitest) || defined?(MiniTest)
|
|
rescue LoadError
|
|
MiniTest::Unit.autorun
|
|
end
|
|
+ require 'mocha/setup'
|
|
class Mocha::TestCase < defined?(Minitest::Test) ? Minitest::Test : MiniTest::Unit::TestCase
|
|
def assert_nothing_raised(exception = StandardError)
|
|
yield
|
|
@@ -37,6 +38,7 @@ if defined?(::Minitest) || defined?(MiniTest)
|
|
end
|
|
else
|
|
require 'test/unit'
|
|
+ require 'mocha/setup'
|
|
class Mocha::TestCase < Test::Unit::TestCase
|
|
def test_dummy
|
|
# Some versions (?) of Test::Unit try to run this base class as a test case
|