From 1e94f88c5e5a7e2251ea098ef484b7358c06be30 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Fri, 7 Jun 2013 15:40:03 +1000 Subject: [PATCH] Ensure order decorator is required, fix test fragility --- app/controllers/spree/orders_controller_decorator.rb | 2 ++ spec/lib/open_food_web/order_cycle_form_applicator_spec.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/spree/orders_controller_decorator.rb b/app/controllers/spree/orders_controller_decorator.rb index 730d96b279..49612546b4 100644 --- a/app/controllers/spree/orders_controller_decorator.rb +++ b/app/controllers/spree/orders_controller_decorator.rb @@ -1,3 +1,5 @@ +require 'spree/core/controller_helpers/order_decorator' + Spree::OrdersController.class_eval do before_filter :populate_order_distributor, :only => :populate before_filter :populate_order_count_on_hand, :only => :populate diff --git a/spec/lib/open_food_web/order_cycle_form_applicator_spec.rb b/spec/lib/open_food_web/order_cycle_form_applicator_spec.rb index 4ebf51e9ba..18b64986bf 100644 --- a/spec/lib/open_food_web/order_cycle_form_applicator_spec.rb +++ b/spec/lib/open_food_web/order_cycle_form_applicator_spec.rb @@ -160,7 +160,7 @@ module OpenFoodWeb applicator.send(:update_exchange, sender.id, receiver.id, {:variant_ids => [variant1.id, variant3.id]}) exchange.reload - exchange.variant_ids.should == [variant1.id, variant3.id] + exchange.variant_ids.sort.should == [variant1.id, variant3.id].sort applicator.send(:touched_exchanges).should == [exchange] end end