kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #10629 from stmpjmpr/bug_10628

Browse source 
Fixes bug 10628.
This commit is contained in:
Rafael Mendonça França 2013-05-28 12:11:29 -03:00
commit 643e0b23d6
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
railties/CHANGELOG.md
View file

@ -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.

2
railties/lib/rails/test_unit/railtie.rb
View file

@ -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