solidus_frontend 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5dc8e6150945aea0c6c0d848c0cd10028ef8cbd
-  data.tar.gz: 90ceb2f21ca40a2a96e5aff6ad405d8db3455cca
+  metadata.gz: d69d090e995c26e97c4b9eed6a36205ba4c8721e
+  data.tar.gz: 51856049c68819c9f9a2dfc1fdcccb569e037c02
 SHA512:
-  metadata.gz: be628e3c44335cc8b4cd6c5c06f37ca03188d5d2d9bf89a73f3025aeed05b3e1160dd7ba0935c50b3b758dce8c745c428b0e17c509c1136fe768b61b6c68c42f
-  data.tar.gz: 4394fffa2e998a84b07de3023ae75584b06fd0f11a04d84c3b53c10b4899ac22d92d999683b374949d279dabab3a4b1252ccc2d4033fb12fdf18c62ca924c53e
+  metadata.gz: 525ef3dfd169cd8b2df4ac37387658dce47392811e89afe4e1ae0fe677bc1d5a313de1d5ddb9bffcb2015bb885d2948ac46b113055632c91eb25fb2bc5501d94
+  data.tar.gz: 13dea3731b3f1d2a754aa0b70964f8ff1293753fc23bce330e779b221d3605e243a96bb35e0af8d05d345fb4cd96bd9d8799db7897159440e50a5690c5d3bce6

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -81,11 +81,10 @@ describe Spree::CheckoutController, :type => :controller do
         }
       end
 
+      let!(:payment_method) { create(:credit_card_payment_method) }
       before do
         # Must have *a* shipping method and a payment method so updating from address works
-        allow(order).to receive_messages :available_shipping_methods => [stub_model(Spree::ShippingMethod)]
-        allow(order).to receive_messages :available_payment_methods => [stub_model(Spree::PaymentMethod)]
-        allow(order).to receive_messages :ensure_available_shipping_rates => true
+        allow(order).to receive_messages ensure_available_shipping_rates: true
         order.line_items << FactoryGirl.create(:line_item)
       end
 
@@ -170,6 +169,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
+            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!(display_on: "back_end") }
+
+          it 'sets the payment amount' do
+            expect {
+              post :update, 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
           allow(order).to receive_messages :confirmation_required? => true

data/spec/features/checkout_spec.rb

@@ -78,10 +78,9 @@ describe "Checkout", type: :feature, inaccessible: true do
 
   # Regression test for #2694 and #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 :confirmation_required? => true
-      allow(order).to receive_messages(:available_payment_methods => [ create(:credit_card_payment_method, :environment => 'test') ])
 
       user = create(:user)
       order.user = user
@@ -183,7 +182,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
@@ -192,7 +192,6 @@ describe "Checkout", type: :feature, inaccessible: true do
 
     before do
       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: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-23 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: 1.0.6
+        version: 1.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.0.7
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.0.7
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement
@@ -585,7 +585,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: solidus_frontend
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Cart and storefront for the Solidus e-commerce project.