From ce57ac65f38589d9bd59c1013e82bd13645db013 Mon Sep 17 00:00:00 2001 From: David Cook Date: Tue, 11 Jul 2023 16:12:21 +1000 Subject: [PATCH] Refactor order cycle lets It turns out the outgoing exchanges were never even used. --- ...ry_fee_with_tax_report_by_producer_spec.rb | 38 +++++++------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/spec/system/admin/reports/enterprise_summary_fees/enterprise_summary_fee_with_tax_report_by_producer_spec.rb b/spec/system/admin/reports/enterprise_summary_fees/enterprise_summary_fee_with_tax_report_by_producer_spec.rb index ea0a0ae5c0..f19da3ed9f 100644 --- a/spec/system/admin/reports/enterprise_summary_fees/enterprise_summary_fee_with_tax_report_by_producer_spec.rb +++ b/spec/system/admin/reports/enterprise_summary_fees/enterprise_summary_fee_with_tax_report_by_producer_spec.rb @@ -54,10 +54,22 @@ describe "Enterprise Summary Fee with Tax Report By Producer" do let!(:shipping_method){ create(:shipping_method, :flat_rate) } let!(:order_cycle){ - create(:simple_order_cycle, distributors: [distributor], name: "oc1") + order_cycle = create(:simple_order_cycle, distributors: [distributor], name: "oc1") + + # creates exchanges for oc1 + order_cycle.exchanges.create! sender: supplier, receiver: distributor, incoming: true + order_cycle.exchanges.create! sender: supplier2, receiver: distributor, incoming: true + + order_cycle } let!(:order_cycle2){ - create(:simple_order_cycle, distributors: [distributor], name: "oc2") + order_cycle2 = create(:simple_order_cycle, distributors: [distributor], name: "oc2") + + # creates exchanges for oc2 + order_cycle2.exchanges.create! sender: supplier, receiver: distributor, incoming: true + order_cycle2.exchanges.create! sender: supplier2, receiver: distributor, incoming: true + + order_cycle2 } let!(:enterprise_relationship1) { @@ -96,28 +108,6 @@ describe "Enterprise Summary Fee with Tax Report By Producer" do tax_category:) } - # creates exchanges for oc1 - let!(:incoming_exchange1) { - order_cycle.exchanges.create! sender: supplier, receiver: distributor, incoming: true - } - let!(:incoming_exchange2) { - order_cycle.exchanges.create! sender: supplier2, receiver: distributor, incoming: true - } - let(:outgoing_exchange1) { - order_cycle.exchanges.create! sender: distributor, receiver: distributor, incoming: false - } - - # sets exchanges for oc2 - let!(:incoming_exchange3) { - order_cycle2.exchanges.create! sender: supplier, receiver: distributor, incoming: true - } - let!(:incoming_exchange4) { - order_cycle2.exchanges.create! sender: supplier2, receiver: distributor, incoming: true - } - let(:outgoing_exchange2) { - order_cycle2.exchanges.create! sender: distributor, receiver: distributor, incoming: false - } - # creates orders for for oc1 and oc2 let!(:order) { create(:order_with_distributor, distributor:) } let!(:order2) { create(:order_with_distributor, distributor:) }