From 01fe6abeedac1619801c25dad2a134fa7a89fbb0 Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Tue, 13 Jul 2021 22:38:05 +0100 Subject: [PATCH] Result of rubocop -a, safe autocorrect --- app/models/spree/payment.rb | 3 +- .../order_management/order/updater_spec.rb | 4 +- .../admin/bulk_order_management_spec.rb | 82 +++++++++++++++---- spec/services/place_proxy_order_spec.rb | 4 +- 4 files changed, 72 insertions(+), 21 deletions(-) diff --git a/app/models/spree/payment.rb b/app/models/spree/payment.rb index 847cbf3631..fbaa3d7aa9 100644 --- a/app/models/spree/payment.rb +++ b/app/models/spree/payment.rb @@ -57,7 +57,8 @@ module Spree state_machine initial: :checkout do # With card payments, happens before purchase or authorization happens event :started_processing do - transition from: [:checkout, :pending, :completed, :processing, :requires_authorization], to: :processing + transition from: [:checkout, :pending, :completed, :processing, :requires_authorization], + to: :processing end # When processing during checkout fails event :failure do diff --git a/engines/order_management/spec/services/order_management/order/updater_spec.rb b/engines/order_management/spec/services/order_management/order/updater_spec.rb index b18ce59912..2a5c1f111d 100644 --- a/engines/order_management/spec/services/order_management/order/updater_spec.rb +++ b/engines/order_management/spec/services/order_management/order/updater_spec.rb @@ -226,7 +226,9 @@ module OrderManagement order.total = 30 allow(order).to receive_message_chain(:payments, :valid, :empty?) { false } allow(order).to receive_message_chain(:payments, :completed, :empty?) { false } - allow(order).to receive_message_chain(:payments, :requires_authorization, :any?) { false } + allow(order).to receive_message_chain(:payments, :requires_authorization, :any?) { + false + } expect { updater.update_payment_state diff --git a/spec/features/admin/bulk_order_management_spec.rb b/spec/features/admin/bulk_order_management_spec.rb index e71bc6e0c3..1d2b019a58 100644 --- a/spec/features/admin/bulk_order_management_spec.rb +++ b/spec/features/admin/bulk_order_management_spec.rb @@ -21,8 +21,14 @@ feature ' end context "displaying the list of line items" do - let!(:o1) { create(:order_with_distributor, state: 'complete', shipment_state: 'ready', completed_at: Time.zone.now ) } - let!(:o2) { create(:order_with_distributor, state: 'complete', shipment_state: 'ready', completed_at: Time.zone.now ) } + let!(:o1) { + create(:order_with_distributor, state: 'complete', shipment_state: 'ready', + completed_at: Time.zone.now ) + } + let!(:o2) { + create(:order_with_distributor, state: 'complete', shipment_state: 'ready', + completed_at: Time.zone.now ) + } let!(:o3) { create(:order_with_distributor, state: 'address', completed_at: nil ) } let!(:o4) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now ) } let!(:o5) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now ) } @@ -110,8 +116,14 @@ feature ' end describe "sorting of line items" do - let!(:o1) { create(:order_with_distributor, state: 'complete', shipment_state: 'ready', completed_at: Time.zone.now) } - let!(:o2) { create(:order_with_distributor, state: 'complete', shipment_state: 'ready', completed_at: Time.zone.now) } + let!(:o1) { + create(:order_with_distributor, state: 'complete', shipment_state: 'ready', + completed_at: Time.zone.now) + } + let!(:o2) { + create(:order_with_distributor, state: 'complete', shipment_state: 'ready', + completed_at: Time.zone.now) + } let!(:li1) { create(:line_item_with_shipment, order: o1) } let!(:li2) { create(:line_item_with_shipment, order: o2) } @@ -154,7 +166,10 @@ feature ' end context "tracking changes" do - let!(:o1) { create(:order_with_distributor, state: 'complete', shipment_state: 'ready', completed_at: Time.zone.now ) } + let!(:o1) { + create(:order_with_distributor, state: 'complete', shipment_state: 'ready', + completed_at: Time.zone.now ) + } let!(:li1) { create(:line_item_with_shipment, order: o1, quantity: 5 ) } before :each do @@ -214,7 +229,10 @@ feature ' variant_unit: "weight", variants: [create(:variant, unit_value: 1000)] ) } let!(:v1) { p1.variants.first } - let!(:o1) { create(:order_with_distributor, state: 'complete', shipment_state: 'ready', completed_at: Time.zone.now ) } + let!(:o1) { + create(:order_with_distributor, state: 'complete', shipment_state: 'ready', + completed_at: Time.zone.now ) + } let!(:li1) { create(:line_item_with_shipment, order: o1, variant: v1, quantity: 5, final_weight_volume: 1000, price: 10.00 ) @@ -480,9 +498,18 @@ feature ' end context "using quick search" do - let!(:o1) { create(:order_with_distributor, state: 'complete', shipment_state: 'ready', completed_at: Time.zone.now ) } - let!(:o2) { create(:order_with_distributor, state: 'complete', shipment_state: 'ready', completed_at: Time.zone.now ) } - let!(:o3) { create(:order_with_distributor, state: 'complete', shipment_state: 'ready', completed_at: Time.zone.now ) } + let!(:o1) { + create(:order_with_distributor, state: 'complete', shipment_state: 'ready', + completed_at: Time.zone.now ) + } + let!(:o2) { + create(:order_with_distributor, state: 'complete', shipment_state: 'ready', + completed_at: Time.zone.now ) + } + let!(:o3) { + create(:order_with_distributor, state: 'complete', shipment_state: 'ready', + completed_at: Time.zone.now ) + } let!(:li1) { create(:line_item_with_shipment, order: o1 ) } let!(:li2) { create(:line_item_with_shipment, order: o2 ) } let!(:li3) { create(:line_item_with_shipment, order: o3 ) } @@ -508,10 +535,12 @@ feature ' completed_at: Time.zone.today - 7.days - 1.second) } let!(:o2) { - create(:order_with_distributor, state: 'complete', shipment_state: 'ready', completed_at: Time.zone.today - 7.days) + create(:order_with_distributor, state: 'complete', shipment_state: 'ready', + completed_at: Time.zone.today - 7.days) } let!(:o3) { - create(:order_with_distributor, state: 'complete', shipment_state: 'ready', completed_at: Time.zone.now.end_of_day) + create(:order_with_distributor, state: 'complete', shipment_state: 'ready', + completed_at: Time.zone.now.end_of_day) } let!(:o4) { create(:order_with_distributor, state: 'complete', shipment_state: 'ready', @@ -593,8 +622,14 @@ feature ' end context "bulk action controls" do - let!(:o1) { create(:order_with_distributor, state: 'complete', shipment_state: 'ready', completed_at: Time.zone.now ) } - let!(:o2) { create(:order_with_distributor, state: 'complete', shipment_state: 'ready', completed_at: Time.zone.now ) } + let!(:o1) { + create(:order_with_distributor, state: 'complete', shipment_state: 'ready', + completed_at: Time.zone.now ) + } + let!(:o2) { + create(:order_with_distributor, state: 'complete', shipment_state: 'ready', + completed_at: Time.zone.now ) + } let!(:li1) { create(:line_item_with_shipment, order: o1 ) } let!(:li2) { create(:line_item_with_shipment, order: o2 ) } @@ -716,10 +751,12 @@ feature ' context "using delete buttons" do let!(:o1) { - create(:order_with_distributor, state: 'complete', shipment_state: 'ready', completed_at: Time.zone.now ) + create(:order_with_distributor, state: 'complete', shipment_state: 'ready', + completed_at: Time.zone.now ) } let!(:o2) { - create(:order_with_distributor, state: 'complete', shipment_state: 'ready', completed_at: Time.zone.now ) + create(:order_with_distributor, state: 'complete', shipment_state: 'ready', + completed_at: Time.zone.now ) } let!(:li1) { create(:line_item_with_shipment, order: o1 ) } let!(:li2) { create(:line_item_with_shipment, order: o2 ) } @@ -742,8 +779,14 @@ feature ' end context "clicking the link on variant name" do - let!(:o1) { create(:order_with_distributor, state: 'complete', shipment_state: 'ready', completed_at: Time.zone.now ) } - let!(:o2) { create(:order_with_distributor, state: 'complete', shipment_state: 'ready', completed_at: Time.zone.now ) } + let!(:o1) { + create(:order_with_distributor, state: 'complete', shipment_state: 'ready', + completed_at: Time.zone.now ) + } + let!(:o2) { + create(:order_with_distributor, state: 'complete', shipment_state: 'ready', + completed_at: Time.zone.now ) + } let!(:li1) { create(:line_item_with_shipment, order: o1 ) } let!(:li2) { create(:line_item_with_shipment, order: o2 ) } let!(:p3) { @@ -751,7 +794,10 @@ feature ' variant_unit: "weight", variants: [create(:variant, unit_value: 1000)] ) } let!(:v3) { p3.variants.first } - let!(:o3) { create(:order_with_distributor, state: 'complete', shipment_state: 'ready', completed_at: Time.zone.now ) } + let!(:o3) { + create(:order_with_distributor, state: 'complete', shipment_state: 'ready', + completed_at: Time.zone.now ) + } let!(:li3) { create(:line_item_with_shipment, order: o3, variant: v3, quantity: 3, max_quantity: 6 ) } diff --git a/spec/services/place_proxy_order_spec.rb b/spec/services/place_proxy_order_spec.rb index 0e1ea14033..5982633f3a 100644 --- a/spec/services/place_proxy_order_spec.rb +++ b/spec/services/place_proxy_order_spec.rb @@ -43,7 +43,9 @@ describe PlaceProxyOrder do end context "when the order is already complete" do - let(:summarizer) { instance_double(OrderManagement::Subscriptions::Summarizer, record_order: true) } + let(:summarizer) { + instance_double(OrderManagement::Subscriptions::Summarizer, record_order: true) + } let!(:proxy_order) { create(:proxy_order, subscription: subscription) } let(:order) { proxy_order.order }