Browse files

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

This reverts commit a263d0b.

Conflicts:
	railties/CHANGELOG.md
  • Loading branch information...
1 parent dae6c40 commit 9993d1dd58cfeecc2ca2e679ac8807b43957ac31 @senny senny committed May 28, 2014
Showing with 2 additions and 4 deletions.
  1. +1 −3 railties/CHANGELOG.md
  2. +1 −1 railties/lib/rails/test_unit/railtie.rb
View
4 railties/CHANGELOG.md
@@ -1,8 +1,6 @@
## Rails 4.0.6 (unreleased) ##
-* Do not set the Rails environment to test by default when using test_unit Railtie.
-
- *Konstantin Shabanov*
+*No changes*
## Rails 4.0.5 (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

1 comment on commit 9993d1d

@parndt

Thank you, 4.0.6.rc1 fails most tests for my application and after this commit it works again!

Please sign in to comment.