diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2013-12-24 10:20:51 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@plataformatec.com.br> | 2013-12-24 10:20:51 -0800 |
| commit | db22a5a8ebc39954432c3a943cf8f4b9b9eb9868 (patch) | |
| tree | e93f6beda942c7b54a8ebe77bdddfa28c87010cc /railties | |
| parent | df09ce966e41b53b3d5723c4efb1e7470c452dd8 (diff) | |
| parent | 14c175c5727467e708ccbfaac1ae98c8f817b37d (diff) | |
| download | rails-db22a5a8ebc39954432c3a943cf8f4b9b9eb9868.tar.gz rails-db22a5a8ebc39954432c3a943cf8f4b9b9eb9868.tar.bz2 rails-db22a5a8ebc39954432c3a943cf8f4b9b9eb9868.zip | |
Merge pull request #13472 from schneems/schneems/fix-master-database-url-tests
Fix railties tests in master
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/test/isolation/abstract_unit.rb | 3 |
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) |