aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorschneems <richard.schneeman@gmail.com>2013-12-24 11:13:47 -0500
committerschneems <richard.schneeman@gmail.com>2013-12-24 11:13:47 -0500
commit14c175c5727467e708ccbfaac1ae98c8f817b37d (patch)
tree060f59c6da111e7a8a05b239c363297d8bc6d54a
parent959cfcef7255bba720ce3f15323056533ea7b50a (diff)
downloadrails-14c175c5727467e708ccbfaac1ae98c8f817b37d.tar.gz
rails-14c175c5727467e708ccbfaac1ae98c8f817b37d.tar.bz2
rails-14c175c5727467e708ccbfaac1ae98c8f817b37d.zip
Fix railties tests in master
Tests are failing due to missing env var on master https://travis-ci.org/rails/rails/jobs/15930622#L641 This adds an environment variable `ENV['RAILS_SECRET_KEY_BASE']` so these tests will pass.
-rw-r--r--railties/test/isolation/abstract_unit.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index bf0fdea89a..fe173e7159 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -93,7 +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_ENV'] = 'development'
+ ENV['RAILS_SECRET_KEY_BASE'] ||= SecureRandom.hex(16)
FileUtils.rm_rf(app_path)
FileUtils.cp_r(app_template_path, app_path)