Merge pull request #4981 from solidusio/backport/v3.2/pr-4980

[v3.2] Fix rake error testing the update generator

backend/spec/features/admin/orders/customer_returns_spec.rb

@@ -24,7 +24,7 @@ def order_state_label
     let(:order) { create :shipped_order, line_items_count: 2 }
 
     context 'when creating a return with state "Received"' do
-      it 'marks the order as returned', :js do
+      it 'marks the order as returned', :js, :flaky do
         create_customer_return('receive')
 
         expect(page).to have_content 'Customer Return has been successfully created'

core/lib/generators/solidus/update/update_generator.rb

@@ -37,6 +37,11 @@ class UpdateGenerator < ::Rails::Generators::Base
                  default: 'config/initializers/',
                  hide: true
 
+    class_option :install_migrations,
+                 type: :boolean,
+                 default: true,
+                 hide: true
+
     def create_new_defaults_initializer
       previous_version_prompt = options[:previous_version_prompt]
       return if previous_version_prompt && !yes?(<<~MSG, :red)
@@ -58,6 +63,8 @@ def create_new_defaults_initializer
     end
 
     def install_migrations
+      return unless options[:install_migrations]
+
       say_status :copying, "migrations"
       rake 'spree:install:migrations'
     end

core/spec/lib/generators/solidus/update/update_generator_spec.rb

@@ -12,6 +12,7 @@
       Rails::Generators.invoke('solidus:update', [
         "--initializer_directory=#{Rails.root.join('tmp')}",
         "--previous_version_prompt=false",
+        "--install_migrations=false",
         "--from=#{from}",
         "--to=#{to}",
         "--quiet"