aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators
diff options
context:
space:
mode:
authorPrem Sichanugrist <s@sikac.hu>2013-03-09 16:03:09 -0500
committerPrem Sichanugrist <s@sikac.hu>2013-03-09 17:38:39 -0500
commit3ed41e579e45464aa6e6342783b77f9ec29e339c (patch)
tree77d2b30e6f0f7b9ec2790b30c0cb116e2dc5329c /railties/lib/rails/generators
parentb51673fbd9563bd3ffa22e22255ca1cef80cfb6d (diff)
downloadrails-3ed41e579e45464aa6e6342783b77f9ec29e339c.tar.gz
rails-3ed41e579e45464aa6e6342783b77f9ec29e339c.tar.bz2
rails-3ed41e579e45464aa6e6342783b77f9ec29e339c.zip
Make sure that `rails test` load test in test env
Diffstat (limited to 'railties/lib/rails/generators')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/test/test_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/test/test_helper.rb b/railties/lib/rails/generators/rails/app/templates/test/test_helper.rb
index f0aeeee827..ca40914d3b 100644
--- a/railties/lib/rails/generators/rails/app/templates/test/test_helper.rb
+++ b/railties/lib/rails/generators/rails/app/templates/test/test_helper.rb
@@ -1,4 +1,4 @@
-ENV["RAILS_ENV"] = "test"
+ENV["RAILS_ENV"] ||= "test"
require File.expand_path('../../config/environment', __FILE__)
require 'rails/test_help'