raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2812 from luisramos0/2-0-adjust-enterprise-fees-spec-fix

Browse Source 
[Spree Upgrade] Fix enterprise fees specs in adjustment_spec - tax_rate
This commit is contained in:
Pau Pérez Fabregat
2018-10-16 18:02:21 +02:00
committed by GitHub
parent db9669b4ce 39d232daaf
commit f2fe3c8cff
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/spree/tax_rate_decorator.rb
View File

@@ -25,9 +25,8 @@ module Spree
# LineItems or Orders, so we mock out a line item here to fit the interface
# that our calculator (usually DefaultTax) expects.
def compute_tax(amount)
product = OpenStruct.new tax_category: tax_category
line_item = LineItem.new quantity: 1
line_item.define_singleton_method(:product) { product }
line_item.tax_category = tax_category
line_item.define_singleton_method(:price) { amount }
# Tax on adjustments (represented by the included_tax field) is always inclusive of

19
spec/models/spree/adjustment_spec.rb
View File

@@ -116,15 +116,15 @@ module Spree
end
describe "EnterpriseFee adjustments" do
let!(:zone) { create(:zone_with_member) }
let(:fee_tax_rate) { create(:tax_rate, included_in_price: true, calculator: Calculator::DefaultTax.new, zone: zone, amount: 0.1) }
let(:fee_tax_category) { create(:tax_category, tax_rates: [fee_tax_rate]) }
let(:zone) { create(:zone_with_member) }
let(:fee_tax_rate) { create(:tax_rate, included_in_price: true, calculator: Calculator::DefaultTax.new, zone: zone, amount: 0.1) }
let(:fee_tax_category) { create(:tax_category, tax_rates: [fee_tax_rate]) }
let(:coordinator) { create(:distributor_enterprise, charges_sales_tax: true) }
let(:variant) { create(:variant, product: create(:product, tax_category: nil)) }
let(:order_cycle) { create(:simple_order_cycle, coordinator: coordinator, coordinator_fees: [enterprise_fee], distributors: [coordinator], variants: [variant]) }
let!(:order) { create(:order, order_cycle: order_cycle, distributor: coordinator) }
let!(:line_item) { create(:line_item, order: order, variant: variant) }
let(:line_item) { create(:line_item, variant: variant) }
let(:order) { create(:order, line_items: [line_item], order_cycle: order_cycle, distributor: coordinator) }
let(:adjustment) { order.adjustments(:reload).enterprise_fee.first }
context "when enterprise fees have a fixed tax_category" do
@@ -170,7 +170,6 @@ module Spree
end
end
context "when enterprise fees are taxed per-item" do
let(:enterprise_fee) { create(:enterprise_fee, enterprise: coordinator, tax_category: fee_tax_category, calculator: Calculator::PerItem.new(preferred_amount: 50.0)) }
@@ -195,14 +194,15 @@ module Spree
end
end
context "when enterprise fees inherit their tax_category product they are applied to" do
context "when enterprise fees inherit their tax_category from the product they are applied to" do
let(:product_tax_rate) { create(:tax_rate, included_in_price: true, calculator: Calculator::DefaultTax.new, zone: zone, amount: 0.2) }
let(:product_tax_category) { create(:tax_category, tax_rates: [product_tax_rate]) }
before do
variant.product.update_attribute(:tax_category_id, product_tax_category.id)
order.reload.create_tax_charge! # Updating line_item or order has the same effect
order.reload.update_distribution_charge!
order.create_tax_charge! # Updating line_item or order has the same effect
order.update_distribution_charge!
end
context "when enterprise fees are taxed per-order" do
@@ -235,7 +235,6 @@ module Spree
end
end
context "when enterprise fees are taxed per-item" do
let(:enterprise_fee) { create(:enterprise_fee, enterprise: coordinator, inherits_tax_category: true, calculator: Calculator::PerItem.new(preferred_amount: 50.0)) }