solidus_core 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bdaf7748b13daf199a4d23fcb00bfc0a5f38bc4
-  data.tar.gz: a108fea214ee54d7ad879c3fed81e6d3f55421c8
+  metadata.gz: bfbaab05af3945cfa3851f30385796b958081539
+  data.tar.gz: 0ce9487cd7d65d53c29a521604e88f1c7c2cccee
 SHA512:
-  metadata.gz: 586b29252a401eec1003c8c109647c583d1d0819f17d23f0ea096fba058113f3bbda2b998d6ff1e8d10ac627a9bf1b52ead4386edce414ab9aecefe05129971d
-  data.tar.gz: f4abefa2f9cbbb0c2ea33364a1fce3f7146468bce407047c01c56cab231591bac607adca89e1b4cfa4a022c180d6aad98060725c5ac464c863ac45cce5dba2d5
+  metadata.gz: ded1d464481cb7560a968170df60ee2b4fb7f41cd5f5270cac8459aa65d987cf74aca0f6bb0089235669db0fc40109080249178316c2d596a5c094f5409a815f
+  data.tar.gz: a1b690aed55aea7da4e8f7d20147479f966ea1d36953a85bed3ab91307443c6b1aa40a3152f4be8ac3719c3af6c0aa2d31e7bedd2548e178c05364bfede90faa

data/app/models/spree/order.rb

@@ -759,6 +759,23 @@ module Spree
       end
     end
 
+    def payments_attributes=(attributes)
+      validate_payments_attributes(attributes)
+      super(attributes)
+    end
+
+    def validate_payments_attributes(attributes)
+      attributes = Array(attributes)
+      # Ensure the payment methods specified are allowed for this user
+      payment_methods = Spree::PaymentMethod.where(id: available_payment_methods)
+      attributes.each do |payment_attributes|
+        payment_method_id = payment_attributes[:payment_method_id]
+
+        # raise RecordNotFound unless it is an allowed payment method
+        payment_methods.find(payment_method_id) if payment_method_id
+      end
+    end
+
     private
 
     def process_payments_before_complete

data/app/models/spree/order_update_attributes.rb

@@ -14,6 +14,8 @@ module Spree
     # Assign the attributes to the order and save the order
     # @return true if saved, otherwise false and errors will be set on the order
     def apply
+      order.validate_payments_attributes(@payments_attributes)
+
       assign_order_attributes
       assign_payments_attributes
 

data/app/models/spree/payment.rb

@@ -40,6 +40,7 @@ module Spree
 
     validates :amount, numericality: true
     validates :source, presence: true, if: :source_required?
+    validates :payment_method, presence: true
 
     default_scope -> { order(:created_at) }
 

data/lib/spree/core/version.rb

@@ -1,6 +1,6 @@
 module Spree
   def self.solidus_version
-    "2.4.0"
+    "2.4.1"
   end
 
   def self.solidus_gem_version

data/spec/models/spree/order_spec.rb

@@ -1548,4 +1548,56 @@ RSpec.describe Spree::Order, type: :model do
       subject.update_params_payment_source
     end
   end
+
+  describe "#validate_payments_attributes" do
+    let(:attributes) { [ActionController::Parameters.new(payment_method_id: payment_method.id)] }
+    subject do
+      order.validate_payments_attributes(attributes)
+    end
+
+    context "with empty array" do
+      let(:attributes) { [] }
+      it "doesn't error" do
+        subject
+      end
+    end
+
+    context "with no payment method specified" do
+      let(:attributes) { [ActionController::Parameters.new({})] }
+      it "doesn't error" do
+        subject
+      end
+    end
+
+    context "with valid payment method" do
+      let(:payment_method) { create(:check_payment_method) }
+      it "doesn't error" do
+        subject
+      end
+    end
+
+    context "with inactive payment method" do
+      let(:payment_method) { create(:check_payment_method, active: false) }
+
+      it "raises RecordNotFound" do
+        expect { subject }.to raise_error(ActiveRecord::RecordNotFound)
+      end
+    end
+
+    context "with unavailable payment method" do
+      let(:payment_method) { create(:check_payment_method, available_to_users: false) }
+
+      it "raises RecordNotFound" do
+        expect { subject }.to raise_error(ActiveRecord::RecordNotFound)
+      end
+    end
+
+    context "with soft-deleted payment method" do
+      let(:payment_method) { create(:check_payment_method, deleted_at: Time.current) }
+
+      it "raises RecordNotFound" do
+        expect { subject }.to raise_error(ActiveRecord::RecordNotFound)
+      end
+    end
+  end
 end

data/spec/models/spree/order_update_attributes_spec.rb

@@ -3,6 +3,7 @@ require 'rails_helper'
 module Spree
   RSpec.describe OrderUpdateAttributes do
     let(:order) { create(:order) }
+    let(:payment_method) { create(:payment_method) }
     let(:request_env) { nil }
     let(:update) { described_class.new(order, attributes, request_env: request_env) }
 
@@ -25,7 +26,10 @@ module Spree
       let(:attributes) do
         {
           payments_attributes: [
-            { source_attributes: attributes_for(:credit_card) }
+            {
+              payment_method_id: payment_method.id,
+              source_attributes: attributes_for(:credit_card)
+            }
           ]
         }
       end

data/spec/models/spree/payment_spec.rb

@@ -662,12 +662,13 @@ RSpec.describe Spree::Payment, type: :model do
     end
 
     context "completed orders" do
+      let(:payment_method) { create(:check_payment_method) }
       before { allow(order).to receive_messages completed?: true }
 
       it "updates payment_state and shipments" do
         expect(order.updater).to receive(:update_payment_state)
         expect(order.updater).to receive(:update_shipment_state)
-        Spree::Payment.create(amount: 100, order: order)
+        Spree::Payment.create!(amount: 100, order: order, payment_method: payment_method)
       end
     end
 
@@ -798,12 +799,13 @@ RSpec.describe Spree::Payment, type: :model do
     end
 
     describe "invalidating payments updates in memory objects" do
+      let(:payment_method) { create(:check_payment_method) }
       before do
-        Spree::PaymentCreate.new(order, amount: 1).build.save!
+        Spree::PaymentCreate.new(order, amount: 1, payment_method_id: payment_method.id).build.save!
         expect(order.payments.map(&:state)).to contain_exactly(
           'checkout'
         )
-        Spree::PaymentCreate.new(order, amount: 2).build.save!
+        Spree::PaymentCreate.new(order, amount: 2, payment_method_id: payment_method.id).build.save!
       end
 
       it 'should not have stale payments' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2017-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant