diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-28 12:13:21 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-28 12:13:21 -0300 |
| commit | 0397348a0f8b2c35a5b03c9cd279901b078a1293 (patch) | |
| tree | e97242d71b28f82d1d908dc1131abacfb2026a01 | |
| parent | e10262962b0be6525f93824a2dcb51f1f88d2c05 (diff) | |
| parent | 04332e34d88419e521d10b906e7ef74896d2af39 (diff) | |
| download | rails-0397348a0f8b2c35a5b03c9cd279901b078a1293.tar.gz rails-0397348a0f8b2c35a5b03c9cd279901b078a1293.tar.bz2 rails-0397348a0f8b2c35a5b03c9cd279901b078a1293.zip | |
Merge branch 'fix-test_unit-railtie'
This branch is composed of #10629 and #10708
Closes #10629
Closes #10708
Fixes #10628
| -rw-r--r-- | railties/lib/rails/test_unit/railtie.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/test_unit/railtie.rb b/railties/lib/rails/test_unit/railtie.rb index ab1ebe1f8c..75180ff978 100644 --- a/railties/lib/rails/test_unit/railtie.rb +++ b/railties/lib/rails/test_unit/railtie.rb @@ -1,4 +1,4 @@ -if defined?(Rake) && Rake.application.top_level_tasks.grep(/^(default$|test(:|$))/).any? +if defined?(Rake.application) && Rake.application.top_level_tasks.grep(/^(default$|test(:|$))/).any? ENV['RAILS_ENV'] ||= 'test' end |