spree_frontend 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28b43e53de5b7242b077f72115ae7c95c169a01b
-  data.tar.gz: 956b54568f09eb563564df2e77f1db0ef00b763d
+  metadata.gz: 56c38cf8ac7763562f329b9adc3fc02a6447bfc7
+  data.tar.gz: bb96d44f57de9e6aa5f5332a8890eb7c1c9c19cd
 SHA512:
-  metadata.gz: 5a39e7d2b31e5c664e70ea8d06839d851238ab9bfddb3f40ec9adcb7529f595e701b76e2a487223e591aaeda443feef72b4156acf9b05987b3c2ecd79db71cb2
-  data.tar.gz: 094be18bbca59c0ef858ea25af82722a26f61ca2699af172c4298b0f404eb9a05137822e1822d14d9dca0da5716316fa9eb78d914c4b055b4deec66bddf11a45
+  metadata.gz: 75d2017697863f14073f5f1a355caa6045eb96658191470e166772c9fb759eaf58606d9eb5c3280ec44bd5cb6be07dc81794a03170bc4955154dc7f84bea159e
+  data.tar.gz: 9fdea3dfa42e6715cbb26ad22c3260f0651470ca3eeaeac8a9c2f5625a46188c0df5d4e1d48064a8c11b9ed88da9978a015b5df187cf28a918fd12043af761de

data/app/controllers/spree/checkout_controller.rb

@@ -5,8 +5,8 @@ module Spree
   # is waranted.
   class CheckoutController < Spree::StoreController
     before_action :load_order_with_lock
-    before_filter :ensure_valid_state_lock_version, only: [:update]
-    before_filter :set_state_if_present
+    before_action :ensure_valid_state_lock_version, only: [:update]
+    before_action :set_state_if_present
 
     before_action :ensure_order_not_completed
     before_action :ensure_checkout_allowed
@@ -154,6 +154,13 @@ 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/app/controllers/spree/products_controller.rb

@@ -18,9 +18,11 @@ module Spree
       @variants = @product.variants_including_master.active(current_currency).includes([:option_values, :images])
       @product_properties = @product.product_properties.includes(:property)
       @taxon = Spree::Taxon.find(params[:taxon_id]) if params[:taxon_id]
+      redirect_if_legacy_path
     end
 
     private
+
       def accurate_title
         if @product
           @product.meta_title.blank? ? @product.name : @product.meta_title
@@ -41,5 +43,14 @@ module Spree
       def load_taxon
         @taxon = Spree::Taxon.find(params[:taxon]) if params[:taxon].present?
       end
+
+      def redirect_if_legacy_path
+        # If an old id or a numeric id was used to find the record,
+        # we should do a 301 redirect that uses the current friendly id.
+        if params[:id] != @product.friendly_id
+          params.merge!(id: @product.friendly_id)
+          return redirect_to url_for(params), status: :moved_permanently
+        end
+      end
   end
 end

data/app/views/spree/products/show.html.erb

@@ -1,6 +1,6 @@
 <% @body_id = 'product-details' %>
 
-<% cache [I18n.locale, current_currency, @product] do %>
+<% cache [I18n.locale, current_currency, @product, @product.possible_promotions] do %>
   <div data-hook="product_show" itemscope itemtype="https://schema.org/Product">
     <div class="col-md-4" data-hook="product_left_part">
       <div data-hook="product_left_part_wrap">

data/app/views/spree/shared/_google_analytics.js.erb

@@ -5,7 +5,12 @@
     m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
     })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
-    ga('create', '<%= tracker.analytics_id %>', 'auto');
+    <% if user_analytics_id = try_spree_current_user.try(:analytics_id) %>
+      ga('create', { 'trackingId': '<%= tracker.analytics_id %>', 'cookieDomain': 'auto', 'userId': '<%= user_analytics_id %>' });
+    <% else %>
+      ga('create', '<%= tracker.analytics_id %>', 'auto');
+    <% end %>
+
     ga('require', 'displayfeatures');
     <%= yield :google_analytics %>
     ga('send', 'pageview');

data/app/views/spree/shared/_order_details.html.erb

@@ -92,9 +92,9 @@
   </tfoot>
 
   <% if order.line_item_adjustments.exists? %>
-    <% if order.all_adjustments.promotion.eligible.exists? %>
+    <% if order.line_item_adjustments.promotion.eligible.exists? %>
       <tfoot id="price-adjustments" data-hook="order_details_price_adjustments">
-        <% order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
+        <% order.line_item_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
          <tr class="total">
            <td colspan="4"><%= Spree.t(:promotion) %>: <strong><%= label %></strong></td>
            <td class="total"><span><%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency) %></span></td>

