Merge pull request rails#12778 from etehtsea/rake-default-fix

Don't load test env by default. Closes rails#13241
liyajieGit · Mar 28, 2014 · ec0a2b5 · ec0a2b5
2 parents a8bd7b1 + a3dbb96
commit ec0a2b5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/railties/lib/rails/test_unit/railtie.rb b/railties/lib/rails/test_unit/railtie.rb
@@ -1,4 +1,4 @@
-if defined?(Rake.application) && Rake.application.top_level_tasks.grep(/^(default$|test(:|$))/).any?
+if defined?(Rake.application) && Rake.application.top_level_tasks.grep(/^test(?::|$)/).any?
   ENV['RAILS_ENV'] ||= 'test'
 end