diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-12-10 10:04:07 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-12-12 14:59:11 -0500 |
| commit | 3eaa29840b92813f37adcc41d3d8c08d976480a4 (patch) | |
| tree | c5544d6b8abcacb6fe04b2ce4eb259976c7f64e6 /railties/test/isolation | |
| parent | 0f4d235c1606ccec30e8fd0aeb4b88a061ee83fe (diff) | |
| download | rails-3eaa29840b92813f37adcc41d3d8c08d976480a4.tar.gz rails-3eaa29840b92813f37adcc41d3d8c08d976480a4.tar.bz2 rails-3eaa29840b92813f37adcc41d3d8c08d976480a4.zip | |
Load secret_key_base from tokens.yml, fallback to config.secret_key_base
Diffstat (limited to 'railties/test/isolation')
| -rw-r--r-- | railties/test/isolation/abstract_unit.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb index 913e2b5e29..362c2c510a 100644 --- a/railties/test/isolation/abstract_unit.rb +++ b/railties/test/isolation/abstract_unit.rb @@ -119,7 +119,6 @@ module TestHelpers add_to_config <<-RUBY config.eager_load = false - config.secret_key_base = "3b7cd727ee24e8444053437c36cc66c4" config.session_store :cookie_store, key: "_myapp_session" config.active_support.deprecation = :log config.action_controller.allow_forgery_protection = false @@ -139,7 +138,7 @@ module TestHelpers app = Class.new(Rails::Application) app.config.eager_load = false - app.config.secret_key_base = "3b7cd727ee24e8444053437c36cc66c4" + app.secrets.secret_key_base = "3b7cd727ee24e8444053437c36cc66c4" app.config.session_store :cookie_store, key: "_myapp_session" app.config.active_support.deprecation = :log |