solidus_frontend 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34b397ccff6674c985a10c902763205736142b68
-  data.tar.gz: 92c84ff71a8d92b971d5a6eb6acac0fa5f215b85
+  metadata.gz: 63bfa9f673c5ba3f399dd3c643b1f231651b5533
+  data.tar.gz: 1d781adb44a73c8e505285962a4a4cd8065ecd73
 SHA512:
-  metadata.gz: 2dbac571f495276e846a49122816b81890f4de1a5040a8d8695e3458e4df0c8f00aa4b7b60e72dd59bee4a8ac53cd953f8a94f6045d7cce619c8994439376ad3
-  data.tar.gz: 664e2909ea113f18a748eec216ac86b7a1fffacdeb9557f60c1f026a751ac994b9c8ae9b287ed5a820c45e234c8b43a49ab8d0dbc22d8e7b57af622a0e27ab43
+  metadata.gz: c5772895992c212862e2c0880a9be288c2340f778a0bd8228b3c3401e7a0d9e514d945e76d1b56fa7ad1a5999a858e3e6c76dfcd31b4144ef9e5d5c639f93d02
+  data.tar.gz: 56b83d75ec28b5aff1f644b08b05fabf31682339617dd04263713c2d405b8c86b4a97f2f6c60fead48f1fd743c501daa9fa59015864a71b8ca2c25b2abe4df95

data/lib/spree/frontend.rb

@@ -2,6 +2,8 @@ require 'rails/all'
 require 'jquery-rails'
 require 'canonical-rails'
 require 'deface'
+require 'coffee-rails'
+require 'sass-rails'
 
 require 'spree/core'
 

data/solidus_frontend.gemspec

@@ -23,6 +23,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'canonical-rails', '~> 0.0.4'
   s.add_dependency 'jquery-rails'
+  s.add_dependency 'sass-rails'
+  s.add_dependency 'coffee-rails'
 
   s.add_development_dependency 'capybara-accessible'
 end

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -81,11 +81,10 @@ 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_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
           order.update_column(:state, "confirm")

data/spec/features/checkout_spec.rb

@@ -78,9 +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(:available_payment_methods => [ create(:credit_card_payment_method) ])
 
       user = create(:user)
       order.user = user
@@ -181,7 +181,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
       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.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-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.1.3
+        version: 1.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sass-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: coffee-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara-accessible
   requirement: !ruby/object:Gem::Requirement
@@ -555,9 +583,8 @@ 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.
 test_files: []
-has_rdoc: