From da8a8e8a1af7bce1acd2cd455620790332d06010 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Fri, 21 Feb 2014 15:49:10 +1100 Subject: [PATCH] Rename method --- app/models/order_cycle.rb | 6 +++--- spec/models/order_cycle_spec.rb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/order_cycle.rb b/app/models/order_cycle.rb index 1dbdbbed18..057f1c4211 100644 --- a/app/models/order_cycle.rb +++ b/app/models/order_cycle.rb @@ -146,7 +146,7 @@ class OrderCycle < ActiveRecord::Base # -- Fees def fees_for(variant, distributor) - enterprise_fees_for(variant, distributor).sum do |applicator| + per_item_enterprise_fee_applicators_for(variant, distributor).sum do |applicator| # Spree's Calculator interface accepts Orders or LineItems, # so we meet that interface with a struct. # Amount is faked, this is a method on LineItem @@ -159,13 +159,13 @@ class OrderCycle < ActiveRecord::Base variant = line_item.variant distributor = line_item.order.distributor - enterprise_fees_for(variant, distributor).each { |applicator| applicator.create_line_item_adjustment(line_item) } + per_item_enterprise_fee_applicators_for(variant, distributor).each { |applicator| applicator.create_line_item_adjustment(line_item) } end private # -- Fees - def enterprise_fees_for(variant, distributor) + def per_item_enterprise_fee_applicators_for(variant, distributor) fees = [] exchanges_carrying(variant, distributor).each do |exchange| diff --git a/spec/models/order_cycle_spec.rb b/spec/models/order_cycle_spec.rb index 36480ca74b..7ab229d0cc 100644 --- a/spec/models/order_cycle_spec.rb +++ b/spec/models/order_cycle_spec.rb @@ -350,7 +350,7 @@ describe OrderCycle do it "creates adjustment for each fee" do applicator = double(:enterprise_fee_applicator) applicator.should_receive(:create_line_item_adjustment).with(line_item) - oc.should_receive(:enterprise_fees_for).with(variant, distributor) { [applicator] } + oc.should_receive(:per_item_enterprise_fee_applicators_for).with(variant, distributor) { [applicator] } oc.send(:create_adjustments_for, line_item) end @@ -366,7 +366,7 @@ describe OrderCycle do oc.stub(:exchanges_carrying) { [incoming_exchange, outgoing_exchange] } oc.stub(:coordinator_fees) { [ef3] } - oc.send(:enterprise_fees_for, line_item.variant, distributor).should == + oc.send(:per_item_enterprise_fee_applicators_for, line_item.variant, distributor).should == [OpenFoodNetwork::EnterpriseFeeApplicator.new(ef1, line_item.variant, 'supplier'), OpenFoodNetwork::EnterpriseFeeApplicator.new(ef2, line_item.variant, 'distributor'), OpenFoodNetwork::EnterpriseFeeApplicator.new(ef3, line_item.variant, 'coordinator')]