diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-19 17:35:12 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-19 17:35:12 -0300 |
| commit | fd6aaaa0c308b36df3bf06eb87b9eebfca1de127 (patch) | |
| tree | 2a9d1ae1a381a18f09be544f891a0c267bc83aa9 /railties/test/generators | |
| parent | fcc2231a04a4911c4cccc05592d100bc280e142a (diff) | |
| download | rails-fd6aaaa0c308b36df3bf06eb87b9eebfca1de127.tar.gz rails-fd6aaaa0c308b36df3bf06eb87b9eebfca1de127.tar.bz2 rails-fd6aaaa0c308b36df3bf06eb87b9eebfca1de127.zip | |
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
Diffstat (limited to 'railties/test/generators')
| -rw-r--r-- | railties/test/generators/actions_test.rb | 1 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 1 | ||||
| -rw-r--r-- | railties/test/generators/named_base_test.rb | 1 | ||||
| -rw-r--r-- | railties/test/generators/plugin_generator_test.rb | 1 |
4 files changed, 4 insertions, 0 deletions
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 |