From b7a4fe18f2cee1385e7dcd36016fb6a15b93aef6 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 3 Jul 2012 14:28:01 -0700
Subject: [PATCH] remove duplicate requires of mocha.

Mocha is already required by AS::TestCase, so remove the duplicate
requires.
---
 activerecord/test/cases/helper.rb   | 1 -
 activesupport/test/abstract_unit.rb | 2 --
 railties/test/generators_test.rb    | 1 -
 3 files changed, 4 deletions(-)

diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index afff020561..44d08a8ee4 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -5,7 +5,6 @@ require 'config'
 gem 'minitest'
 require 'minitest/autorun'
 require 'stringio'
-require 'mocha'
 
 require 'cases/test_case'
 require 'active_record'
diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb
index 57ed4a6b60..25ed962c23 100644
--- a/activesupport/test/abstract_unit.rb
+++ b/activesupport/test/abstract_unit.rb
@@ -18,8 +18,6 @@ end
 require 'minitest/autorun'
 require 'empty_bool'
 
-silence_warnings { require 'mocha' }
-
 ENV['NO_RELOAD'] = '1'
 require 'active_support'
 
diff --git a/railties/test/generators_test.rb b/railties/test/generators_test.rb
index 417d019178..ad2f85a5ff 100644
--- a/railties/test/generators_test.rb
+++ b/railties/test/generators_test.rb
@@ -1,7 +1,6 @@
 require 'generators/generators_test_helper'
 require 'rails/generators/rails/model/model_generator'
 require 'rails/generators/test_unit/model/model_generator'
-require 'mocha'
 
 class GeneratorsTest < Rails::Generators::TestCase
   include GeneratorsTestHelper