Merge pull request #622 from Dkendal/refactor/fix-invalid-factories

Fix some broken factories

core/lib/spree/testing_support/factories/adjustment_factory.rb

@@ -1,6 +1,7 @@
 FactoryGirl.define do
   factory :adjustment, class: Spree::Adjustment do
-    association(:adjustable, factory: :order)
+    order
+    adjustable { order }
     amount 100.0
     label 'Shipping'
     association(:source, factory: :tax_rate)

core/lib/spree/testing_support/factories/payment_factory.rb

@@ -11,6 +11,8 @@
         refund_amount 5
       end
 
+      amount { refund_amount }
+
       state 'completed'
 
       refunds { build_list :refund, 1, amount: refund_amount }

core/lib/spree/testing_support/factories/shipping_method_factory.rb

@@ -1,24 +1,29 @@
 FactoryGirl.define do
-  factory :base_shipping_method, class: Spree::ShippingMethod do
+  factory(
+    :shipping_method,
+    aliases: [
+      :base_shipping_method
+    ],
+    class: Spree::ShippingMethod
+  ) do
     zones { |a| [Spree::Zone.global] }
     name 'UPS Ground'
     code 'UPS_GROUND'
 
+    calculator { |s| s.association(:shipping_calculator, strategy: :build, preferred_amount: s.cost) }
+
+    transient do
+      cost 10.0
+    end
+
     before(:create) do |shipping_method, evaluator|
       if shipping_method.shipping_categories.empty?
         shipping_method.shipping_categories << (Spree::ShippingCategory.first || create(:shipping_category))
       end
     end
 
-    factory :shipping_method, class: Spree::ShippingMethod do
-      transient do
-        cost 10.0
-      end
-
-      calculator { |s| s.association(:shipping_calculator, strategy: :build, preferred_amount: s.cost) }
-    end
-
     factory :free_shipping_method, class: Spree::ShippingMethod do
+      cost nil
       association(:calculator, factory: :shipping_no_amount_calculator, strategy: :build)
     end
   end

core/lib/spree/testing_support/factories/stock_factory.rb

@@ -1,6 +1,7 @@
 FactoryGirl.define do
-  # must use build()
   factory :stock_packer, class: Spree::Stock::Packer do
+    skip_create
+
     transient do
       stock_location { build(:stock_location) }
       contents []
@@ -10,6 +11,8 @@
   end
 
   factory :stock_package, class: Spree::Stock::Package do
+    skip_create
+
     transient do
       stock_location { build(:stock_location) }
       contents       { [] }