diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-06-30 20:47:26 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-06-30 20:47:26 +0200 |
| commit | c63cf7bf0db708fe46a929cf57649ab5a92034af (patch) | |
| tree | 8f0974852b51597652e6ae73da26f3eb80fe878b /railties/test/isolation | |
| parent | 52c56f9f7ec46ee39f1a6319ff4017e2492683ed (diff) | |
| parent | b07e6fdaa0aa07016d1425ada5b7f966142d0212 (diff) | |
| download | rails-c63cf7bf0db708fe46a929cf57649ab5a92034af.tar.gz rails-c63cf7bf0db708fe46a929cf57649ab5a92034af.tar.bz2 rails-c63cf7bf0db708fe46a929cf57649ab5a92034af.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'railties/test/isolation')
| -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 b46ac0efaf..390c0ab543 100644 --- a/railties/test/isolation/abstract_unit.rb +++ b/railties/test/isolation/abstract_unit.rb @@ -100,7 +100,7 @@ module TestHelpers end end - add_to_config 'config.secret_token = "3b7cd727ee24e8444053437c36cc66c4"; config.session_store :cookie_store, :key => "_myapp_session"' + add_to_config 'config.secret_token = "3b7cd727ee24e8444053437c36cc66c4"; config.session_store :cookie_store, :key => "_myapp_session"; config.active_support.deprecation = :log' end def make_basic_app @@ -110,6 +110,7 @@ module TestHelpers app = Class.new(Rails::Application) app.config.secret_token = "3b7cd727ee24e8444053437c36cc66c4" app.config.session_store :cookie_store, :key => "_myapp_session" + app.config.active_support.deprecation = :log yield app if block_given? app.initialize! |