Allows for subscription checkout to accommodate a more flexible checko…

Rakefile

@@ -9,7 +9,7 @@ begin
 
   RSpec::Core::RakeTask.new(:spec)
 
-  task default: %i(first_run rubocop spec)
+  task default: %i(first_run spec)
 rescue LoadError
   # no rspec available
 end

app/models/solidus_subscriptions/checkout.rb

@@ -68,14 +68,11 @@ def checkout
       order.update!
       apply_promotions
 
-      order.next! # cart => address
-
-      order.ship_address = ship_address
-      order.next! # address => delivery
-      order.next! # delivery => payment
-
-      create_payment
-      order.next! # payment => confirm
+      order.checkout_steps[0...-1].each do
+        order.ship_address = ship_address if order.state == "address"
+        create_payment if order.state == "payment"
+        order.next!
+      end
 
       # Do this as a separate "quiet" transition so that it returns true or
       # false rather than raising a failed transition error

spec/models/solidus_subscriptions/checkout_spec.rb

@@ -105,6 +105,32 @@
       end
     end
 
+    if Gem::Specification.all.find{ |gem| gem.name == 'solidus' }.version >= Gem::Version.new('1.4.0')
+      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
+          )
+        end
+
+        it { is_expected.to be_complete }
+      end
+    end
+
     context 'the variant is out of stock' do
       let(:subscription_line_item) { installments.last.subscription.line_items.first }