From 889b357408ecf2cf0673911d5da579359a31caa1 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Fri, 19 Feb 2021 18:47:41 +0000 Subject: [PATCH] Update Order#total_tax --- spec/models/spree/order_spec.rb | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/spec/models/spree/order_spec.rb b/spec/models/spree/order_spec.rb index 51adbd5480..b55fa2df9d 100644 --- a/spec/models/spree/order_spec.rb +++ b/spec/models/spree/order_spec.rb @@ -680,11 +680,7 @@ describe Spree::Order do end describe "getting the total tax" do - before do - allow(Spree::Config).to receive(:shipment_inc_vat).and_return(true) - allow(Spree::Config).to receive(:shipping_tax_rate).and_return(0.25) - end - + let(:shipping_tax_rate) { create(:tax_rate, amount: 0.25) } let(:order) { create(:order) } let(:shipping_method) { create(:shipping_method_with, :flat_rate) } let!(:shipment) do @@ -693,15 +689,10 @@ describe Spree::Order do let(:enterprise_fee) { create(:enterprise_fee) } before do - create( - :adjustment, - order: order, - adjustable: order, - originator: enterprise_fee, - label: "EF", - amount: 123, - included_tax: 2 - ) + create(:adjustment, adjustable: order, originator: enterprise_fee, label: "EF", amount: 123, + included_tax: 2, order: order) + create(:adjustment, adjustable: shipment, source: shipment, originator: shipping_tax_rate, + amount: 10, order: order, state: "closed") order.update! end