From a3a1e27cb1f012244d983b98abb51293bbf74fa1 Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Wed, 13 Apr 2022 12:57:45 +1000
Subject: [PATCH 1/2] Update setup script for removed callbacks

We removed some Spree magic a while back and that broke our sample data
script. This is now corrected.

I also added a spec so that we will notice broken seed data earlier.
---
 lib/tasks/sample_data/order_factory.rb  |  1 +
 spec/lib/tasks/sample_data_rake_spec.rb | 26 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 spec/lib/tasks/sample_data_rake_spec.rb

diff --git a/lib/tasks/sample_data/order_factory.rb b/lib/tasks/sample_data/order_factory.rb
index 9f4878b6ca..eb723b3246 100644
--- a/lib/tasks/sample_data/order_factory.rb
+++ b/lib/tasks/sample_data/order_factory.rb
@@ -31,6 +31,7 @@ module SampleData
 
       log "- complete order - shipped"
       order = create_complete_order
+      order.payments.first.amount = order.total
       order.payments.first.capture!
       order.save
       order.shipment.reload.ship!
diff --git a/spec/lib/tasks/sample_data_rake_spec.rb b/spec/lib/tasks/sample_data_rake_spec.rb
new file mode 100644
index 0000000000..a22ebce9da
--- /dev/null
+++ b/spec/lib/tasks/sample_data_rake_spec.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'rake'
+
+describe 'sample_data.rake' do
+  before(:all) do
+    Rake.application.rake_require 'tasks/sample_data'
+    Rake::Task.define_task(:environment)
+  end
+
+  before do
+    # Create seed data required by the sample data.
+    create(:user)
+    DefaultStockLocation.find_or_create
+    DefaultShippingCategory.find_or_create
+  end
+
+  it "creates some sample data to play with" do
+    Rake.application.invoke_task "ofn:sample_data"
+
+    expect(EnterpriseGroup.count).to eq 1
+    expect(Customer.count).to eq 2
+    expect(Spree::Order.count).to eq 5
+  end
+end

From 4eb2b5d483991fc4d75384e83c4dfaad9988d1ce Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Wed, 13 Apr 2022 14:55:54 +1000
Subject: [PATCH 2/2] Reduce method complexity

---
 lib/tasks/sample_data/order_factory.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/tasks/sample_data/order_factory.rb b/lib/tasks/sample_data/order_factory.rb
index eb723b3246..39cfdb2996 100644
--- a/lib/tasks/sample_data/order_factory.rb
+++ b/lib/tasks/sample_data/order_factory.rb
@@ -30,6 +30,12 @@ module SampleData
       order.save
 
       log "- complete order - shipped"
+      create_shipped_order
+    end
+
+    private
+
+    def create_shipped_order
       order = create_complete_order
       order.payments.first.amount = order.total
       order.payments.first.capture!
@@ -37,8 +43,6 @@ module SampleData
       order.shipment.reload.ship!
     end
 
-    private
-
     def create_cart_order
       order = create_order
       order.save