From f896e78e6f85d6f25755a444a4f4fed203ac8132 Mon Sep 17 00:00:00 2001
From: luisramos0 <luisramos0@gmail.com>
Date: Thu, 17 Jan 2019 14:34:15 +0000
Subject: [PATCH] Set StockLocation.backorderable_default to false in
 DefaultStockLocation and in StockLocation factory. This makes the default
 value of variant.on_demand false in all environments and in tests.

Additionally, adapt VariantStock.on_demand test and product factory to this change (setting on_hand value in product factory so it's not out of stock by default).
---
 app/services/default_stock_location.rb     |  2 +-
 spec/factories.rb                          | 22 ++++++++++++++++------
 spec/models/concerns/variant_stock_spec.rb |  2 +-
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/app/services/default_stock_location.rb b/app/services/default_stock_location.rb
index 9269f17743..dc4499198b 100644
--- a/app/services/default_stock_location.rb
+++ b/app/services/default_stock_location.rb
@@ -6,7 +6,7 @@ class DefaultStockLocation
   def self.create!
     country = Spree::Country.find_by_iso(ENV['DEFAULT_COUNTRY_CODE'])
     state = country.states.first
-    Spree::StockLocation.create!(name: NAME, country_id: country.id, state_id: state.id)
+    Spree::StockLocation.create!(name: NAME, country_id: country.id, state_id: state.id, backorderable_default: false)
   end
 
   def self.destroy_all
diff --git a/spec/factories.rb b/spec/factories.rb
index 742f943ed7..43b9136437 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -551,19 +551,26 @@ FactoryBot.define do
       on_hand { 5 }
     end
     after(:create) do |product, evaluator|
-      product.variants.first.tap do |variant|
-        variant.on_demand = evaluator.on_demand
-        variant.count_on_hand = evaluator.on_hand
-        variant.save
-      end
+      product.master.on_demand = evaluator.on_demand
+      product.master.on_hand = evaluator.on_hand
+      product.variants.first.on_demand = evaluator.on_demand
+      product.variants.first.on_hand = evaluator.on_hand
     end
   end
 end
 
-
 FactoryBot.modify do
   factory :product do
+    transient do
+      on_hand { 5 }
+    end
+
     primary_taxon { Spree::Taxon.first || FactoryBot.create(:taxon) }
+
+    after(:create) do |product, evaluator|
+      product.master.on_hand = evaluator.on_hand
+      product.variants.first.on_hand = evaluator.on_hand
+    end
   end
 
   factory :base_product do
@@ -661,6 +668,9 @@ FactoryBot.modify do
 
     # Ensures the name attribute is not assigned after instantiating the default location
     transient { name 'default' }
+
+    # sets the default value for variant.on_demand
+    backorderable_default false
   end
 
   factory :shipment, class: Spree::Shipment do
diff --git a/spec/models/concerns/variant_stock_spec.rb b/spec/models/concerns/variant_stock_spec.rb
index 2943b7575b..7dc3080b45 100644
--- a/spec/models/concerns/variant_stock_spec.rb
+++ b/spec/models/concerns/variant_stock_spec.rb
@@ -135,7 +135,7 @@ describe VariantStock do
       let(:variant) { build(:variant) }
 
       it 'returns stock location default' do
-        expect(variant.on_demand).to be_truthy
+        expect(variant.on_demand).to be_falsy
       end
     end
   end