diff options
| author | Matthew Draper <matthew@trebex.net> | 2017-03-23 06:09:04 +1030 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-23 06:09:04 +1030 |
| commit | b5dc9c1a21d0bfaaf66de955e84acef4861e36c7 (patch) | |
| tree | 3f50f8911b5df6592931ffc74fbde93780313547 | |
| parent | e8417de1d853bed2dc41129ecb3a9f3072f4ded6 (diff) | |
| parent | 142db6269bf6486440627d9cd884dc0e33179313 (diff) | |
| download | rails-b5dc9c1a21d0bfaaf66de955e84acef4861e36c7.tar.gz rails-b5dc9c1a21d0bfaaf66de955e84acef4861e36c7.tar.bz2 rails-b5dc9c1a21d0bfaaf66de955e84acef4861e36c7.zip | |
Merge pull request #28523 from y-yagi/dont_comment_out_file_watcher_during_rails_upgrade_process
Don't comment out config.file_watcher during Rails upgrade
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 2 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 14 |
2 files changed, 0 insertions, 16 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 38830ba38f..b32878cf0b 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -109,8 +109,6 @@ module Rails config - gsub_file "config/environments/development.rb", /^(\s+)config\.file_watcher/, '\1# config.file_watcher' - unless cookie_serializer_config_exist gsub_file "config/initializers/cookies_serializer.rb", /json(?!,)/, "marshal" end diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index ac43e8d22d..f6cdbd34fe 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -199,20 +199,6 @@ class AppGeneratorTest < Rails::Generators::TestCase end end - def test_app_update_dont_set_file_watcher - app_root = File.join(destination_root, "myapp") - run_generator [app_root] - - stub_rails_application(app_root) do - generator = Rails::Generators::AppGenerator.new ["rails"], [], destination_root: app_root, shell: @shell - generator.send(:app_const) - quietly { generator.send(:update_config_files) } - assert_file "#{app_root}/config/environments/development.rb" do |content| - assert_match(/# config.file_watcher/, content) - end - end - end - def test_app_update_create_new_framework_defaults app_root = File.join(destination_root, "myapp") run_generator [app_root] |