Merge pull request #8180 from freerange/mocha-fixes-supporting-only-0…

….13-onwards Simplify code by taking advantage of latest mocha (v0.13.0).
rails · Nov 13, 2012 · 395d6b4 · 395d6b4
2 parents 8f3f50a + 57b333e
commit 395d6b4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 25 deletions.
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb
@@ -5,16 +5,18 @@
 require 'active_support/testing/assertions'
 require 'active_support/testing/deprecation'
 require 'active_support/testing/isolation'
-require 'active_support/testing/mocha_module'
 require 'active_support/testing/constant_lookup'
 require 'active_support/core_ext/kernel/reporting'
 require 'active_support/deprecation'
 
+begin
+  silence_warnings { require 'mocha/setup' }
+rescue LoadError
+end
+
 module ActiveSupport
   class TestCase < ::MiniTest::Spec
 
-    include ActiveSupport::Testing::MochaModule
-
     # Use AS::TestCase for the base class when describing a model
     register_spec_type(self) do |desc|
       Class === desc && desc < ActiveRecord::Base

diff --git a/activesupport/lib/active_support/testing/mocha_module.rb b/activesupport/lib/active_support/testing/mocha_module.rb