diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-04-24 09:42:45 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-04-24 09:42:45 -0700 |
| commit | 0d8a100f753f2cab86753c09c74563bf01611dff (patch) | |
| tree | 34033d7627f7500b8ed5082a787249549508faab | |
| parent | 2a8994122588a2bafb8cf052f2ca1a49a2b758d6 (diff) | |
| parent | 3ff263919c67588e4348da30cb92b860fe83cba5 (diff) | |
| download | rails-0d8a100f753f2cab86753c09c74563bf01611dff.tar.gz rails-0d8a100f753f2cab86753c09c74563bf01611dff.tar.bz2 rails-0d8a100f753f2cab86753c09c74563bf01611dff.zip | |
Merge pull request #10256 from wangjohn/moving_check_for_test_environment_into_rails_env
Moved the check for the rails test environment into rails.rb
Closes #10238
| -rw-r--r-- | railties/lib/rails/all.rb | 4 | ||||
| -rw-r--r-- | railties/lib/rails/test_unit/railtie.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/railties/lib/rails/all.rb b/railties/lib/rails/all.rb index 1493815c30..6c9c53fc69 100644 --- a/railties/lib/rails/all.rb +++ b/railties/lib/rails/all.rb @@ -1,9 +1,5 @@ require "rails" -if defined?(Rake) && Rake.application.top_level_tasks.grep(/^(default$|test(:|$))/).any? - ENV['RAILS_ENV'] ||= 'test' -end - %w( active_record action_controller diff --git a/railties/lib/rails/test_unit/railtie.rb b/railties/lib/rails/test_unit/railtie.rb index f52c4c44b7..ab1ebe1f8c 100644 --- a/railties/lib/rails/test_unit/railtie.rb +++ b/railties/lib/rails/test_unit/railtie.rb @@ -1,3 +1,7 @@ +if defined?(Rake) && Rake.application.top_level_tasks.grep(/^(default$|test(:|$))/).any? + ENV['RAILS_ENV'] ||= 'test' +end + module Rails class TestUnitRailtie < Rails::Railtie config.app_generators do |c| |