From c05078be77079999e8d9599eeb228724a0dfe0ff Mon Sep 17 00:00:00 2001 From: Jonathan Hefner Date: Sun, 27 Dec 2020 16:45:13 -0600 Subject: [PATCH] Skip Spring in plugin dummy apps Since #39746, the Spring binstub can be generated without having to run `bundle install` first, and thus the `skip_bundle` option does not prevent the Spring binstub from being generated. Therefore, explicitly set the `skip_spring` option for plugin dummy apps. --- .../lib/rails/generators/rails/plugin/plugin_generator.rb | 1 + railties/test/generators/plugin_generator_test.rb | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb index b61fbe7d2f..59bd5875cb 100644 --- a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb +++ b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb @@ -103,6 +103,7 @@ def generate_test_dummy(force = false) opts = options.transform_keys(&:to_sym).except(*DUMMY_IGNORE_OPTIONS) opts[:force] = force opts[:skip_bundle] = true + opts[:skip_spring] = true opts[:skip_listen] = true opts[:skip_git] = true opts[:skip_turbolinks] = true diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb index 9456beb1d4..6f91011855 100644 --- a/railties/test/generators/plugin_generator_test.rb +++ b/railties/test/generators/plugin_generator_test.rb @@ -539,6 +539,14 @@ def test_unnecessary_files_are_not_generated_in_dummy_application assert_no_directory "test/dummy/.git" end + def test_spring_binstub_is_not_generated_in_dummy_application + run_generator + assert_no_file "test/dummy/bin/spring" + assert_file "test/dummy/bin/rails" do |contents| + assert_no_match %r/spring/, contents + end + end + def test_skipping_test_files run_generator [destination_root, "--skip-test"] assert_no_directory "test"