solidus_core 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f13c8544ce3ba77d4caf42287a68f8fa4a03d58
-  data.tar.gz: 5fe553761f79bc61f4be5b8ef3fdaa5f31976836
+  metadata.gz: 3c934b38bc5fe5c396b4c0eff48366ee4d0191b7
+  data.tar.gz: 909b4d8df7e9fae8bc877f2ea3ba94e9e4678cc1
 SHA512:
-  metadata.gz: 55dba61d25cb8bdd9a811c815c96a2e1bc87e73fda9f04f6b2871709ee724735de18bd9dd28744d4c7890b860922e8f90a746b7e6820a64ecbc5057d46606e5c
-  data.tar.gz: db6e781a3053c1fa55f565ac84d5c583fe0e733b32aa1ba1642e132986057145919ee71ce72635bcf5decd8e19a9f241f855c59b29d255a32470baabbac2d73d
+  metadata.gz: 663ef73baabdcb94f31638b3a84913f10b853748de77376c1018b9f026f703fdf8f3d2c78cc69bd6edb4997e3c506f2aff348fbbd7d7a03442863147c054a056
+  data.tar.gz: dcfa1557ad792104c88a4f9eea1648711888417f8169594da523534d64e230caefbc86a759161ab5525e0b55c45fa123da14a6910a88b8bd6300593d7bacb934

data/app/models/spree/order.rb

@@ -431,6 +431,7 @@ module Spree
       @available_payment_methods ||= Spree::PaymentMethod
         .available_to_store(store)
         .available_to_users
+        .active
         .sort_by(&:position)
     end
 
@@ -689,6 +690,23 @@ module Spree
       Spree::Money.new(total_available_store_credit - total_applicable_store_credit, { currency: currency })
     end
 
+    def payments_attributes=(attributes)
+      validate_payments_attributes(attributes)
+      super(attributes)
+    end
+
+    def validate_payments_attributes(attributes)
+      attributes = Array.wrap(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 associate_store

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.1.0"
+    "2.1.1"
   end
 
   def self.solidus_gem_version

data/spec/models/spree/order_inventory_spec.rb

@@ -201,10 +201,12 @@ describe Spree::OrderInventory, type: :model do
       end
 
       it 'should destroy self if not inventory units remain' do
-        allow(shipment.inventory_units).to receive_messages(count: 0)
-        expect(shipment).to receive(:destroy)
+        shipment.inventory_units[1...999].each(&:destroy)
+        shipment.inventory_units.reload
 
-        expect(subject.send(:remove_from_shipment, shipment, 1)).to eq(1)
+        expect {
+          expect(subject.send(:remove_from_shipment, shipment, 1)).to eq(1)
+        }.to change{ order.shipments.count }.from(1).to(0)
       end
 
       context "inventory unit line item and variant points to different products" do

data/spec/models/spree/order_spec.rb

@@ -1459,4 +1459,56 @@ describe Spree::Order, type: :model do
       end
     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 'spec_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

@@ -17,12 +17,12 @@ describe Spree::Payment, type: :model do
   let(:card) { create :credit_card }
 
   let(:payment) do
-    payment = Spree::Payment.new
-    payment.source = card
-    payment.order = order
-    payment.payment_method = gateway
-    payment.amount = 5
-    payment
+    Spree::Payment.create! do |payment|
+      payment.source = card
+      payment.order = order
+      payment.payment_method = gateway
+      payment.amount = 5
+    end
   end
 
   let(:amount_in_cents) { (payment.amount * 100).round }
@@ -39,11 +39,6 @@ describe Spree::Payment, type: :model do
     ActiveMerchant::Billing::Response.new(false, '', {}, {})
   end
 
-  before(:each) do
-    # So it doesn't create log entries every time a processing method is called
-    allow(payment.log_entries).to receive(:create!)
-  end
-
   context '.risky' do
     let!(:payment_1) { create(:payment, avs_response: 'Y', cvv_response_code: 'M', cvv_response_message: 'Match') }
     let!(:payment_2) { create(:payment, avs_response: 'Y', cvv_response_code: 'M', cvv_response_message: '') }
@@ -246,8 +241,9 @@ describe Spree::Payment, type: :model do
 
       it "should log the response" do
         payment.save!
-        expect(payment.log_entries).to receive(:create!).with(details: anything)
-        payment.authorize!
+        expect {
+          payment.authorize!
+        }.to change { payment.log_entries.count }.by(1)
       end
 
       describe 'billing_address option' do
@@ -355,8 +351,9 @@ describe Spree::Payment, type: :model do
 
       it "should log the response" do
         payment.save!
-        expect(payment.log_entries).to receive(:create!).with(details: anything)
-        payment.purchase!
+        expect {
+          payment.purchase!
+        }.to change { payment.log_entries.count }.by(1)
       end
 
       context "if successful" do
@@ -532,8 +529,9 @@ describe Spree::Payment, type: :model do
       end
 
       it "should log the response" do
-        expect(payment.log_entries).to receive(:create!).with(details: anything)
-        payment.void_transaction!
+        expect {
+          payment.void_transaction!
+        }.to change { payment.log_entries.count }.by(1)
       end
 
       context "if successful" do
@@ -655,12 +653,13 @@ 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
 
@@ -688,6 +687,8 @@ describe Spree::Payment, type: :model do
         let(:attributes) { attributes_for(:credit_card) }
 
         it "should not try to create profiles on old failed payment attempts" do
+          order.payments.destroy_all
+
           allow_any_instance_of(Spree::Payment).to receive(:payment_method) { gateway }
 
           Spree::PaymentCreate.new(order, {
@@ -742,12 +743,13 @@ 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

data/spec/models/spree/promotion_spec.rb

@@ -597,7 +597,8 @@ describe Spree::Promotion, type: :model do
           allow(rule2).to receive_messages(eligible?: true, applicable?: true)
 
           promotion.promotion_rules = [rule1, rule2]
-          allow(promotion.promotion_rules).to receive(:for).and_return(promotion.promotion_rules)
+          allow(promotion).to receive_message_chain(:rules, :none?).and_return(false)
+          allow(promotion).to receive_message_chain(:rules, :for).and_return(promotion.promotion_rules)
         end
         it "returns the eligible rules" do
           expect(promotion.eligible_rules(promotable)).to eq [rule1, rule2]
@@ -615,7 +616,8 @@ describe Spree::Promotion, type: :model do
           allow(rule2).to receive_messages(eligible?: false, applicable?: true, eligibility_errors: errors)
 
           promotion.promotion_rules = [rule1, rule2]
-          allow(promotion.promotion_rules).to receive(:for).and_return(promotion.promotion_rules)
+          allow(promotion).to receive_message_chain(:rules, :none?).and_return(false)
+          allow(promotion).to receive_message_chain(:rules, :for).and_return(promotion.promotion_rules)
         end
         it "returns nil" do
           expect(promotion.eligible_rules(promotable)).to be_nil
@@ -647,7 +649,8 @@ describe Spree::Promotion, type: :model do
           allow(rule).to receive_messages(eligible?: false, applicable?: true, eligibility_errors: errors)
 
           promotion.promotion_rules = [rule]
-          allow(promotion.promotion_rules).to receive(:for).and_return(promotion.promotion_rules)
+          allow(promotion).to receive_message_chain(:rules, :for).and_return(promotion.promotion_rules)
+          allow(promotion).to receive_message_chain(:rules, :none?).and_return(false)
         end
         it "returns nil" do
           expect(promotion.eligible_rules(promotable)).to be_nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2017-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -1402,7 +1402,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.