solidus_frontend 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f42a2df9f2600255c56ee5a7f7b34757d604901
-  data.tar.gz: d45b5f07187488bbdefa4a819f8698d6bcee1f20
+  metadata.gz: 6fe4d98a9100810f94d3ef202311ca78e7d51ecb
+  data.tar.gz: 5ac0027c5f85f9a5e77ba18433eaa42dfc20f6bd
 SHA512:
-  metadata.gz: f0c52fb11afbf64e56ea579a94311f5df441c67e16e5fa4dfffae754236fe4c949728ff785d9816e1ab68375c82793fc4babaa27554289f7bbbc73838ed4e57d
-  data.tar.gz: bf6d46435322ca24b946133239f803af11f1f4fecc8b677573d113fdc5b2d3a4bf06df7386cb74279880cc68ee59291be95c604136ab031a598624b404865cae
+  metadata.gz: 0f7527ad71b706b7c015795fa5db7a9395d92f142cbcf88c2cf08b88a36737c909eae97781e4a2590840e4c4f7a0ed266a85a37946d8dd7d61f59a0dc8724794
+  data.tar.gz: e182d2a694c2032c10a969706d424e33265c38f1aa50161f6f5792824dba3486b2e66ee225a3cea775a49ed4d94010ffc38b9ac789594bc2cbf71ef76198f98b

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -81,9 +81,9 @@ describe Spree::CheckoutController, type: :controller do
         }
       end
 
+      let!(:payment_method) { create(:payment_method) }
       before do
         # Must have *a* shipping method and a payment method so updating from address works
-        allow(order).to receive_messages available_payment_methods: [stub_model(Spree::PaymentMethod)]
         allow(order).to receive_messages ensure_available_shipping_rates: true
         order.line_items << FactoryGirl.create(:line_item)
       end
@@ -225,6 +225,53 @@ describe Spree::CheckoutController, type: :controller do
         end
       end
 
+      context "when in the payment state" do
+        let(:order) { create(:order_with_line_items) }
+        let(:payment_method) { create(:credit_card_payment_method) }
+
+        let(:params) do
+          {
+            state: 'payment',
+            order: {
+              payments_attributes: [
+                {
+                  payment_method_id: payment_method.id.to_s,
+                  source_attributes: attributes_for(:credit_card)
+                }
+              ]
+            }
+          }
+        end
+
+        before do
+          order.update_attributes! user: user
+          3.times { order.next! } # should put us in the payment state
+        end
+
+        context 'with a permitted payment method' do
+          it 'sets the payment amount' do
+            post :update, params: params
+            order.reload
+            expect(order.state).to eq('confirm')
+            expect(order.payments.size).to eq(1)
+            expect(order.payments.first.amount).to eq(order.total)
+          end
+        end
+
+        context 'with an unpermitted payment method' do
+          before { payment_method.update!(available_to_users: false) }
+
+          it 'sets the payment amount' do
+            expect {
+              post :update, params: params
+            }.to raise_error(ActiveRecord::RecordNotFound)
+
+            expect(order.state).to eq('payment')
+            expect(order.payments).to be_empty
+          end
+        end
+      end
+
       context "when in the confirm state" do
         before do
           order.update_attributes! user: user

data/spec/features/checkout_spec.rb

@@ -211,9 +211,9 @@ describe "Checkout", type: :feature, inaccessible: true do
 
   # Regression test for https://github.com/spree/spree/issues/2694 and https://github.com/spree/spree/issues/4117
   context "doesn't allow bad credit card numbers" do
+    let!(:payment_method) { create(:credit_card_payment_method) }
     before(:each) do
       order = OrderWalkthrough.up_to(:delivery)
-      allow(order).to receive_messages(available_payment_methods: [create(:credit_card_payment_method)])
 
       user = create(:user)
       order.user = user
@@ -314,7 +314,8 @@ describe "Checkout", type: :feature, inaccessible: true do
   end
 
   context "user has payment sources", js: true do
-    let(:bogus) { create(:credit_card_payment_method) }
+    before { Spree::PaymentMethod.all.each(&:really_destroy!) }
+    let!(:bogus) { create(:credit_card_payment_method) }
     let(:user) { create(:user) }
 
     let!(:credit_card) do
@@ -324,7 +325,6 @@ describe "Checkout", type: :feature, inaccessible: true do
     before do
       user.wallet.add(credit_card)
       order = OrderWalkthrough.up_to(:delivery)
-      allow(order).to receive_messages(available_payment_methods: [bogus])
 
       allow_any_instance_of(Spree::CheckoutController).to receive_messages(current_order: order)
       allow_any_instance_of(Spree::CheckoutController).to receive_messages(try_spree_current_user: user)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_frontend
 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: solidus_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.4.1
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.4.1
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement