aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2014-02-13 09:41:13 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2014-02-13 09:41:13 -0500
commitde5ef153984f4fc3229a3346a8a4a1595303afc8 (patch)
treec5e196aa887e57d93dc77631560f56743bb13fbe /railties/test
parent6a1b459ea13ec7854ed513618ec3e75b20d7e2b9 (diff)
parentdafc0eef4dd3393864e7b28bf74c8e7834083d60 (diff)
downloadrails-de5ef153984f4fc3229a3346a8a4a1595303afc8.tar.gz
rails-de5ef153984f4fc3229a3346a8a4a1595303afc8.tar.bz2
rails-de5ef153984f4fc3229a3346a8a4a1595303afc8.zip
Merge pull request #13945 from rails/json_cookie_serializer_improvements
Cookies serializer improvements
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/generators/app_generator_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 700935fd8d..ddecee2ca1 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -433,7 +433,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
def test_new_hash_style
run_generator [destination_root]
assert_file "config/initializers/session_store.rb" do |file|
- assert_match(/config.session_store :cookie_store, key: '_.+_session', serializer: :json/, file)
+ assert_match(/config.session_store :cookie_store, key: '_.+_session'/, file)
end
end