Skip to content
Browse files

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

This reverts commit 38cf00e.

Conflicts:
	railties/CHANGELOG.md
  • Loading branch information...
1 parent 569136b commit 72e8b566b9f4ecbeaac23654fa439f11e6c1aa88 @senny senny committed May 28, 2014
Showing with 1 addition and 5 deletions.
  1. +0 −4 railties/CHANGELOG.md
  2. +1 −1 railties/lib/rails/test_unit/railtie.rb
View
4 railties/CHANGELOG.md
@@ -14,10 +14,6 @@
*Matthew Draper*
-* Do not set the Rails environment to test by default when using test_unit Railtie.
-
- *Konstantin Shabanov*
-
## Rails 4.1.1 (May 6, 2014) ##
View
2 railties/lib/rails/test_unit/railtie.rb
@@ -1,4 +1,4 @@
-if defined?(Rake.application) && Rake.application.top_level_tasks.grep(/^test(?::|$)/).any?
+if defined?(Rake.application) && Rake.application.top_level_tasks.grep(/^(default$|test(:|$))/).any?
ENV['RAILS_ENV'] ||= 'test'
end

0 comments on commit 72e8b56

Please sign in to comment.
Something went wrong with that request. Please try again.