Merge pull request #6653 from Matt-Yorkley/dead-code-available-payment

Dead code: #has_available_payment

app/models/spree/order.rb

@@ -87,7 +87,6 @@ module Spree
     after_create :create_tax_charge!
 
     validate :has_available_shipment
-    validate :has_available_payment
     validates :email, presence: true,
                       format: /\A([\w\.%\+\-']+)@([\w\-]+\.)+([\w]{2,})\z/i,
                       if: :require_email
@@ -816,11 +815,6 @@ module Spree
       errors.add(:base, Spree.t(:items_cannot_be_shipped)) && (return false)
     end
 
-    def has_available_payment
-      return unless delivery?
-      # errors.add(:base, :no_payment_methods_available) if available_payment_methods.empty?
-    end
-
     def after_cancel
       shipments.each(&:cancel!)
 

spec/models/spree/order/checkout_spec.rb

@@ -68,7 +68,6 @@ describe Spree::Order::Checkout do
     context "from address" do
       before do
         order.state = 'address'
-        allow(order).to receive(:has_available_payment)
         order.shipments << create(:shipment)
         order.email = "user@example.com"
         order.save!

spec/models/spree/order/state_machine_spec.rb

@@ -51,7 +51,6 @@ describe Spree::Order do
 
     context "when current state is address" do
       before do
-        allow(order).to receive(:has_available_payment)
         allow(order).to receive(:ensure_available_shipping_rates)
         order.state = "address"
       end

spec/models/spree/order_spec.rb

@@ -410,8 +410,6 @@ describe Spree::Order do
     end
 
     before do
-      # Don't care about available payment methods in this test
-      allow(persisted_order).to receive_messages(has_available_payment: false)
       persisted_order.line_items << line_item
       persisted_order.adjustments.create(amount: -line_item.amount, label: "Promotion")
       persisted_order.state = 'delivery'