aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/generators
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2014-01-30 01:12:23 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2014-01-30 01:53:19 -0500
commitfd487860db3097104cdb8d589f3931d75b767721 (patch)
tree4430a718660e01bd50556e93a270da8f82c28a2c /railties/test/generators
parentdb5d6bf74f3f6423e56120198685b8665e59616e (diff)
downloadrails-fd487860db3097104cdb8d589f3931d75b767721.tar.gz
rails-fd487860db3097104cdb8d589f3931d75b767721.tar.bz2
rails-fd487860db3097104cdb8d589f3931d75b767721.zip
Modify the session serializer implementation
Rename allowed options to :marshal and :json, for custom serializers only allow the use of custom classes.
Diffstat (limited to 'railties/test/generators')
-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 8aa306c8e0..700935fd8d 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_serializer/, file)
+ assert_match(/config.session_store :cookie_store, key: '_.+_session', serializer: :json/, file)
end
end