Permalink
Browse files

Merge branch 'fix-test_unit-railtie'

This branch is composed of #10629 and #10708

Closes #10629
Closes #10708
Fixes #10628
  • Loading branch information...
2 parents e102629 + 04332e3 commit 0397348a0f8b2c35a5b03c9cd279901b078a1293 @rafaelfranca rafaelfranca committed May 28, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 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

0 comments on commit 0397348

Please sign in to comment.