Merge pull request #5011 from nebulab/safafa+kennyadsl/remove-auto-ac…

…cept-propagation

Remove automatic propagation of generators options

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]}"

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]}"

core/lib/generators/solidus/install/app_templates/payment_method/paypal.rb

@@ -2,9 +2,16 @@
   say_status :warning, "Support for frontends other than `solidus_frontend` by `solidus_paypal_commerce_platform` is still in progress.", :yellow
 end
 
+if @selected_frontend == 'classic'
+  version = '< 1'
+  migrations_flag = options[:migrate] ? '--auto-run-migrations' : '--skip-migrations'
+else
+  version = '~> 1.0'
+  migrations_flag = "--migrate=#{options[:migrate]}"
+end
+
 unless Bundler.locked_gems.dependencies['solidus_paypal_commerce_platform']
-  version = @selected_frontend == 'classic' ? '< 1' : '~> 1.0'
   bundle_command "add solidus_paypal_commerce_platform --version='#{version}'"
 end
 
-generate 'solidus_paypal_commerce_platform:install'
+generate "solidus_paypal_commerce_platform:install #{migrations_flag}"

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'))