Fix rubocop warnings, restore checkout flow after checkout flow spec and actually make address and payment set in the checkout step.

1 files changed, 8 insertions, 3 deletions

diff --git a/spec/models/solidus_subscriptions/checkout_spec.rb b/spec/models/solidus_subscriptions/checkout_spec.rb
index 49c6dc6..caa68a3 100644
--- a/spec/models/solidus_subscriptions/checkout_spec.rb
+++ b/spec/models/solidus_subscriptions/checkout_spec.rb
@@ -107,18 +107,23 @@ RSpec.describe SolidusSubscriptions::Checkout do
 
     context 'Altered checkout flow' do
       before do
+        @old_checkout_flow = Spree::Order.checkout_flow
         Spree::Order.remove_checkout_step(:delivery)
       end
 
+      after do
+        Spree::Order.checkout_flow(&@old_checkout_flow)
+      end
+
       it 'has a payment' do
         expect(order.payments.valid).to be_present
       end
 
       it 'has the correct totals' do
         expect(order).to have_attributes(
-                           total: 39.98,
-                           shipment_total: 0
-                         )
+          total: 39.98,
+          shipment_total: 0
+        )
       end
 
       it { is_expected.to be_complete }