solidus_frontend 1.3.2 → 1.4.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec0a60cd964cb481ad0404e8c0a18c1469c997dc
-  data.tar.gz: 366cef2fc5b46bf08d246a2c0aad1fbfdbab0c42
+  metadata.gz: 111fd307fe43d1f1a14dbb8b4fed5f1213f01042
+  data.tar.gz: 8764df5f034dc79a7d17c6280e341289a470a602
 SHA512:
-  metadata.gz: f5a0bcc818038753a5715a8d196ba1b4a4555d8314c111b454bc13fa82a30dbd7ccd9ee9b2dc76b6c905ed94f4b11f454745734f2d64e1882f251834b88f0ce7
-  data.tar.gz: e4c70d0029b2f0b740d35b9635c539ba6ace1164d4326edd989c34ae2de5fa03041eab83d61eb287031b42bf0639b27d354b9b9db14b1be5fe40b67f9fc301e0
+  metadata.gz: a0598c73595c2e08fc1ff92f7916f2cb4c4e54adbb534536367b42b0ceb14e1db3781918a29a45b437c74ec1dcc82ae66962bf1fc5881c8dbf676380ff98a55f
+  data.tar.gz: 64841adb0db0a35c7dbb8e868472da68c153ccc7d3c2d3cdfc9aede5f35be91a939ef330fb4c0f9b6cc1f7746ecf0e7200c6617e533a5d23e1bccd019f99c6af

data/README.md

@@ -1,11 +1,9 @@
-Core
-====
+# solidus\_frontend
 
-Core e-commerce functionality for the Spree project
+Frontend contains controllers and views implementing a storefront and cart for Solidus.
 
 
-Testing
--------
+## Testing
 
 Create the test site
 
@@ -14,8 +12,3 @@ Create the test site
 Run the tests
 
     bundle exec rake spec
-
-Run the coverage. After the rake task open coverage/index.html
-
-    bundle exec rake rcov
-

data/app/assets/javascripts/spree/frontend/checkout/coupon-code.js.coffee

@@ -0,0 +1,34 @@
+Spree.onCouponCodeApply = (e) ->
+  couponCodeField = $('#order_coupon_code')
+  couponCode = $.trim(couponCodeField.val())
+  return if couponCode == ''
+
+  couponStatus = $("#coupon_status")
+  successClass = 'success'
+  errorClass = 'alert'
+  url = Spree.url(Spree.routes.apply_coupon_code(Spree.current_order_id),
+    {
+      order_token: Spree.current_order_token,
+      coupon_code: couponCode
+    }
+  )
+
+  couponStatus.removeClass([successClass,errorClass].join(" "));
+
+  req = Spree.ajax
+    method: "PUT",
+    url: url
+
+  req.done (data) ->
+    window.location.reload();
+    couponCodeField.val('')
+    couponStatus.addClass(successClass).html("Coupon code applied successfully.")
+
+  req.fail (xhr) ->
+    # handler = JSON.parse(xhr.responseText)
+    handler = xhr.responseJSON
+    couponStatus.addClass(errorClass).html(handler["error"])
+
+Spree.ready ($) ->
+  $('#coupon-code-apply-button').click (e) ->
+    Spree.onCouponCodeApply(e)

data/app/assets/javascripts/spree/frontend/checkout/payment.js.coffee

@@ -40,40 +40,4 @@ Spree.ready ($) ->
       # i.e. if user enters invalid data
       ($ 'input[type="radio"]:checked').click()
 
-      $('#checkout_form_payment').submit ->
-        # Coupon code application may take a number of seconds.
-        # Informing the user that this is happening is a good way to indicate some progress to them.
-        # In addition to this, if the coupon code FAILS then they don't lose their just-entered payment data.
-        coupon_code_field = $('#order_coupon_code')
-        coupon_code = $.trim(coupon_code_field.val())
-        if (coupon_code != '')
-          if $('#coupon_status').length == 0
-            coupon_status = $("<div id='coupon_status'></div>")
-            coupon_code_field.parent().append(coupon_status)
-          else
-            coupon_status = $("#coupon_status")
-
-          url = Spree.url(Spree.routes.apply_coupon_code(Spree.current_order_id),
-            {
-              order_token: Spree.current_order_token,
-              coupon_code: coupon_code
-            }
-          )
-
-          coupon_status.removeClass();
-          Spree.ajax({
-            async: false,
-            method: "PUT",
-            url: url,
-            success: (data) ->
-              coupon_code_field.val('')
-              coupon_status.addClass("success").html("Coupon code applied successfully.")
-              return true
-            error: (xhr) ->
-              handler = JSON.parse(xhr.responseText)
-              coupon_status.addClass("error").html(handler["error"])
-              $('.continue').attr('disabled', false)
-              return false
-          })
-
   Spree.onPayment()

