aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/test_unit
diff options
context:
space:
mode:
authorScott Hill <git@stmpjmpr.com>2013-05-15 00:20:59 -0700
committerScott Hill <git@stmpjmpr.com>2013-05-15 00:20:59 -0700
commitbdc2aa54caf2ac7a11e42b4a3a25a6fdb892d86d (patch)
treee35c3f71869c2cee8819b1a0aaece698e10885c6 /railties/lib/rails/test_unit
parente2f3e502291d3d9fa8d5f0f65644c961ec020c69 (diff)
downloadrails-bdc2aa54caf2ac7a11e42b4a3a25a6fdb892d86d.tar.gz
rails-bdc2aa54caf2ac7a11e42b4a3a25a6fdb892d86d.tar.bz2
rails-bdc2aa54caf2ac7a11e42b4a3a25a6fdb892d86d.zip
Fixes bug 10628.
Diffstat (limited to 'railties/lib/rails/test_unit')
-rw-r--r--railties/lib/rails/test_unit/railtie.rb2
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..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