data/app/views/spree/shared/_taxonomies.html.erb

@@ -2,7 +2,7 @@
 
 <nav id="taxonomies" class="sidebar-item" data-hook>
   <% @taxonomies.each do |taxonomy| %>
-    <% cache [I18n.locale, taxonomy, max_level] do %>
+    <% cache [I18n.locale, taxonomy, max_level, @taxon] do %>
       <h4 class='taxonomy-root'><%= Spree.t(:shop_by_taxonomy, :taxonomy => taxonomy.name) %></h4>
       <%= taxons_tree(taxonomy.root, @taxon, max_level) %>
     <% end %>

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -327,14 +327,14 @@ describe Spree::CheckoutController, :type => :controller do
 
       context "when the order is invalid" do
         before do
-          allow(order).to receive_messages :update_attributes => true, :next => nil
-          order.errors.add :base, 'Base error'
-          order.errors.add :adjustments, 'error'
+          allow(order).to receive_messages(update_from_params: true, next: nil)
+          order.errors.add(:base, 'Base error')
+          order.errors.add(:adjustments, 'error')
         end
 
         it "due to the order having errors" do
           spree_put :update, state: order.state, :order => {}
-          expect(flash[:error]).to eq("Base error\nAdjustments error")
+          expect(flash[:error]).to eql("Base error\nAdjustments error")
           expect(response).to redirect_to(spree.checkout_state_path('address'))
         end
       end
@@ -420,6 +420,6 @@ describe Spree::CheckoutController, :type => :controller do
 
     expect {
       spree_post :update, { :state => "payment" }
-    }.to change { order.line_items }
+    }.to change { order.reload.line_items.length }
   end
 end

data/spec/controllers/spree/checkout_controller_with_views_spec.rb

@@ -22,7 +22,7 @@ describe Spree::CheckoutController, type: :controller do
       before do
         # Using a let block won't acknowledge the currency setting
         # Therefore we just do it like this...
-        order = OrderWalkthrough.up_to(:address)
+        order = OrderWalkthrough.up_to(:delivery)
         allow(controller).to receive_messages current_order: order
       end
 

data/spec/controllers/spree/orders_controller_spec.rb

@@ -34,7 +34,7 @@ describe Spree::OrdersController, :type => :controller do
         end
 
         it "shows an error when population fails" do
-          request.env["HTTP_REFERER"] = spree.root_path
+          request.env["HTTP_REFERER"] = '/dummy_redirect'
           allow_any_instance_of(Spree::LineItem).to(
             receive(:valid?).and_return(false)
           )
@@ -45,19 +45,19 @@ describe Spree::OrdersController, :type => :controller do
 
           spree_post :populate, variant_id: variant.id, quantity: 5
 
-          expect(response).to redirect_to(spree.root_path)
+          expect(response).to redirect_to('/dummy_redirect')
           expect(flash[:error]).to eq("Order population failed")
         end
 
         it "shows an error when quantity is invalid" do
-          request.env["HTTP_REFERER"] = spree.root_path
+          request.env["HTTP_REFERER"] = '/dummy_redirect'
 
           spree_post(
             :populate,
             variant_id: variant.id, quantity: -1
           )
 
-          expect(response).to redirect_to(spree.root_path)
+          expect(response).to redirect_to('/dummy_redirect')
           expect(flash[:error]).to eq(
             Spree.t(:please_enter_reasonable_quantity)
           )

data/spec/controllers/spree/products_controller_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe Spree::ProductsController, :type => :controller do
   let!(:product) { create(:product, :available_on => 1.year.from_now) }
+  let(:taxon) { create(:taxon) }
 
   # Regression test for #1390
   it "allows admins to view non-active products" do
@@ -33,4 +34,34 @@ describe Spree::ProductsController, :type => :controller do
     expect { spree_get :show, :id => product.to_param }.not_to raise_error
   end
 
+  context 'with history slugs present' do
+    let!(:product) { create(:product, available_on: 1.day.ago) }
+
+    it 'will redirect with a 301 with legacy url used' do
+      legacy_params = product.to_param
+      product.name = product.name + " Brand New"
+      product.slug = nil
+      product.save!
+      spree_get :show, id: legacy_params
+      expect(response.status).to eq(301)
+    end
+
+    it 'will redirect with a 301 with id used' do
+      product.name = product.name + " Brand New"
+      product.slug = nil
+      product.save!
+      spree_get :show, id: product.id
+      expect(response.status).to eq(301)
+    end
+
+    it "will keep url params on legacy url redirect" do
+      legacy_params = product.to_param
+      product.name = product.name + " Brand New"
+      product.slug = nil
+      product.save!
+      spree_get :show, id: legacy_params, taxon_id: taxon.id
+      expect(response.status).to eq(301)
+      expect(response.header["Location"]).to include("taxon_id=#{taxon.id}")
+    end
+  end
 end

