Remove automatic propagation of generators options

By removing the override of the `generate` method in this generator, we stop propagating those custom arguments to all the inner generators called by the installer. For example, at the moment, the installer is running rails generate rspec:install --auto-accept --auto-run-migrations see [1], which doesn't make sense and might also have unexpected behaviors if we (or any dependency) run a generator during their installation, which accepts those arguments. Instead of always propaging these option, we are explicitely declaring them when needed. [1]: solidusio/solidus_starter_frontend#295 Co-authored-by: safafa <[email protected]>
solidusio · Apr 14, 2023 · 0e75344 · 0e75344
1 parent fd277b0
commit 0e75344
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git a/core/lib/generators/solidus/install/app_templates/payment_method/bolt.rb b/core/lib/generators/solidus/install/app_templates/payment_method/bolt.rb
@@ -10,4 +10,4 @@
   bundle_command 'add solidus_bolt'
 end
 
-generate 'solidus_bolt:install'
+generate 'solidus_bolt:install' "--auto_run_migrations=#{options[:migrate]}"
diff --git a/core/lib/generators/solidus/install/app_templates/payment_method/braintree.rb b/core/lib/generators/solidus/install/app_templates/payment_method/braintree.rb
@@ -2,4 +2,4 @@
   bundle_command 'add solidus_braintree --version "~> 3.0"'
 end
 
-generate 'solidus_braintree:install'
+generate 'solidus_braintree:install' "--migrate=#{options[:migrate]}"
diff --git a/core/lib/generators/solidus/install/app_templates/payment_method/paypal.rb b/core/lib/generators/solidus/install/app_templates/payment_method/paypal.rb
@@ -7,4 +7,4 @@
   bundle_command "add solidus_paypal_commerce_platform --version='#{version}'"
 end
 
-generate 'solidus_paypal_commerce_platform:install'
+generate 'solidus_paypal_commerce_platform:install' "--migrate=#{options[:migrate]}"
diff --git a/core/lib/generators/solidus/install/install_generator.rb b/core/lib/generators/solidus/install/install_generator.rb
@@ -222,12 +222,6 @@ def complete
 
     private
 
-    def generate(what, *args, abort_on_failure: true)
-      args << '--auto-accept' if options[:auto_accept]
-      args << '--auto-run-migrations' if options[:migrate]
-      super(what, *args, abort_on_failure: abort_on_failure)
-    end
-
     def bundle_command(command, env = {})
       # Make `bundle install` less verbose by skipping the "Using ..." messages
       super(command, env.reverse_merge('BUNDLE_SUPPRESS_INSTALL_USING_MESSAGES' => 'true'))