raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-09 03:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove more uses of adjustment source association in tests

Browse Source
This commit is contained in:
Matt-Yorkley
2021-03-19 18:09:23 +00:00
parent e323d016a2
commit 15edb5b13b
10 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spec/features/admin/reports_spec.rb
View File

@@ -394,8 +394,8 @@ feature '
let!(:adj_shipping) { create(:adjustment, order: order1, adjustable: order1, label: "Shipping", originator: shipping_method, amount: 100.55) }
let!(:adj_fee1) { create(:adjustment, order: order1, adjustable: order1, originator: enterprise_fee1, label: "Enterprise fee untaxed", amount: 10, included_tax: 0) }
let!(:adj_fee2) { create(:adjustment, order: order1, adjustable: order1, originator: enterprise_fee2, label: "Enterprise fee taxed", amount: 20, included_tax: 2) }
let!(:adj_manual1) { create(:adjustment, order: order1, adjustable: order1, originator: nil, source: nil, label: "Manual adjustment", amount: 30, included_tax: 0) }
let!(:adj_manual2) { create(:adjustment, order: order1, adjustable: order1, originator: nil, source: nil, label: "Manual adjustment", amount: 40, included_tax: 3) }
let!(:adj_manual1) { create(:adjustment, order: order1, adjustable: order1, originator: nil, label: "Manual adjustment", amount: 30, included_tax: 0) }
let!(:adj_manual2) { create(:adjustment, order: order1, adjustable: order1, originator: nil, label: "Manual adjustment", amount: 40, included_tax: 3) }
before do
order1.update_attribute :email, 'customer@email.com'

2
spec/helpers/admin/orders_helper_spec.rb
View File

@@ -7,7 +7,7 @@ describe Admin::OrdersHelper, type: :helper do
let(:order) { create(:order) }
it "selects eligible adjustments" do
adjustment = create(:adjustment, order: order, adjustable: order, amount: 1, source: nil)
adjustment = create(:adjustment, order: order, adjustable: order, amount: 1)
expect(helper.order_adjustments_for_display(order)).to eq [adjustment]
end

4
spec/helpers/checkout_helper_spec.rb
View File

@@ -36,7 +36,7 @@ describe CheckoutHelper, type: :helper do
let(:order) { create(:order_with_totals_and_distribution) }
let(:enterprise_fee) { create(:enterprise_fee, amount: 123) }
let!(:fee_adjustment) {
create(:adjustment, originator: enterprise_fee, adjustable: order, source: order,
create(:adjustment, originator: enterprise_fee, adjustable: order,
order: order)
}
@@ -61,7 +61,7 @@ describe CheckoutHelper, type: :helper do
context "with return authorization adjustments" do
let!(:return_adjustment) {
create(:adjustment, originator_type: 'Spree::ReturnAuthorization', adjustable: order,
source: nil, order: order)
order: order)
}
it "includes return adjustments" do

10
spec/lib/spree/core/calculated_adjustments_spec.rb
View File

@@ -25,16 +25,16 @@ describe Spree::Core::CalculatedAdjustments do
it "should be associated with the target" do
expect(target.adjustments).to receive(:create)
tax_rate.create_adjustment("foo", target, order)
tax_rate.create_adjustment("foo", target)
end
it "should be associated with the order" do
tax_rate.create_adjustment("foo", target, order)
tax_rate.create_adjustment("foo", target)
expect(target.adjustments.first.order_id).to eq order.id
end
it "should have the correct originator and an amount derived from the calculator and supplied calculable" do
adjustment = tax_rate.create_adjustment("foo", target, order)
adjustment = tax_rate.create_adjustment("foo", target)
expect(adjustment).not_to be_nil
expect(adjustment.amount).to eq 10
expect(adjustment.adjustable).to eq order
@@ -42,7 +42,7 @@ describe Spree::Core::CalculatedAdjustments do
end
it "should be mandatory if true is supplied for that parameter" do
adjustment = tax_rate.create_adjustment("foo", target, order, true)
adjustment = tax_rate.create_adjustment("foo", target, true)
expect(adjustment).to be_mandatory
end
@@ -50,7 +50,7 @@ describe Spree::Core::CalculatedAdjustments do
before { allow(calculator).to receive_messages(compute: 0) }
context "when adjustment is mandatory" do
before { tax_rate.create_adjustment("foo", target, order, true) }
before { tax_rate.create_adjustment("foo", target, true) }
it "should create an adjustment" do
expect(Spree::Adjustment.count).to eq 1

