diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-11-02 20:27:51 -0200 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-11-03 14:57:54 -0200 |
| commit | 4faa0418453055bc81456685d418d486252cc379 (patch) | |
| tree | acf0453393b953c6fd4c2145ef70ded6c9baeb05 /railties/test/application | |
| parent | c2a7956eb7fbc099ea38d21601d215ab3def27fb (diff) | |
| download | rails-4faa0418453055bc81456685d418d486252cc379.tar.gz rails-4faa0418453055bc81456685d418d486252cc379.tar.bz2 rails-4faa0418453055bc81456685d418d486252cc379.zip | |
Rename secret_token_key to secret_key_base
Diffstat (limited to 'railties/test/application')
| -rw-r--r-- | railties/test/application/configuration_test.rb | 4 | ||||
| -rw-r--r-- | railties/test/application/url_generation_test.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb index 5d654e1be6..b9d18f4582 100644 --- a/railties/test/application/configuration_test.rb +++ b/railties/test/application/configuration_test.rb @@ -225,9 +225,9 @@ module ApplicationTests assert_equal Pathname.new(app_path).join("somewhere"), Rails.public_path end - test "Use key_generator when secret_token_key is set" do + test "Use key_generator when secret_key_base is set" do make_basic_app do |app| - app.config.secret_token_key = 'b3c631c314c0bbca50c1b2843150fe33' + app.config.secret_key_base = 'b3c631c314c0bbca50c1b2843150fe33' app.config.session_store :disabled end diff --git a/railties/test/application/url_generation_test.rb b/railties/test/application/url_generation_test.rb index fb83659b0c..0905757442 100644 --- a/railties/test/application/url_generation_test.rb +++ b/railties/test/application/url_generation_test.rb @@ -14,7 +14,7 @@ module ApplicationTests require "action_controller/railtie" class MyApp < Rails::Application - config.secret_token_key = "3b7cd727ee24e8444053437c36cc66c4" + config.secret_key_base = "3b7cd727ee24e8444053437c36cc66c4" config.session_store :cookie_store, key: "_myapp_session" config.active_support.deprecation = :log config.eager_load = false |