diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-03-28 10:24:18 -0500 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-03-28 10:24:18 -0500 |
| commit | ec0a2b57f67c9153cb5f7bbe2a3f66d13fe64bdd (patch) | |
| tree | 890088e54e7cdb660a2b9eb68b690d25f9049b6f /railties | |
| parent | a8bd7b16260c217290ef8fe3a166fcceac442c62 (diff) | |
| parent | a3dbb962fa81ba170aece567235a17e16770b8c8 (diff) | |
| download | rails-ec0a2b57f67c9153cb5f7bbe2a3f66d13fe64bdd.tar.gz rails-ec0a2b57f67c9153cb5f7bbe2a3f66d13fe64bdd.tar.bz2 rails-ec0a2b57f67c9153cb5f7bbe2a3f66d13fe64bdd.zip | |
Merge pull request #12778 from etehtsea/rake-default-fix
Don't load test env by default.
Closes #13241
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/test_unit/railtie.rb | 2 |
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 75180ff978..878b9b7930 100644 --- 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 |