1
spec/models/enterprise_fee_spec.rb
View File

@@ -129,7 +129,6 @@ describe EnterpriseFee do
order = create(:order)
tax_rate = create(:tax_rate, calculator: build(:calculator))
order.adjustments.create({ amount: 12.34,
source: order,
originator: tax_rate,
state: 'closed',
label: 'hello' })

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

@@ -8,7 +8,7 @@ module Spree
let(:adjustment) { Spree::Adjustment.create(label: "Adjustment", amount: 5) }
describe "scopes" do
let!(:arbitrary_adjustment) { create(:adjustment, source: nil, label: "Arbitrary") }
let!(:arbitrary_adjustment) { create(:adjustment, label: "Arbitrary") }
let!(:return_authorization_adjustment) { create(:adjustment, originator: create(:return_authorization)) }
it "returns return_authorization adjustments" do
@@ -529,8 +529,7 @@ module Spree
describe "inclusive and additional scopes" do
let(:included) { true }
let(:adjustment) {
create(:adjustment, adjustable: order, source: order,
originator: tax_rate, included: included)
create(:adjustment, adjustable: order, originator: tax_rate, included: included)
}
context "when tax is included in price" do

2
spec/models/spree/order_spec.rb
View File

@@ -677,7 +677,7 @@ describe Spree::Order do
before do
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,
create(:adjustment, adjustable: shipment, originator: shipping_tax_rate,
amount: 10, order: order, state: "closed")
order.update!
end

2
spec/models/spree/shipment_spec.rb
View File

@@ -390,7 +390,7 @@ describe Spree::Shipment do
it "should create adjustment when not present" do
allow(shipment).to receive_messages(selected_shipping_rate_id: 1)
expect(shipping_method).to receive(:create_adjustment).with(shipment.adjustment_label,
shipment, shipment, true, "open")
shipment, true, "open")
shipment.__send__(:ensure_correct_adjustment)
end

2
spec/services/order_tax_adjustments_fetcher_spec.rb
View File

@@ -46,7 +46,7 @@ describe OrderTaxAdjustmentsFetcher do
end
let(:admin_adjustment) do
create(:adjustment, order: order, amount: 50.0, included_tax: tax_rate25.compute_tax(50.0),
source: nil, label: "Admin Adjustment")
label: "Admin Adjustment")
end
let(:order_cycle) do

7
spec/services/paypal_items_builder_spec.rb
View File

@@ -21,7 +21,7 @@ describe PaypalItemsBuilder do
context "listing adjustments" do
let!(:admin_adjustment) {
create(:adjustment, label: "Admin Adjustment", order: order, adjustable: order,
amount: 12, source: nil, originator: nil, state: "closed")
amount: 12, originator: nil, state: "closed")
}
let!(:ineligible_adjustment) {
create(:adjustment, label: "Ineligible Adjustment", order: order, adjustable: order,
@@ -47,9 +47,8 @@ describe PaypalItemsBuilder do
}
let!(:enterprise_fee) { create(:enterprise_fee) }
let!(:line_item_enterprise_fee) {
create(:adjustment, label: "Line Item Fee", order: order, adjustable: order,
amount: 91, originator: enterprise_fee, source: order.line_items.first,
state: "closed")
create(:adjustment, label: "Line Item Fee", order: order, adjustable: order.line_items.first,
amount: 91, originator: enterprise_fee, state: "closed")
}
let!(:order_enterprise_fee) {
create(:adjustment, label: "Order Fee", order: order, adjustable: order,