From 2c8ce6e4e5a9c4f2dead43c1625dd805049af599 Mon Sep 17 00:00:00 2001
From: luisramos0 <luisramos0@gmail.com>
Date: Fri, 14 Jun 2019 12:45:55 +0100
Subject: [PATCH] Extract products factories to separate file

---
 spec/factories.rb                 | 65 -----------------------------
 spec/factories/product_factory.rb | 68 +++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 65 deletions(-)
 create mode 100644 spec/factories/product_factory.rb

diff --git a/spec/factories.rb b/spec/factories.rb
index cee0b2bc64..6171743c92 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -123,21 +123,6 @@ FactoryBot.define do
     end
   end
 
-  factory :taxed_product, :parent => :product do
-    transient do
-      tax_rate_amount 0
-      tax_rate_name ""
-      zone nil
-    end
-
-    tax_category { create(:tax_category) }
-
-    after(:create) do |product, proxy|
-      raise "taxed_product factory requires a zone" unless proxy.zone
-      create(:tax_rate, amount: proxy.tax_rate_amount, tax_category: product.tax_category, included_in_price: true, calculator: Spree::Calculator::DefaultTax.new, zone: proxy.zone, name: proxy.tax_rate_name)
-    end
-  end
-
   factory :producer_property, class: ProducerProperty do
     value 'abc123'
     producer { create(:supplier_enterprise) }
@@ -193,59 +178,9 @@ FactoryBot.define do
     stripe_user_id "abc123"
     stripe_publishable_key "xyz456"
   end
-
-  factory :product_with_image, parent: :product do
-    after(:create) do |product|
-      image = File.open(Rails.root.join('app', 'assets', 'images', 'logo-white.png'))
-      Spree::Image.create(attachment: image, viewable_id: product.master.id, viewable_type: 'Spree::Variant')
-    end
-  end
-
-  factory :simple_product, parent: :base_product do
-    transient do
-      on_demand { false }
-      on_hand { 5 }
-    end
-    after(:create) do |product, evaluator|
-      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
-    # Fix product factory name sequence with Kernel.rand so it is not interpreted as a Spree::Product method
-    # Pull request: https://github.com/spree/spree/pull/1964
-    # When this fix has been merged into a version of Spree that we're using, this line can be removed.
-    sequence(:name) { |n| "Product ##{n} - #{Kernel.rand(9999)}" }
-
-    supplier { Enterprise.is_primary_producer.first || FactoryBot.create(:supplier_enterprise) }
-    primary_taxon { Spree::Taxon.first || FactoryBot.create(:taxon) }
-
-    unit_value 1
-    unit_description ''
-
-    variant_unit 'weight'
-    variant_unit_scale 1
-    variant_unit_name ''
-  end
-
   factory :variant do
     transient do
       on_demand { false }
diff --git a/spec/factories/product_factory.rb b/spec/factories/product_factory.rb
new file mode 100644
index 0000000000..f4f6e12e7d
--- /dev/null
+++ b/spec/factories/product_factory.rb
@@ -0,0 +1,68 @@
+FactoryBot.define do
+  factory :product_with_image, parent: :product do
+    after(:create) do |product|
+      image = File.open(Rails.root.join('app', 'assets', 'images', 'logo-white.png'))
+      Spree::Image.create(attachment: image, viewable_id: product.master.id, viewable_type: 'Spree::Variant')
+    end
+  end
+
+  factory :simple_product, parent: :base_product do
+    transient do
+      on_demand { false }
+      on_hand { 5 }
+    end
+    after(:create) do |product, evaluator|
+      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
+  
+  factory :taxed_product, :parent => :product do
+    transient do
+      tax_rate_amount 0
+      tax_rate_name ""
+      zone nil
+    end
+
+    tax_category { create(:tax_category) }
+
+    after(:create) do |product, proxy|
+      raise "taxed_product factory requires a zone" unless proxy.zone
+      create(:tax_rate, amount: proxy.tax_rate_amount, tax_category: product.tax_category, included_in_price: true, calculator: Spree::Calculator::DefaultTax.new, zone: proxy.zone, name: proxy.tax_rate_name)
+    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
+    # Fix product factory name sequence with Kernel.rand so it is not interpreted as a Spree::Product method
+    # Pull request: https://github.com/spree/spree/pull/1964
+    # When this fix has been merged into a version of Spree that we're using, this line can be removed.
+    sequence(:name) { |n| "Product ##{n} - #{Kernel.rand(9999)}" }
+
+    supplier { Enterprise.is_primary_producer.first || FactoryBot.create(:supplier_enterprise) }
+    primary_taxon { Spree::Taxon.first || FactoryBot.create(:taxon) }
+
+    unit_value 1
+    unit_description ''
+
+    variant_unit 'weight'
+    variant_unit_scale 1
+    variant_unit_name ''
+  end
+end