From 57e258eb433c9a2f0ee00d1bd562a6d3370c3088 Mon Sep 17 00:00:00 2001 From: Garrett Bjerkhoel Date: Fri, 18 Mar 2016 13:31:51 -0700 Subject: Don't upgrade config.file_watcher during upgrade path --- railties/lib/rails/generators/rails/app/app_generator.rb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'railties') diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index e9435c946a..d6be69e16c 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -95,9 +95,14 @@ module Rails action_cable_config_exist = File.exist?('config/cable.yml') ssl_options_exist = File.exist?('config/initializers/ssl_options.rb') rack_cors_config_exist = File.exist?('config/initializers/cors.rb') + development_config_exist = File.exist?('config/environments/development.rb') config + if development_config_exist + gsub_file 'config/environments/development.rb', /^(\s+)config\.file_watcher/, '\1# config.file_watcher' + end + unless callback_terminator_config_exist remove_file 'config/initializers/callback_terminator.rb' end -- cgit v1.2.3 From 1356e53b7cb20968c81fbddb71aa378dee80ee03 Mon Sep 17 00:00:00 2001 From: Arthur Neves Date: Mon, 21 Mar 2016 15:12:03 -0400 Subject: Add tests for file_watcher config on update [related #24243] --- railties/test/generators/app_generator_test.rb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'railties') diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index f38e773ea8..0572a23df9 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -215,6 +215,20 @@ class AppGeneratorTest < Rails::Generators::TestCase end end + def test_rails_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_rails_update_does_not_create_active_record_belongs_to_required_by_default app_root = File.join(destination_root, 'myapp') run_generator [app_root] -- cgit v1.2.3