aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-01-13 12:33:04 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-01-13 12:33:04 -0800
commit8b70319c270415e9f99ed8eb1f12dd1caaade1fd (patch)
tree8c9ed3620235437aa4fd2cc23e9d0a9f9774a9d7 /railties/test
parentfe24a383d100afcd6c8a1f8a121ddd9fe53a2e9a (diff)
parentb9095ec95c38e17425eef26018aeb962e96c323f (diff)
downloadrails-8b70319c270415e9f99ed8eb1f12dd1caaade1fd.tar.gz
rails-8b70319c270415e9f99ed8eb1f12dd1caaade1fd.tar.bz2
rails-8b70319c270415e9f99ed8eb1f12dd1caaade1fd.zip
Merge pull request #13703 from schneems/schneems/rail-secrets-key
Favor canonical environment variables for secrets
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/isolation/abstract_unit.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index a1f1973563..6c50911666 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -93,8 +93,8 @@ module TestHelpers
# Build an application by invoking the generator and going through the whole stack.
def build_app(options = {})
@prev_rails_env = ENV['RAILS_ENV']
- ENV['RAILS_ENV'] = 'development'
- ENV['RAILS_SECRET_KEY_BASE'] ||= SecureRandom.hex(16)
+ ENV['RAILS_ENV'] = "development"
+ ENV['SECRET_KEY_BASE'] ||= SecureRandom.hex(16)
FileUtils.rm_rf(app_path)
FileUtils.cp_r(app_template_path, app_path)