data/app/assets/javascripts/spree/frontend/checkout.js.coffee

@@ -1,7 +1,8 @@
-//= require jquery.payment
-//= require_self
-//= require spree/frontend/checkout/address
-//= require spree/frontend/checkout/payment
+#= require jquery.payment
+#= require_self
+#= require spree/frontend/checkout/address
+#= require spree/frontend/checkout/payment
+#= require spree/frontend/checkout/coupon-code
 
 Spree.disableSaveOnClick = ->
   ($ 'form.edit_order').submit ->

data/app/assets/stylesheets/spree/frontend/screen.css.scss

@@ -920,7 +920,7 @@ p[data-hook="use_billing"] {
   &.success {
     color: $c_green;
   }
-  &.error {
+  &.error, &.alert {
     color: $c_red;
   }
 }

data/app/controllers/spree/checkout_controller.rb

@@ -4,9 +4,9 @@ module Spree
   # checkout which has nothing to do with updating an order that this approach
   # is warranted.
   class CheckoutController < Spree::StoreController
-    before_filter :load_order
-    around_filter :lock_order
-    before_filter :set_state_if_present
+    before_action :load_order
+    around_action :lock_order
+    before_action :set_state_if_present
 
     before_action :ensure_order_not_completed
     before_action :ensure_checkout_allowed

data/app/controllers/spree/orders_controller.rb

@@ -6,11 +6,11 @@ module Spree
 
     respond_to :html
 
-    before_filter :assign_order, only: :update
+    before_action :assign_order, only: :update
     # note: do not lock the #edit action because that's where we redirect when we fail to acquire a lock
-    around_filter :lock_order, only: :update
-    before_filter :apply_coupon_code, only: :update
-    skip_before_filter :verify_authenticity_token, only: [:populate]
+    around_action :lock_order, only: :update
+    before_action :apply_coupon_code, only: :update
+    skip_before_action :verify_authenticity_token, only: [:populate]
 
     def show
       @order = Order.find_by_number!(params[:id])
@@ -66,6 +66,11 @@ module Spree
       end
     end
 
+    def populate_redirect
+      flash[:error] = Spree.t(:populate_get_error)
+      redirect_to('/cart')
+    end
+
     def empty
       if @order = current_order
         @order.empty!

data/app/controllers/spree/products_controller.rb

@@ -15,7 +15,12 @@ module Spree
     end
 
     def show
-      @variants = @product.variants_including_master.with_prices(current_pricing_options).includes([:option_values, :images])
+      @variants = @product.
+        variants_including_master.
+        display_includes.
+        with_prices(current_pricing_options).
+        includes([:option_values, :images])
+
       @product_properties = @product.product_properties.includes(:property)
       @taxon = Spree::Taxon.find(params[:taxon_id]) if params[:taxon_id]
     end

data/app/controllers/spree/store_controller.rb

@@ -11,7 +11,7 @@ module Spree
 
     def cart_link
       render partial: 'spree/shared/link_to_cart'
-      fresh_when(simple_current_order)
+      fresh_when(simple_current_order, template: 'spree/shared/_link_to_cart')
     end
 
     private

data/app/views/spree/checkout/_payment.html.erb

@@ -59,7 +59,13 @@
     <p class='field' data-hook='coupon_code'>
       <%= form.label :coupon_code %><br />
       <%= form.text_field :coupon_code %>
+      <button type="button" class="button" id="coupon-code-apply-button">
+        <%= Spree.t(:apply_code) %>
+      </button>
+
     </p>
+    <div id='coupon_status'></div>
+
   </div>
 </fieldset>
 

data/app/views/spree/layouts/spree_application.html.erb

@@ -15,7 +15,7 @@
 
       <div id="wrapper" class="row" data-hook>
 
-        <%= breadcrumbs(@taxon) %>
+        <%= taxon_breadcrumbs(@taxon) %>
 
         <%= render :partial => 'spree/shared/sidebar' if content_for? :sidebar %>
 

data/config/routes.rb

@@ -1,4 +1,4 @@
-Spree::Core::Engine.add_routes do
+Spree::Core::Engine.routes.draw do
   root to: 'home#index'
 
   resources :products, only: [:index, :show]
@@ -10,12 +10,7 @@ Spree::Core::Engine.add_routes do
   get '/checkout/:state', to: 'checkout#edit', as: :checkout_state
   get '/checkout', to: 'checkout#edit', as: :checkout
 
-  populate_redirect = redirect do |_params, request|
-    request.flash[:error] = Spree.t(:populate_get_error)
-    request.referer || '/cart'
-  end
-
-  get '/orders/populate', to: populate_redirect
+  get '/orders/populate', to: 'orders#populate_redirect'
   get '/orders/:id/token/:token' => 'orders#show', :as => :token_order
 
   resources :orders, except: [:index, :new, :create, :destroy] do

data/solidus_frontend.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'solidus_api', s.version
   s.add_dependency 'solidus_core', s.version
 
-  s.add_dependency 'canonical-rails', '~> 0.0.4'
+  s.add_dependency 'canonical-rails', '~> 0.1.1'
   s.add_dependency 'jquery-rails'
   s.add_dependency 'sass-rails'
   s.add_dependency 'coffee-rails'

data/spec/controllers/controller_extension_spec.rb

@@ -49,7 +49,7 @@ describe Spree::CustomController, type: :controller do
 
         describe "GET" do
           it "has value success" do
-            spree_get :index
+            get :index
             expect(response).to be_success
             expect(response.body).to match(/success!!!/)
           end
@@ -66,7 +66,7 @@ describe Spree::CustomController, type: :controller do
 
         describe "GET" do
           it "has value success" do
-            spree_get :index
+            get :index
             expect(response).to be_success
             expect(response.body).to match(/success!!!/)
           end
@@ -83,7 +83,7 @@ describe Spree::CustomController, type: :controller do
 
         describe "GET" do
           it "has value success" do
-            spree_get :index
+            get :index
             expect(response).to be_redirect
           end
         end
@@ -100,7 +100,7 @@ describe Spree::CustomController, type: :controller do
 
         describe "POST" do
           it "has value success" do
-            spree_post :create
+            post :create
             expect(response).to be_success
             expect(response.body).to match(/success!/)
           end
@@ -116,7 +116,7 @@ describe Spree::CustomController, type: :controller do
 
         describe "POST" do
           it "should not effect the wrong controller" do
-            spree_get :index
+            get :index
             expect(response.body).to match(/neutral/)
           end
         end

data/spec/controllers/controller_helpers_spec.rb

@@ -18,7 +18,7 @@ describe Spree::ProductsController, type: :controller do
   # Regression test for https://github.com/spree/spree/issues/1184
   it "sets the default locale based off Spree::Frontend::Config[:locale]" do
     expect(I18n.locale).to eq(:en)
-    spree_get :index
+    get :index
     expect(I18n.locale).to eq(:de)
   end
 end

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -20,31 +20,31 @@ describe Spree::CheckoutController, type: :controller do
     it 'should check if the user is authorized for :edit' do
       expect(controller).to receive(:authorize!).with(:edit, order, token)
       request.cookie_jar.signed[:guest_token] = token
-      spree_get :edit, { state: 'address' }
+      get :edit, { state: 'address' }
     end
 
     it "should redirect to the cart path unless checkout_allowed?" do
       allow(order).to receive_messages checkout_allowed?: false
-      spree_get :edit, { state: "delivery" }
+      get :edit, { state: "delivery" }
       expect(response).to redirect_to(spree.cart_path)
     end
 
     it "should redirect to the cart path if current_order is nil" do
       allow(controller).to receive(:current_order).and_return(nil)
-      spree_get :edit, { state: "delivery" }
+      get :edit, { state: "delivery" }
       expect(response).to redirect_to(spree.cart_path)
     end
 
     it "should redirect to cart if order is completed" do
       allow(order).to receive_messages(completed?: true)
-      spree_get :edit, { state: "address" }
+      get :edit, { state: "address" }
       expect(response).to redirect_to(spree.cart_path)
     end
 
     # Regression test for https://github.com/spree/spree/issues/2280
     it "should redirect to current step trying to access a future step" do
       order.update_column(:state, "address")
-      spree_get :edit, { state: "delivery" }
+      get :edit, { state: "delivery" }
       expect(response).to redirect_to spree.checkout_state_path("address")
     end
 
@@ -58,7 +58,7 @@ describe Spree::CheckoutController, type: :controller do
       it "should associate the order with a user" do
         order.update_column :user_id, nil
         expect(order).to receive(:associate_user!).with(user)
-        spree_get :edit, {}, order_id: 1
+        get :edit, {}, order_id: 1
       end
     end
   end
@@ -67,12 +67,12 @@ describe Spree::CheckoutController, type: :controller do
     it 'should check if the user is authorized for :edit' do
       expect(controller).to receive(:authorize!).with(:edit, order, token)
       request.cookie_jar.signed[:guest_token] = token
-      spree_post :update, { state: 'address' }
+      post :update, { state: 'address' }
     end
 
     context "save successful" do
-      def spree_post_address
-        spree_post :update, {
+      def post_address
+        post :update, {
           state: "address",
           order: {
             bill_address_attributes: address_params,
@@ -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
@@ -95,24 +95,24 @@ describe Spree::CheckoutController, type: :controller do
         end
 
         it "should assign order" do
-          spree_post :update, { state: "address" }
+          post :update, { state: "address" }
           expect(assigns[:order]).not_to be_nil
         end
 
         it "should advance the state" do
-          spree_post_address
+          post_address
           expect(order.reload.state).to eq("delivery")
         end
 
         it "should redirect the next state" do
-          spree_post_address
+          post_address
           expect(response).to redirect_to spree.checkout_state_path("delivery")
         end
 
         context "current_user respond to save address method" do
           it "calls persist order address on user" do
             expect(user).to receive(:persist_order_address)
-            spree_post :update, {
+            post :update, {
               state: "address",
               order: {
                 bill_address_attributes: address_params,
@@ -125,7 +125,7 @@ describe Spree::CheckoutController, type: :controller do
 
         context "current_user doesnt respond to persist_order_address" do
           it "doesnt raise any error" do
-            spree_post :update, {
+            post :update, {
               state: "address",
               order: {
                 bill_address_attributes: address_params,
@@ -144,25 +144,27 @@ describe Spree::CheckoutController, type: :controller do
         end
 
         context "with a billing and shipping address" do
-          before do
-            @expected_bill_address_id = order.bill_address.id
-            @expected_ship_address_id = order.ship_address.id
-
-            spree_post :update, {
-                state: "address",
-                order: {
-                    bill_address_attributes: order.bill_address.attributes.except("created_at", "updated_at"),
-                    ship_address_attributes: order.ship_address.attributes.except("created_at", "updated_at"),
-                    use_billing: false
-                }
+          subject do
+            post :update, {
+              state: "address",
+              order: {
+                bill_address_attributes: order.bill_address.attributes.except("created_at", "updated_at").compact,
+                ship_address_attributes: order.ship_address.attributes.except("created_at", "updated_at").compact,
+                use_billing: false
+              }
             }
+          end
 
-            order.reload
+          it "doesn't change bill address" do
+            expect {
+              subject
+            }.not_to change { order.reload.ship_address.id }
           end
 
-          it "unchanged address data does not change Address instances" do
-            expect(order.bill_address.id).to eq(@expected_bill_address_id)
-            expect(order.ship_address.id).to eq(@expected_ship_address_id)
+          it "doesn't change ship address" do
+            expect {
+              subject
+            }.not_to change { order.reload.bill_address.id }
           end
         end
       end
@@ -208,7 +210,7 @@ describe Spree::CheckoutController, type: :controller do
         end
 
         it 'sets the payment amount' do
-          spree_post :update, params
+          post :update, params
           order.reload
           expect(order.state).to eq('new_step')
           expect(order.payments.size).to eq(1)
@@ -216,53 +218,6 @@ 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_attributes! user: user
@@ -276,17 +231,17 @@ describe Spree::CheckoutController, type: :controller do
 
         # This inadvertently is a regression test for https://github.com/spree/spree/issues/2694
         it "should redirect to the order view" do
-          spree_post :update, { state: "confirm" }
+          post :update, { state: "confirm" }
           expect(response).to redirect_to spree.order_path(order)
         end
 
         it "should populate the flash message" do
-          spree_post :update, { state: "confirm" }
+          post :update, { state: "confirm" }
           expect(flash.notice).to eq(Spree.t(:order_processed_successfully))
         end
 
         it "should remove completed order from current_order" do
-          spree_post :update, { state: "confirm" }, { order_id: "foofah" }
+          post :update, { state: "confirm" }, { order_id: "foofah" }
           expect(assigns(:current_order)).to be_nil
           expect(assigns(:order)).to eql controller.current_order
         end
@@ -300,16 +255,16 @@ describe Spree::CheckoutController, type: :controller do
       end
 
       it "should not assign order" do
-        spree_post :update, { state: "address", email: '' }
+        post :update, { state: "address", email: '' }
         expect(assigns[:order]).not_to be_nil
       end
 
       it "should not change the order state" do
-        spree_post :update, { state: 'address' }
+        post :update, { state: 'address' }
       end
 
       it "should render the edit template" do
-        spree_post :update, { state: 'address' }
+        post :update, { state: 'address' }
         expect(response).to render_template :edit
       end
     end
@@ -319,11 +274,11 @@ describe Spree::CheckoutController, type: :controller do
 
       it "should not change the state if order is completed" do
         expect(order).not_to receive(:update_attribute)
-        spree_post :update, { state: "confirm" }
+        post :update, { state: "confirm" }
       end
 
       it "should redirect to the cart_path" do
-        spree_post :update, { state: "confirm" }
+        post :update, { state: "confirm" }
         expect(response).to redirect_to spree.cart_path
       end
     end
@@ -332,7 +287,7 @@ describe Spree::CheckoutController, type: :controller do
       before do
         order.update_attributes! user: user
         allow(order).to receive(:next).and_raise(Spree::Core::GatewayError.new("Invalid something or other."))
-        spree_post :update, { state: "address" }
+        post :update, { state: "address" }
       end
 
       it "should render the edit template and display exception message" do
@@ -363,7 +318,7 @@ describe Spree::CheckoutController, type: :controller do
         end
 
         it "due to the order having errors" do
-          spree_put :update, state: order.state, order: {}
+          put :update, state: order.state, order: {}
           expect(flash[:error]).to eq("Base error\nAdjustments error")
           expect(response).to redirect_to(spree.checkout_state_path('address'))
         end
@@ -398,7 +353,7 @@ describe Spree::CheckoutController, type: :controller do
           expect(order.shipments.count).to eq(1)
           order.shipments.first.shipping_rates.delete_all
           order.update_attributes(state: 'confirm')
-          spree_put :update, state: order.state, order: {}
+          put :update, state: order.state, order: {}
           expect(flash[:error]).to eq(Spree.t(:items_cannot_be_shipped))
           expect(response).to redirect_to(spree.checkout_state_path('confirm'))
         end
@@ -426,7 +381,7 @@ describe Spree::CheckoutController, type: :controller do
 
       it "fails to transition from payment to complete" do
         allow_any_instance_of(Spree::Payment).to receive(:process!).and_raise(Spree::Core::GatewayError.new(Spree.t(:payment_processing_failed)))
-        spree_put :update, state: order.state, order: {}
+        put :update, state: order.state, order: {}
         expect(flash[:error]).to eq(Spree.t(:payment_processing_failed))
       end
     end
@@ -448,7 +403,7 @@ describe Spree::CheckoutController, type: :controller do
 
     context "and back orders are not allowed" do
       before do
-        spree_post :update, { state: "payment" }
+        post :update, { state: "payment" }
       end
 
       it "should redirect to cart" do
@@ -470,12 +425,12 @@ describe Spree::CheckoutController, type: :controller do
 
     it "doesn't set shipping address on the order" do
       expect(order).to_not receive(:ship_address=)
-      spree_post :update, state: order.state
+      post :update, state: order.state
     end
 
     it "doesn't remove unshippable items before payment" do
       expect {
-        spree_post :update, { state: "payment" }
+        post :update, { state: "payment" }
       }.to_not change { order.line_items }
     end
   end
@@ -485,7 +440,7 @@ describe Spree::CheckoutController, type: :controller do
     allow(controller).to receive_messages check_authorization: true
 
     expect {
-      spree_post :update, { state: "payment" }
-    }.to change { order.line_items }
+      post :update, { state: "payment" }
+    }.to change { order.line_items.to_a.size }.from(1).to(0)
   end
 end

data/spec/controllers/spree/checkout_controller_with_views_spec.rb

@@ -27,7 +27,7 @@ describe Spree::CheckoutController, type: :controller do
       end
 
       it "displays rate cost in correct currency" do
-        spree_get :edit
+        get :edit
         html = Nokogiri::HTML(response.body)
         expect(html.css('.rate-cost').text).to eq "£10.00"
       end

data/spec/controllers/spree/content_controller_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 describe Spree::ContentController, type: :controller do
   it "should display CVV page" do
-    spree_get :cvv
+    get :cvv
     expect(response.response_code).to eq(200)
   end
 end

data/spec/controllers/spree/current_order_tracking_spec.rb

@@ -6,7 +6,7 @@ describe 'current order tracking', type: :controller do
 
   controller(Spree::StoreController) do
     def index
-      render nothing: true
+      head :ok
     end
   end
 
@@ -24,7 +24,7 @@ describe 'current order tracking', type: :controller do
 
     it "doesn't create a new order out of the blue" do
       expect {
-        spree_get :index
+        get :index
       }.not_to change { Spree::Order.count }
     end
   end
@@ -38,7 +38,7 @@ describe Spree::OrdersController, type: :controller do
   describe Spree::OrdersController do
     it "doesn't create a new order out of the blue" do
       expect {
-        spree_get :edit
+        get :edit
       }.not_to change { Spree::Order.count }
     end
   end

data/spec/controllers/spree/home_controller_spec.rb

@@ -5,13 +5,13 @@ describe Spree::HomeController, type: :controller do
     user = mock_model(Spree.user_class, last_incomplete_spree_order: nil, spree_api_key: 'fake')
     allow(controller).to receive_messages try_spree_current_user: user
     expect_any_instance_of(Spree::Config.searcher_class).to receive(:current_user=).with(user)
-    spree_get :index
+    get :index
     expect(response.status).to eq(200)
   end
 
   context "layout" do
     it "renders default layout" do
-      spree_get :index
+      get :index
       expect(response).to render_template(layout: 'spree/layouts/spree_application')
     end
 
@@ -19,7 +19,7 @@ describe Spree::HomeController, type: :controller do
       before { Spree::Config.layout = 'layouts/application' }
 
       it "renders specified layout" do
-        spree_get :index
+        get :index
         expect(response).to render_template(layout: 'layouts/application')
       end
     end

data/spec/controllers/spree/orders_controller_ability_spec.rb

@@ -25,22 +25,22 @@ module Spree
       context '#populate' do
         it 'should check if user is authorized for :edit' do
           expect(controller).to receive(:authorize!).with(:edit, order, token)
-          spree_post :populate, token: token
+          post :populate, token: token
         end
         it "should check against the specified order" do
           expect(controller).to receive(:authorize!).with(:edit, specified_order, token)
-          spree_post :populate, id: specified_order.number, token: token
+          post :populate, id: specified_order.number, token: token
         end
       end
 
       context '#edit' do
         it 'should check if user is authorized for :edit' do
           expect(controller).to receive(:authorize!).with(:edit, order, token)
-          spree_get :edit, token: token
+          get :edit, token: token
         end
         it "should check against the specified order" do
           expect(controller).to receive(:authorize!).with(:edit, specified_order, token)
-          spree_get :edit, id: specified_order.number, token: token
+          get :edit, id: specified_order.number, token: token
         end
       end
 
@@ -48,30 +48,30 @@ module Spree
         it 'should check if user is authorized for :edit' do
           allow(order).to receive :update_attributes
           expect(controller).to receive(:authorize!).with(:edit, order, token)
-          spree_post :update, order: { email: "foo@bar.com" }, token: token
+          post :update, order: { email: "foo@bar.com" }, token: token
         end
         it "should check against the specified order" do
           allow(order).to receive :update_attributes
           expect(controller).to receive(:authorize!).with(:edit, specified_order, token)
-          spree_post :update, order: { email: "foo@bar.com" }, id: specified_order.number, token: token
+          post :update, order: { email: "foo@bar.com" }, id: specified_order.number, token: token
         end
       end
 
       context '#empty' do
         it 'should check if user is authorized for :edit' do
           expect(controller).to receive(:authorize!).with(:edit, order, token)
-          spree_post :empty, token: token
+          post :empty, token: token
         end
         it "should check against the specified order" do
           expect(controller).to receive(:authorize!).with(:edit, specified_order, token)
-          spree_post :empty, id: specified_order.number, token: token
+          post :empty, id: specified_order.number, token: token
         end
       end
 
       context "#show" do
         it "should check against the specified order" do
           expect(controller).to receive(:authorize!).with(:edit, specified_order, token)
-          spree_get :show, id: specified_order.number, token: token
+          get :show, id: specified_order.number, token: token
         end
       end
     end
@@ -83,19 +83,19 @@ module Spree
         context 'when token parameter present' do
           it 'always ooverride existing token when passing a new one' do
             cookies.signed[:guest_token] = "soo wrong"
-            spree_get :show, { id: 'R123', token: order.guest_token }
+            get :show, { id: 'R123', token: order.guest_token }
             expect(cookies.signed[:guest_token]).to eq(order.guest_token)
           end
 
           it 'should store as guest_token in session' do
-            spree_get :show, { id: 'R123', token: order.guest_token }
+            get :show, { id: 'R123', token: order.guest_token }
             expect(cookies.signed[:guest_token]).to eq(order.guest_token)
           end
         end
 
         context 'when no token present' do
           it 'should respond with 404' do
-            spree_get :show, { id: 'R123' }
+            get :show, { id: 'R123' }
             expect(response.code).to eq('404')
           end
         end

data/spec/controllers/spree/orders_controller_spec.rb

@@ -16,7 +16,7 @@ describe Spree::OrdersController, type: :controller do
 
     context "#populate" do
       it "should create a new order when none specified" do
-        spree_post :populate, {}, {}
+        post :populate, {}, {}
         expect(cookies.signed[:guest_token]).not_to be_blank
         expect(Spree::Order.find_by_guest_token(cookies.signed[:guest_token])).to be_persisted
       end
@@ -24,7 +24,7 @@ describe Spree::OrdersController, type: :controller do
       context "with Variant" do
         it "should handle population" do
           expect do
-            spree_post :populate, variant_id: variant.id, quantity: 5
+            post :populate, variant_id: variant.id, quantity: 5
           end.to change { user.orders.count }.by(1)
           order = user.orders.last
           expect(response).to redirect_to spree.cart_path
@@ -44,7 +44,7 @@ describe Spree::OrdersController, type: :controller do
               and_return(["Order population failed"])
           )
 
-          spree_post :populate, variant_id: variant.id, quantity: 5
+          post :populate, variant_id: variant.id, quantity: 5
 
           expect(response).to redirect_to(spree.root_path)
           expect(flash[:error]).to eq("Order population failed")
@@ -53,7 +53,7 @@ describe Spree::OrdersController, type: :controller do
         it "shows an error when quantity is invalid" do
           request.env["HTTP_REFERER"] = spree.root_path
 
-          spree_post(
+          post(
             :populate,
             variant_id: variant.id, quantity: -1
           )
@@ -76,13 +76,13 @@ describe Spree::OrdersController, type: :controller do
         it "should render the edit view (on failure)" do
           # email validation is only after address state
           order.update_column(:state, "delivery")
-          spree_put :update, { order: { email: "" } }, { order_id: order.id }
+          put :update, { order: { email: "" } }, { order_id: order.id }
           expect(response).to render_template :edit
         end
 
         it "should redirect to cart path (on success)" do
           allow(order).to receive(:update_attributes).and_return true
-          spree_put :update, {}, { order_id: 1 }
+          put :update, {}, { order_id: 1 }
           expect(response).to redirect_to(spree.cart_path)
         end
       end
@@ -96,7 +96,7 @@ describe Spree::OrdersController, type: :controller do
       it "should destroy line items in the current order" do
         allow(controller).to receive(:current_order).and_return(order)
         expect(order).to receive(:empty!)
-        spree_put :empty
+        put :empty
         expect(response).to redirect_to(spree.cart_path)
       end
     end
@@ -109,7 +109,7 @@ describe Spree::OrdersController, type: :controller do
       end
 
       it "cannot update a blank order" do
-        spree_put :update, order: { email: "foo" }
+        put :update, order: { email: "foo" }
         expect(flash[:error]).to eq(Spree.t(:order_not_found))
         expect(response).to redirect_to(spree.root_path)
       end
@@ -128,7 +128,7 @@ describe Spree::OrdersController, type: :controller do
 
     it "removes line items on update" do
       expect(order.line_items.count).to eq 1
-      spree_put :update, order: { line_items_attributes: { "0" => { id: line_item.id, quantity: 0 } } }
+      put :update, order: { line_items_attributes: { "0" => { id: line_item.id, quantity: 0 } } }
       expect(order.reload.line_items.count).to eq 0
     end
   end

data/spec/controllers/spree/orders_controller_transitions_spec.rb

@@ -23,7 +23,7 @@ module Spree
       it "correctly calls the transition callback" do
         expect(order.did_transition).to be_nil
         order.line_items << FactoryGirl.create(:line_item)
-        spree_put :update, { checkout: "checkout" }, { order_id: 1 }
+        put :update, { checkout: "checkout" }, { order_id: 1 }
         expect(order.did_transition).to be true
       end
     end

data/spec/controllers/spree/products_controller_spec.rb

@@ -6,12 +6,12 @@ describe Spree::ProductsController, type: :controller do
   # Regression test for https://github.com/spree/spree/issues/1390
   it "allows admins to view non-active products" do
     allow(controller).to receive_messages spree_current_user: mock_model(Spree.user_class, has_spree_role?: true, last_incomplete_spree_order: nil, spree_api_key: 'fake')
-    spree_get :show, id: product.to_param
+    get :show, id: product.to_param
     expect(response.status).to eq(200)
   end
 
   it "cannot view non-active products" do
-    spree_get :show, id: product.to_param
+    get :show, id: product.to_param
     expect(response.status).to eq(404)
   end
 
@@ -19,7 +19,7 @@ describe Spree::ProductsController, type: :controller do
     user = mock_model(Spree.user_class, last_incomplete_spree_order: nil, spree_api_key: 'fake')
     allow(controller).to receive_messages spree_current_user: user
     expect_any_instance_of(Spree::Config.searcher_class).to receive(:current_user=).with(user)
-    spree_get :index
+    get :index
     expect(response.status).to eq(200)
   end
 
@@ -30,6 +30,6 @@ describe Spree::ProductsController, type: :controller do
     request.env['HTTP_REFERER'] = "not|a$url"
 
     # Previously a URI::InvalidURIError exception was being thrown
-    spree_get :show, id: product.to_param
+    get :show, id: product.to_param
   end
 end

data/spec/controllers/spree/taxons_controller_spec.rb

@@ -6,7 +6,7 @@ describe Spree::TaxonsController, type: :controller do
     user = mock_model(Spree.user_class, last_incomplete_spree_order: nil, spree_api_key: 'fake')
     allow(controller).to receive_messages spree_current_user: user
     expect_any_instance_of(Spree::Config.searcher_class).to receive(:current_user=).with(user)
-    spree_get :show, id: taxon.permalink
+    get :show, id: taxon.permalink
     expect(response.status).to eq(200)
   end
 end

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,8 +180,7 @@ describe "Checkout", type: :feature, inaccessible: true do
   end
 
   context "user has payment sources", js: true do
-    before { Spree::PaymentMethod.all.each(&:really_destroy!) }
-    let!(:bogus) { create(:credit_card_payment_method) }
+    let(:bogus) { create(:credit_card_payment_method) }
     let(:user) { create(:user) }
 
     let!(:credit_card) do
@@ -190,6 +189,7 @@ 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)
@@ -317,7 +317,7 @@ describe "Checkout", type: :feature, inaccessible: true do
     end
   end
 
-  context "in coupon promotion, submits coupon along with payment", js: true do
+  context "Coupon promotions", js: true do
     let!(:promotion) { create(:promotion, name: "Huhuhu", code: "huhu") }
     let!(:calculator) { Spree::Calculator::FlatPercentItemTotal.create(preferred_flat_percent: "10") }
     let!(:action) { Spree::Promotion::Actions::CreateItemAdjustments.create(calculator: calculator) }
@@ -336,20 +336,19 @@ describe "Checkout", type: :feature, inaccessible: true do
       expect(page).to have_current_path(spree.checkout_state_path("payment"))
     end
 
-    it "makes sure payment reflects order total with discounts" do
+    it "applies them & refreshes the page on user clicking the Apply Code button" do
       fill_in "Coupon Code", with: promotion.codes.first.value
-      click_on "Save and Continue"
+      click_on "Apply Code"
 
       expect(page).to have_content(promotion.name)
-      expect(Spree::Payment.first.amount.to_f).to eq Spree::Order.last.total.to_f
+      expect(page).to have_content("-$2.00")
     end
 
-    context "invalid coupon" do
-      it "doesnt create a payment record" do
+    context "with invalid coupon" do
+      it "doesnt apply the promotion" do
         fill_in "Coupon Code", with: 'invalid'
-        click_on "Save and Continue"
+        click_on "Apply Code"
 
-        expect(Spree::Payment.count).to eq 0
         expect(page).to have_content(Spree.t(:coupon_code_not_found))
       end
     end

data/spec/features/checkout_unshippable_spec.rb

@@ -9,7 +9,7 @@ describe "checkout with unshippable items", type: :feature, inaccessible: true d
     order.reload
     line_item = order.line_items.last
     stock_item = stock_location.stock_item(line_item.variant)
-    stock_item.adjust_count_on_hand(-999)
+    stock_item.adjust_count_on_hand(0)
     stock_item.backorderable = false
     stock_item.save!
 

data/spec/features/products_spec.rb

@@ -20,6 +20,21 @@ describe "Visiting Products", type: :feature, inaccessible: true do
     expect(page).to have_content("Shopping Cart")
   end
 
+  # Regression spec for Spree [PR#7442](https://github.com/spree/spree/pull/7442)
+  context "when generating product links" do
+    let(:product) { Spree::Product.available.first }
+
+    it "should not use the *_url helper to generate the product links" do
+      visit spree.root_path
+      expect(page).not_to have_xpath(".//a[@href='#{spree.product_url(product, host: current_host)}']")
+    end
+
+    it "should use *_path helper to generate the product links" do
+     visit spree.root_path
+     expect(page).to have_xpath(".//a[@href='#{spree.product_path(product)}']")
+    end
+  end
+
   describe 'meta tags and title' do
     let(:jersey) { Spree::Product.find_by_name('Ruby on Rails Baseball Jersey') }
     let(:metas) { { meta_description: 'Brand new Ruby on Rails Jersey', meta_title: 'Ruby on Rails Baseball Jersey Buy High Quality Geek Apparel', meta_keywords: 'ror, jersey, ruby' } }

data/spec/spec_helper.rb

@@ -48,7 +48,7 @@ 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']
+Capybara.save_path = ENV['CIRCLE_ARTIFACTS'] if ENV['CIRCLE_ARTIFACTS']
 
 if ENV['WEBDRIVER'] == 'accessible'
   require 'capybara/accessible'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_frontend
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0.beta1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.4.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.4.0.beta1
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.4.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.4.0.beta1
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +165,7 @@ files:
 - app/assets/javascripts/spree/frontend/cart.js.coffee
 - app/assets/javascripts/spree/frontend/checkout.js.coffee
 - app/assets/javascripts/spree/frontend/checkout/address.js.coffee
+- app/assets/javascripts/spree/frontend/checkout/coupon-code.js.coffee
 - app/assets/javascripts/spree/frontend/checkout/payment.js.coffee
 - app/assets/javascripts/spree/frontend/product.js.coffee
 - app/assets/stylesheets/spree/frontend.css
@@ -339,13 +340,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubyforge_project: solidus_frontend
-rubygems_version: 2.6.11
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Cart and storefront for the Solidus e-commerce project.