From c3132e87d6d5b62bfb3ec6064a2cd0b993017ac2 Mon Sep 17 00:00:00 2001 From: Pau Perez Date: Mon, 30 Apr 2018 13:49:52 +0200 Subject: [PATCH] Rename and fix simple_product to base_product This factory has been merged into the base_product factory. Besides, products no longer have on_hand attribute. --- app/models/spree/product_decorator.rb | 1 - spec/factories.rb | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/models/spree/product_decorator.rb b/app/models/spree/product_decorator.rb index 5f2eaab5f6..06970f0a13 100644 --- a/app/models/spree/product_decorator.rb +++ b/app/models/spree/product_decorator.rb @@ -246,7 +246,6 @@ Spree::Product.class_eval do variant = self.master.dup variant.product = self variant.is_master = false - variant.on_demand = self.on_demand self.variants << variant end end diff --git a/spec/factories.rb b/spec/factories.rb index ebe8d05dd8..4731967055 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -460,7 +460,8 @@ FactoryGirl.modify do factory :product do primary_taxon { Spree::Taxon.first || FactoryGirl.create(:taxon) } end - factory :simple_product do + + 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. @@ -468,7 +469,6 @@ FactoryGirl.modify do supplier { Enterprise.is_primary_producer.first || FactoryGirl.create(:supplier_enterprise) } primary_taxon { Spree::Taxon.first || FactoryGirl.create(:taxon) } - on_hand 3 unit_value 1 unit_description ''