Manually fix standardrb violations WIP

Many of these are defining classes inside a block in tests. Still a
bunch left to fix.

Author: AlistairNorman

core/app/models/spree/order.rb

@@ -698,7 +698,7 @@ def add_payment_sources_to_wallet
     def add_default_payment_from_wallet
       builder = Spree::Config.default_payment_builder_class.new(self)
 
-      if payment = builder.build
+      if (payment = builder.build)
         payments << payment
 
         if bill_address.nil?

core/spec/models/spree/order/state_machine_spec.rb

@@ -88,6 +88,7 @@
       let!(:payment) { create(:payment, state: "checkout", order:) }
 
       before :all do
+        # rubocop:disable Lint/ConstantDefinitionInBlock
         class Spree::Order
           checkout_flow do
             go_to_state :address
@@ -96,10 +97,12 @@ class Spree::Order
             # confirm step has been removed. Payment is the last step now
           end
         end
+        # rubocop:enable Lint/ConstantDefinitionInBlock
       end
 
       after :all do
         # restore the standard checkout flow to avoid leaking into other tests
+        # rubocop:disable Lint/ConstantDefinitionInBlock
         class Spree::Order
           checkout_flow do
             go_to_state :address
@@ -108,6 +111,7 @@ class Spree::Order
             go_to_state :confirm
           end
         end
+        # rubocop:enable Lint/ConstantDefinitionInBlock
       end
 
       before do

core/spec/models/spree/order_spec.rb

@@ -3,6 +3,44 @@
 require "rails_helper"
 require "spree/testing_support/shared_examples/state_change_tracking"
 
+class AvailabilityTestValidator
+  def validate(line_item)
+    if line_item.variant.sku == "UNAVAILABLE"
+      line_item.errors.add(:quantity, ":(")
+      false
+    else
+      true
+    end
+  end
+end
+
+class EnsureUnitsTestValidator
+  def validate(line_item)
+    if line_item.quantity != 1
+      line_item.errors.add(:quantity, ":(")
+    end
+  end
+end
+
+class TruthNumberGenerator
+  def initialize(options = {})
+  end
+
+  def generate
+    "42"
+  end
+end
+
+class TestOrderMerger
+  def initialize(order)
+    @order = order
+  end
+
+  def merge!(other_order, user = nil)
+    [@order, other_order, user]
+  end
+end
+
 RSpec.describe Spree::Order, type: :model do
   let(:store) { create(:store) }
   let(:user) { create(:user, email: "solidus@example.com") }
@@ -410,15 +448,6 @@
 
     describe "order_merger_class customization" do
       before do
-        class TestOrderMerger
-          def initialize(order)
-            @order = order
-          end
-
-          def merge!(other_order, user = nil)
-            [@order, other_order, user]
-          end
-        end
         Spree::Config.order_merger_class = TestOrderMerger
       end
 
@@ -867,15 +896,6 @@ def call
     end
 
     context "with order number generator configured" do
-      class TruthNumberGenerator
-        def initialize(options = {})
-        end
-
-        def generate
-          "42"
-        end
-      end
-
       before do
         expect(Spree::Config).to receive(:order_number_generator) do
           TruthNumberGenerator.new
@@ -1783,6 +1803,8 @@ def generate
         # Class.new and define_method to avoid creating scope gates that would
         # take this local variable out of scope.
         inventory_unit = arbitrary_inventory_unit
+
+        # rubocop:disable Lint/ConstantDefinitionInBlock
         TestInventoryUnitBuilder = Class.new do
           def initialize(order)
           end
@@ -1791,6 +1813,7 @@ def initialize(order)
             [inventory_unit]
           }
         end
+        # rubocop:enable Lint/ConstantDefinitionInBlock
 
         test_stock_config = Spree::Core::StockConfiguration.new
         test_stock_config.inventory_unit_builder_class = TestInventoryUnitBuilder.to_s
@@ -1831,23 +1854,15 @@ def initialize(order)
     subject { order.send(:ensure_inventory_units) }
 
     before do
-      class TestValidator
-        def validate(line_item)
-          if line_item.quantity != 1
-            line_item.errors.add(:quantity, ":(")
-          end
-        end
-      end
-
       test_stock_config = Spree::Core::StockConfiguration.new
-      test_stock_config.inventory_validator_class = TestValidator.to_s
+      test_stock_config.inventory_validator_class = EnsureUnitsTestValidator.to_s
       stub_spree_preferences(stock: test_stock_config)
     end
 
     let(:order) { create :order_with_line_items, line_items_count: 2 }
 
     it "uses the configured validator" do
-      expect_any_instance_of(TestValidator).to receive(:validate).twice.and_call_original
+      expect_any_instance_of(EnsureUnitsTestValidator).to receive(:validate).twice.and_call_original
 
       subject
     end
@@ -1873,19 +1888,8 @@ def validate(line_item)
     subject { order.send(:validate_line_item_availability) }
 
     before do
-      class TestValidator
-        def validate(line_item)
-          if line_item.variant.sku == "UNAVAILABLE"
-            line_item.errors.add(:quantity, ":(")
-            false
-          else
-            true
-          end
-        end
-      end
-
       test_stock_config = Spree::Core::StockConfiguration.new
-      test_stock_config.availability_validator_class = TestValidator.to_s
+      test_stock_config.availability_validator_class = AvailabilityTestValidator.to_s
       stub_spree_preferences(stock: test_stock_config)
     end