diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-28 12:11:29 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-28 12:11:29 -0300 |
| commit | 643e0b23d6483dfe8e7b10f690a940c4c490df4e (patch) | |
| tree | 22af17e9dc1e76ad3ea2ffd925e033c8258991ff | |
| parent | e10262962b0be6525f93824a2dcb51f1f88d2c05 (diff) | |
| parent | bdc2aa54caf2ac7a11e42b4a3a25a6fdb892d86d (diff) | |
| download | rails-643e0b23d6483dfe8e7b10f690a940c4c490df4e.tar.gz rails-643e0b23d6483dfe8e7b10f690a940c4c490df4e.tar.bz2 rails-643e0b23d6483dfe8e7b10f690a940c4c490df4e.zip | |
Merge pull request #10629 from stmpjmpr/bug_10628
Fixes bug 10628.
| -rw-r--r-- | railties/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | railties/lib/rails/test_unit/railtie.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index d11b0b7e85..25331cda58 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,5 @@ +* Fixes bug with testing nil Rake::Application (bug #10628). + * Fixes bug with scaffold generator with `--assets=false --resource-route=false`. Fixes #9525. diff --git a/railties/lib/rails/test_unit/railtie.rb b/railties/lib/rails/test_unit/railtie.rb index ab1ebe1f8c..598140284a 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) && defined?(Rake.application) && Rake.application.top_level_tasks.grep(/^(default$|test(:|$))/).any? ENV['RAILS_ENV'] ||= 'test' end |