Replaced order.shipping_method with order.shipments in models.order_s…

…pec.

Fixed factory completed_order_with_fees used in order_spec and also in line_items_controller_spec and orders_controller_spec.

spec/factories.rb

@@ -335,16 +335,29 @@
     end
   end
 
+  factory :shipping_method_with_shipping_fee, parent: :shipping_method do
+    transient do
+      shipping_fee 3
+    end
+
+    calculator { build(:calculator_per_item, preferred_amount: shipping_fee) }
+    require_ship_address { false }
+    distributors { [:distributor] }
+  end
+
+  factory :shipment_with_shipping_fee, parent: :shipment do
+    after(:create) do |shipment|
+      shipment.add_shipping_method(create(:shipping_method_with_shipping_fee), true)
+    end
+  end
+
   factory :completed_order_with_fees, parent: :order_with_totals_and_distribution do
     transient do
       shipping_fee 3
       payment_fee 5
     end
 
-    shipping_method do
-      shipping_calculator = build(:calculator_per_item, preferred_amount: shipping_fee)
-      create(:shipping_method, calculator: shipping_calculator, require_ship_address: false, distributors: [distributor])
-    end
+    shipments { [ create(:shipment_with_shipping_fee) ] }
 
     after(:create) do |order, evaluator|
       create(:line_item, order: order)