From fce2d743e574c4be7b1fc8e11152f4d6ed960aa8 Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Wed, 22 Mar 2017 12:06:02 +1100 Subject: [PATCH] Adding proxy-order state to specs --- .../controllers/admin/proxy_orders_controller_spec.rb | 2 +- spec/models/proxy_order_spec.rb | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/spec/controllers/admin/proxy_orders_controller_spec.rb b/spec/controllers/admin/proxy_orders_controller_spec.rb index 84efbbf26b..3b711c93b9 100644 --- a/spec/controllers/admin/proxy_orders_controller_spec.rb +++ b/spec/controllers/admin/proxy_orders_controller_spec.rb @@ -109,7 +109,7 @@ describe Admin::ProxyOrdersController, type: :controller do it 'renders the resumed proxy_order as json' do spree_get :resume, params json_response = JSON.parse(response.body) - expect(json_response['state']).to eq "cart" + expect(json_response['state']).to eq "resumed" expect(json_response['id']).to eq proxy_order.id expect(proxy_order.reload.canceled_at).to be nil end diff --git a/spec/models/proxy_order_spec.rb b/spec/models/proxy_order_spec.rb index 67684b030a..a7170c5795 100644 --- a/spec/models/proxy_order_spec.rb +++ b/spec/models/proxy_order_spec.rb @@ -15,6 +15,7 @@ describe ProxyOrder, type: :model do it "returns true and sets canceled_at to the current time" do expect(proxy_order.cancel).to be true expect(proxy_order.reload.canceled_at).to be_within(5.seconds).of Time.now + expect(proxy_order.state).to eq 'canceled' end end @@ -25,6 +26,7 @@ describe ProxyOrder, type: :model do expect(proxy_order.cancel).to be true expect(proxy_order.reload.canceled_at).to be_within(5.seconds).of Time.now expect(order.reload.state).to eq 'canceled' + expect(proxy_order.state).to eq 'canceled' end end @@ -35,6 +37,7 @@ describe ProxyOrder, type: :model do expect(proxy_order.cancel).to be true expect(proxy_order.reload.canceled_at).to be_within(5.seconds).of Time.now expect(order.reload.state).to eq 'cart' + expect(proxy_order.state).to eq 'canceled' end end end @@ -49,6 +52,7 @@ describe ProxyOrder, type: :model do it "returns false and does nothing" do expect(proxy_order.cancel).to be false expect(proxy_order.reload.canceled_at).to be nil + expect(proxy_order.state).to eq 'pending' end end @@ -59,6 +63,7 @@ describe ProxyOrder, type: :model do expect(proxy_order.cancel).to be false expect(proxy_order.reload.canceled_at).to be nil expect(order.reload.state).to eq 'cart' + expect(proxy_order.state).to eq 'cart' end end end @@ -79,6 +84,7 @@ describe ProxyOrder, type: :model do it "returns true and clears canceled_at" do expect(proxy_order.resume).to be true expect(proxy_order.reload.canceled_at).to be nil + expect(proxy_order.state).to eq 'pending' end end @@ -90,6 +96,7 @@ describe ProxyOrder, type: :model do expect(proxy_order.resume).to be true expect(proxy_order.reload.canceled_at).to be nil expect(order.reload.state).to eq 'resumed' + expect(proxy_order.state).to eq 'resumed' end end @@ -100,6 +107,7 @@ describe ProxyOrder, type: :model do expect(proxy_order.resume).to be true expect(proxy_order.reload.canceled_at).to be nil expect(order.reload.state).to eq 'complete' + expect(proxy_order.state).to eq 'cart' end end end @@ -113,6 +121,7 @@ describe ProxyOrder, type: :model do it "returns false and does nothing" do expect(proxy_order.resume).to eq false expect(proxy_order.reload.canceled_at).to be_within(5.seconds).of Time.now + expect(proxy_order.state).to eq 'canceled' end end @@ -124,6 +133,7 @@ describe ProxyOrder, type: :model do expect(proxy_order.resume).to eq false expect(proxy_order.reload.canceled_at).to be_within(5.seconds).of Time.now expect(order.reload.state).to eq 'canceled' + expect(proxy_order.state).to eq 'canceled' end end @@ -134,6 +144,7 @@ describe ProxyOrder, type: :model do expect(proxy_order.resume).to eq false expect(proxy_order.reload.canceled_at).to be_within(5.seconds).of Time.now expect(order.reload.state).to eq 'complete' + expect(proxy_order.state).to eq 'canceled' end end end