solidus_frontend 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02bdf3918a386c777f45234218b8759a5b5ef51f
-  data.tar.gz: 182b9221127e63529ef431a6feec7484e1b847b9
+  metadata.gz: f80a15237e018ec72f6f3c37732bf4b48791274f
+  data.tar.gz: '05953613a4aae475826ac05522df13be3a0215e6'
 SHA512:
-  metadata.gz: 54c857e8eb52290c27be43c916364cf017f900a605775de14578170e7063c947ecdea34ab2b67691673148c415283217dfcad0b9ac83077cc38f0e786e448e65
-  data.tar.gz: e8ef9376b490fa6e2a78d8e1cb00583bcc1fef56eac1e1bffb0223782058a17293bcc4fb2d9829a97ae9b18c140a44b33db8f996f031f736abc4e39c1c1c331d
+  metadata.gz: 78f0d29ec7da1e242f51b99252446fd8ba8fd413ba5b6e3f7a0bfa9fbc4c4b87fb7d0c3d22519bf025313b55ac23509242ce8383aa3d71a81406f03a8142a965
+  data.tar.gz: 3cb69bb1575f3419018b6fff0cb0ce05622e2a10c79891a02d694432835257633ddab5b19fbbb5e5280b61bcc7eba166e419bf5ece5427fe6ea640ad00eee4c7

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
@@ -218,6 +218,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

@@ -77,9 +77,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
@@ -180,7 +180,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
@@ -190,7 +191,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.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-09 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.2.1
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement