ProxyOrders belong to order cycles

This commit is contained in:
Rob Harrington
2016-12-11 15:23:08 +11:00
parent e351c3e355
commit 64206bc35b
15 changed files with 123 additions and 100 deletions

View File

@@ -7,9 +7,8 @@ describe Admin::ProxyOrdersController, type: :controller do
let!(:user) { create(:user, enterprise_limit: 10) }
let!(:shop) { create(:distributor_enterprise) }
let!(:order_cycle) { create(:simple_order_cycle, orders_close_at: 1.day.from_now) }
let!(:order) { create(:order, order_cycle: order_cycle) }
let!(:standing_order) { create(:standing_order_with_items, shop: shop, orders: [order]) }
let!(:proxy_order) { standing_order.proxy_orders.first }
let!(:standing_order) { create(:standing_order_with_items, shop: shop) }
let!(:proxy_order) { create(:proxy_order, standing_order: standing_order, order_cycle: order_cycle) }
before do
allow(controller).to receive(:spree_current_user) { user }
@@ -68,12 +67,14 @@ describe Admin::ProxyOrdersController, type: :controller do
let!(:shop) { create(:distributor_enterprise) }
let!(:order_cycle) { create(:simple_order_cycle, orders_close_at: 1.day.from_now) }
let!(:payment_method) { create(:payment_method) }
let!(:order) { create(:order, shipping_method: create(:shipping_method), order_cycle: order_cycle) }
let!(:standing_order) { create(:standing_order_with_items, shop: shop, orders: [order]) }
let!(:proxy_order) { standing_order.proxy_orders.first }
let!(:shipping_method) { create(:shipping_method) }
let!(:standing_order) { create(:standing_order_with_items, shop: shop) }
let!(:proxy_order) { create(:proxy_order, standing_order: standing_order, order_cycle: order_cycle) }
let(:order) { proxy_order.order }
before do
# Processing order to completion
order.update_attribute(:shipping_method_id, shipping_method.id)
while !order.completed? do break unless order.next! end
proxy_order.update_attribute(:canceled_at, Time.zone.now)
order.cancel