diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-19 18:17:13 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-19 18:17:13 -0300 |
commit | 08754f12e65a9ec79633a605e986d0f1ffa4b251 (patch) | |
tree | 19afe9d285cc9169d68de7ea850625833c7bb09c /railties/test/generators | |
parent | 0533893df59a11e5c80a9a64d6db018aa46b3459 (diff) | |
parent | fd6aaaa0c308b36df3bf06eb87b9eebfca1de127 (diff) | |
download | rails-08754f12e65a9ec79633a605e986d0f1ffa4b251.tar.gz rails-08754f12e65a9ec79633a605e986d0f1ffa4b251.tar.bz2 rails-08754f12e65a9ec79633a605e986d0f1ffa4b251.zip |
Merge branch 'rm-remove-mocha'
Conflicts:
actionpack/test/abstract_unit.rb
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 172d724643..a4337926d1 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 da634decd8..409616d0d2 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 |