data/spec/features/cart_spec.rb

@@ -34,8 +34,9 @@ describe "Cart", type: :feature, inaccessible: true do
     visit spree.root_path
     click_link "RoR Mug"
     click_button "add-to-cart-button"
+    line_item = Spree::LineItem.first!
     within("#line_items") do
-      click_link "delete_line_item_1"
+      click_link "delete_line_item_#{line_item.id}"
     end
 
     expect(page).to_not have_content("Line items quantity must be an integer")
@@ -77,6 +78,7 @@ describe "Cart", type: :feature, inaccessible: true do
       expect(page).to have_content(product.name)
     end
   end
+
   it "should have a surrounding element with data-hook='cart_container'" do
     visit spree.cart_path
     expect(page).to have_selector("div[data-hook='cart_container']")

data/spec/features/checkout_spec.rb

@@ -96,7 +96,7 @@ describe "Checkout", type: :feature, inaccessible: true, js: true do
   # Regression test for #2694 and #4117
   context "doesn't allow bad credit card numbers" do
     before(:each) do
-      order = OrderWalkthrough.up_to(:delivery)
+      order = OrderWalkthrough.up_to(:payment)
       allow(order).to receive_messages confirmation_required?: true
       allow(order).to receive_messages(:available_payment_methods => [ create(:credit_card_payment_method) ])
 
@@ -109,7 +109,7 @@ describe "Checkout", type: :feature, inaccessible: true, js: true do
     end
 
     it "redirects to payment page", inaccessible: true, js: true do
-      visit spree.checkout_state_path(:delivery)
+      visit spree.checkout_state_path(:payment)
       click_button "Save and Continue"
       choose "Credit Card"
       fill_in "Card Number", with: '123'
@@ -149,7 +149,7 @@ describe "Checkout", type: :feature, inaccessible: true, js: true do
     let!(:user) { create(:user) }
 
     let!(:order) do
-      order = OrderWalkthrough.up_to(:delivery)
+      order = OrderWalkthrough.up_to(:payment)
       allow(order).to receive_messages confirmation_required?: true
 
       order.reload
@@ -198,7 +198,7 @@ describe "Checkout", type: :feature, inaccessible: true, js: true do
 
     before do
       Capybara.ignore_hidden_elements = false
-      order = OrderWalkthrough.up_to(:delivery)
+      order = OrderWalkthrough.up_to(:payment)
       allow(order).to receive_messages(available_payment_methods: [check_payment,credit_cart_payment])
       order.user = create(:user)
       order.update!
@@ -231,7 +231,7 @@ describe "Checkout", type: :feature, inaccessible: true, js: true do
     end
 
     before do
-      order = OrderWalkthrough.up_to(:delivery)
+      order = OrderWalkthrough.up_to(:payment)
       allow(order).to receive_messages(available_payment_methods: [bogus])
 
       allow_any_instance_of(Spree::CheckoutController).to receive_messages(current_order: order)
@@ -473,15 +473,14 @@ describe "Checkout", type: :feature, inaccessible: true, js: true do
 
   context "when order is completed" do
     let!(:user) { create(:user) }
-    let!(:order) { OrderWalkthrough.up_to(:delivery) }
+    let!(:order) { OrderWalkthrough.up_to(:payment) }
 
     before(:each) do
       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)
       allow_any_instance_of(Spree::OrdersController).to receive_messages(try_spree_current_user: user)
 
-      visit spree.checkout_state_path(:delivery)
-      click_button "Save and Continue"
+      visit spree.checkout_state_path(:payment)
       click_button "Save and Continue"
     end
 

data/spec/features/checkout_unshippable_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "checkout with unshippable items", type: :feature, inaccessible: true do
   let!(:stock_location) { create(:stock_location) }
-  let(:order) { OrderWalkthrough.up_to(:address) }
+  let(:order) { OrderWalkthrough.up_to(:delivery) }
 
   before do
     OrderWalkthrough.add_line_item!(order)

data/spec/spec_helper.rb

@@ -74,6 +74,13 @@ RSpec.configure do |config|
     end
   end
 
+  # Ensure DB is clean, so that transaction isolated specs see
+  # pristine state.
+  config.before(:suite) do
+    DatabaseCleaner.strategy = :truncation
+    DatabaseCleaner.clean
+  end
+
   config.before(:each) do
     WebMock.disable!
     if RSpec.current_example.metadata[:js]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-07-20 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.1
+        version: 3.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement