Merge pull request thoughtbot#23 from melindaweathers/master

Support for Rails 4 RC1
melindaweathers · May 16, 2013 · bf9dd68 · bf9dd68
2 parents 647a031 + da6dd16
commit bf9dd68
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/shoulda/context.rb b/lib/shoulda/context.rb
@@ -1,11 +1,11 @@
 begin
-  # if present, then also loads MiniTest::Spec
+  # if present, then also loads MiniTest::Unit::TestCase
   ActiveSupport::TestCase
 rescue
 end
 
-if defined?([ActiveSupport::TestCase, MiniTest::Spec]) && (ActiveSupport::TestCase.ancestors.include?(MiniTest::Spec))
-  base_test_case = MiniTest::Spec
+if defined?([ActiveSupport::TestCase, MiniTest::Unit::TestCase]) && (ActiveSupport::TestCase.ancestors.include?(MiniTest::Unit::TestCase))
+  base_test_case = MiniTest::Unit::TestCase
 else
   if !defined?(Test::Unit::TestCase)
     require 'test/unit/testcase'