From fd6aaaa0c308b36df3bf06eb87b9eebfca1de127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Sat, 19 Jul 2014 17:35:12 -0300
Subject: Stop requiring mocha automatically

We are planning to remove mocha from our test suite because of
performance problems. To make this possible we should stop require mocha
on ActionSupport::TestCase.

This should not affect applications since users still need to add mocha
to Gemfile and this already load mocha.

Added FIXME notes to place that still need mocha removal
---
 railties/test/generators/actions_test.rb          | 1 +
 railties/test/generators/app_generator_test.rb    | 1 +
 railties/test/generators/named_base_test.rb       | 1 +
 railties/test/generators/plugin_generator_test.rb | 1 +
 railties/test/generators_test.rb                  | 1 +
 railties/test/paths_test.rb                       | 1 +
 railties/test/rails_info_controller_test.rb       | 1 +
 7 files changed, 7 insertions(+)

(limited to 'railties')

diff --git a/railties/test/generators/actions_test.rb b/railties/test/generators/actions_test.rb
index 6d6de0fb52..8c30d4e215 100644
--- a/railties/test/generators/actions_test.rb
+++ b/railties/test/generators/actions_test.rb
@@ -1,6 +1,7 @@
 require 'generators/generators_test_helper'
 require 'rails/generators/rails/app/app_generator'
 require 'env_helpers'
+require 'mocha/setup' # FIXME: stop using mocha
 
 class ActionsTest < Rails::Generators::TestCase
   include GeneratorsTestHelper
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 2ac5410960..5daa215d46 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -1,6 +1,7 @@
 require 'generators/generators_test_helper'
 require 'rails/generators/rails/app/app_generator'
 require 'generators/shared_generator_tests'
+require 'mocha/setup' # FIXME: stop using mocha
 
 DEFAULT_APP_FILES = %w(
   .gitignore
diff --git a/railties/test/generators/named_base_test.rb b/railties/test/generators/named_base_test.rb
index ac5cfff229..4199e00b0d 100644
--- a/railties/test/generators/named_base_test.rb
+++ b/railties/test/generators/named_base_test.rb
@@ -1,5 +1,6 @@
 require 'generators/generators_test_helper'
 require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
+require 'mocha/setup' # FIXME: stop using mocha
 
 # Mock out what we need from AR::Base.
 module ActiveRecord
diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb
index 7180efee41..0d01931daa 100644
--- a/railties/test/generators/plugin_generator_test.rb
+++ b/railties/test/generators/plugin_generator_test.rb
@@ -1,6 +1,7 @@
 require 'generators/generators_test_helper'
 require 'rails/generators/rails/plugin/plugin_generator'
 require 'generators/shared_generator_tests'
+require 'mocha/setup' # FIXME: stop using mocha
 
 DEFAULT_PLUGIN_FILES = %w(
   .gitignore
diff --git a/railties/test/generators_test.rb b/railties/test/generators_test.rb
index 0b4edafaca..b5765c391e 100644
--- a/railties/test/generators_test.rb
+++ b/railties/test/generators_test.rb
@@ -1,6 +1,7 @@
 require 'generators/generators_test_helper'
 require 'rails/generators/rails/model/model_generator'
 require 'rails/generators/test_unit/model/model_generator'
+require 'mocha/setup' # FIXME: stop using mocha
 
 class GeneratorsTest < Rails::Generators::TestCase
   include GeneratorsTestHelper
diff --git a/railties/test/paths_test.rb b/railties/test/paths_test.rb
index ed4559ec6f..1aeb9ec339 100644
--- a/railties/test/paths_test.rb
+++ b/railties/test/paths_test.rb
@@ -1,5 +1,6 @@
 require 'abstract_unit'
 require 'rails/paths'
+require 'mocha/setup' # FIXME: stop using mocha
 
 class PathsTest < ActiveSupport::TestCase
   def setup
diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb
index a9b237d0a5..8d61af4972 100644
--- a/railties/test/rails_info_controller_test.rb
+++ b/railties/test/rails_info_controller_test.rb
@@ -1,4 +1,5 @@
 require 'abstract_unit'
+require 'mocha/setup' # FIXME: stop using mocha
 
 module ActionController
   class Base
-- 
cgit v1.2.3