diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-03-02 13:28:48 -0300 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2016-03-02 13:28:48 -0300 |
| commit | 9a1cc04c90d5ece1d79da4d33686324061afd0c8 (patch) | |
| tree | d7c17dc30850636aca2b66d27548f2d8af2feb3f /railties/test/generators | |
| parent | ff91808651a19549ea8b101b8abdf5c3f811e0f4 (diff) | |
| parent | 9f7127350448342c8ebbadc193f13fcd35ac3eb7 (diff) | |
| download | rails-9a1cc04c90d5ece1d79da4d33686324061afd0c8.tar.gz rails-9a1cc04c90d5ece1d79da4d33686324061afd0c8.tar.bz2 rails-9a1cc04c90d5ece1d79da4d33686324061afd0c8.zip | |
Merge pull request #24001 from 5t111111/fix-gsub-cookies_serializer
Fix description in cookies_serializer.rb being corrupted by gsub when updating
Diffstat (limited to 'railties/test/generators')
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 4d6b2da896..2cbce4bc5e 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -210,7 +210,8 @@ class AppGeneratorTest < Rails::Generators::TestCase generator = Rails::Generators::AppGenerator.new ["rails"], { with_dispatchers: true }, destination_root: app_root, shell: @shell generator.send(:app_const) quietly { generator.send(:update_config_files) } - assert_file("#{app_root}/config/initializers/cookies_serializer.rb", /Rails\.application\.config\.action_dispatch\.cookies_serializer = :marshal/) + assert_file("#{app_root}/config/initializers/cookies_serializer.rb", + /Valid options are :json, :marshal, and :hybrid\.\nRails\.application\.config\.action_dispatch\.cookies_serializer = :marshal/) end end |