Ensure db:seed runs before spree_sample:load

Author: lsizani

core/app/models/spree/order_merger.rb

@@ -67,7 +67,7 @@ def merge!(other_order, user = nil)
 
     private
 
-    # Retreive a matching line item from the existing order
+    # Retrieve a matching line item from the existing order
     #
     # It will compare line items based on variants, and all line item
     # comparison hooks on the order.

sample/db/samples/tax_rates.rb

@@ -1,6 +1,16 @@
 # frozen_string_literal: true
 
-north_america = Spree::Zone.find_by!(name: "North America")
+begin
+  north_america = Spree::Zone.find_by!(name: "North America")
+rescue ActiveRecord::RecordNotFound
+  puts <<~TEXT
+    Couldn't find 'North America' zone. Did you run `rake db:seed` first?
+
+    That task will set up the countries, states and zones required for Spree.
+  TEXT
+  exit
+end
+
 clothing = Spree::TaxCategory.find_by!(name: "Default")
 tax_rate = Spree::TaxRate.create(
   name: "North America",

sample/lib/spree/sample.rb

@@ -7,7 +7,7 @@ module Spree
   module Sample
     class << self
       def load_sample(file, shell: Thor::Base.shell.new)
-        # If file is exists within application it takes precendence.
+        # If file is exists within application it takes precedence.
         if File.exist?(File.join(Rails.root, 'db', 'samples', "#{file}.rb"))
           path = File.expand_path(File.join(Rails.root, 'db', 'samples', "#{file}.rb"))
         else

sample/lib/tasks/sample.rake

@@ -5,7 +5,7 @@ require 'spree/sample'
 
 namespace :spree_sample do
   desc 'Loads sample data'
-  task load: :environment do
+  task load: ['db:seed', :environment] do
     if ARGV.include?("db:migrate")
       puts <<~TEXT
         Please run db:migrate separately from spree_sample:load.

sample/solidus_sample.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
 
   s.author      = 'Solidus Team'
   s.email       = 'contact@solidus.io'
-  s.homepage    = 'http://solidus.io'
+  s.homepage    = 'https://solidus.io'
   s.license     = 'BSD-3-Clause'
 
   s.metadata['rubygems_mfa_required'] = 'true'

sample/spec/lib/load_sample_spec.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
+require "rake"
 
 describe "Load samples" do
   it "doesn't raise any error" do
@@ -9,4 +10,14 @@
       SpreeSample::Engine.load_samples
     }.to output.to_stdout
   end
+
+  it "has db:seed as a prerequisite" do
+    task = Rake::Task["spree_sample:load"]
+    seed_task = Rake::Task["db:seed"]
+    expect(task.prerequisite_tasks).to include(seed_task)
+  end
+
+  before do
+    Rails.application.load_tasks
+  end
 end