spree_frontend 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c2726ba953462dbebf7c70c869580de5a96879f
-  data.tar.gz: f28a27713a8c167f963c756e7e4c8d0375db69fd
+  metadata.gz: ab6fd9ba5a3ee4ac1adb39f1ce3081641a02bdda
+  data.tar.gz: 190246b10697093f670baa1b64099627491fc94d
 SHA512:
-  metadata.gz: 54c94e913751391e890acf45393efa77e0e79c7383d24ac8f35a86997e18041de6462c25f02a7a16b8f8cf8772b47db8ea0e6645ee5072ecc567cd2a89bb61f4
-  data.tar.gz: 4ccde10171e0ff16a67b5efb6ae228ddf7a36f7da98c9d6b5d8cb24f5c161d96ddf7ca37dc97e57b240483af4c1a215565166f1bf09d567c8d70a3784eb663be
+  metadata.gz: dfba6480530d5c5ac068eec202f1365e496bd62e88081a23efb686654292cf53e2229e51315cf0d4ea17909bd5b6798158feee0e8a741a35e837722bdc9b1808
+  data.tar.gz: 55f46306346f04b7ae1e4237afa5afaadcdbf1b69e7686ee08e3c67b6c8027cf205ce67c772c139d6a7fa11154f9a3121a4de6bedb75553a389cbbf1511f7490

data/app/controllers/spree/checkout_controller.rb

@@ -156,13 +156,6 @@ module Spree
         @differentiator.missing.each do |variant, quantity|
           @order.contents.remove(variant, quantity)
         end
-
-        # @order.contents.remove did transitively call reload in the past.
-        # Hiding the fact that the machine advanced already to "payment" state.
-        #
-        # As an intermediary step to optimize reloads out of high volume code path
-        # the reload was lifted here and will be removed by later passes.
-        @order.reload
       end
 
       if try_spree_current_user && try_spree_current_user.respond_to?(:payment_sources)

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -430,4 +430,26 @@ describe Spree::CheckoutController, type: :controller do
     expect { spree_post :update, state: "payment" }.
       to change { order.reload.line_items.length }
   end
+
+  context 'in the payment step' do
+    let(:order) { OrderWalkthrough.up_to(:payment) }
+    let(:payment_method_id) { Spree::PaymentMethod.first.id }
+
+    before do
+      expect(order.state).to eq 'payment'
+      allow(order).to receive_messages user: user
+      allow(order).to receive_messages confirmation_required?: true
+    end
+
+    it 'does not advance the order extra even when called twice' do
+      spree_put :update, state: 'payment',
+                         order: { payments_attributes: [{ payment_method_id: payment_method_id }] }
+      order.reload
+      expect(order.state).to eq 'confirm'
+      spree_put :update, state: 'payment',
+                         order: { payments_attributes: [{ payment_method_id: payment_method_id }] }
+      order.reload
+      expect(order.state).to eq 'confirm'
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -47,6 +47,9 @@ require 'spree/testing_support/caching'
 
 require 'paperclip/matchers'
 
+require 'capybara-screenshot/rspec'
+Capybara.save_and_open_page_path = ENV['CIRCLE_ARTIFACTS'] if ENV['CIRCLE_ARTIFACTS']
+
 if ENV['WEBDRIVER'] == 'accessible'
   require 'capybara/accessible'
   Capybara.javascript_driver = :accessible

data/spec/support/rspec_rails_4_2_5_1.rb

@@ -0,0 +1,7 @@
+# Fix for rspec-rails and rails 4.2.5.1
+# # This can be removed as soon as doing so doesn't cause test errors.
+# # See https://github.com/rspec/rspec-rails/issues/1532
+
+RSpec::Rails::ViewRendering::EmptyTemplatePathSetDecorator.class_eval do
+  alias_method :find_all_anywhere, :find_all
+end

data/spree_frontend.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'bootstrap-sass',  '~> 3.3.1'
   s.add_dependency 'canonical-rails', '~> 0.0.4'
   s.add_dependency 'jquery-rails',    '~> 4.0.3'
-  s.add_dependency 'sprockets-rails', '~> 2.2'
 
   s.add_development_dependency 'capybara-accessible'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 3.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 3.0.5
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 3.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 3.0.5
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.3
-- !ruby/object:Gem::Dependency
-  name: sprockets-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: capybara-accessible
   requirement: !ruby/object:Gem::Requirement
@@ -515,6 +501,7 @@ files:
 - spec/helpers/order_helper_spec.rb
 - spec/helpers/taxons_helper_spec.rb
 - spec/spec_helper.rb
+- spec/support/rspec_rails_4_2_5_1.rb
 - spec/support/shared_contexts/checkout_setup.rb
 - spec/support/shared_contexts/custom_products.rb
 - spec/support/shared_contexts/product_prototypes.rb
@@ -591,7 +578,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Frontend e-commerce functionality for the Spree project.
@@ -629,7 +616,9 @@ test_files:
 - spec/helpers/order_helper_spec.rb
 - spec/helpers/taxons_helper_spec.rb
 - spec/spec_helper.rb
+- spec/support/rspec_rails_4_2_5_1.rb
 - spec/support/shared_contexts/checkout_setup.rb
 - spec/support/shared_contexts/custom_products.rb
 - spec/support/shared_contexts/product_prototypes.rb
 - spec/views/spree/checkout/_summary_spec.rb
+has_rdoc: