solidus_frontend 2.7.4 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00062dc677a13db89d2fb4be6fb5ed6ac401b2ac53a945e4b52b5f446978f229
-  data.tar.gz: d93e7e1a27f66ca24eccb640752ce1e291c5592f0f382326782297793a61d3dc
+  metadata.gz: 0b78e6782c7aaf5de2799b93c100eb97e8431a5e9b865fcc202886e8c28cc008
+  data.tar.gz: 1e17148b86ae7d09454ecb6f8fe5b4589324d75b35cdc5aa410a33318df27db4
 SHA512:
-  metadata.gz: 668601be08adae947f79f9235383de4522247fcc280e976bb0b357358d0ea4c23a8ae14502801d0aae7dbf4209a51a554712ed4b5c1d61574876b9701b2c1e7e
-  data.tar.gz: d5dee3b13d029a6c6dc4a4df7614e10681ac8d55bc4c38b1063002691ee0f7c5342c11f4c812c4af3a0a8dca58db8018d7f8eb23c9474f42dcc3d13c9eb1671e
+  metadata.gz: 5267cc2ab0c37977c64c5aad4be7643a7bb45fc6368826632c012b3945fd3f1dfe4f47586c8a805c6e229b0317c505f663a44d685b788efae1df9f9784e768bf
+  data.tar.gz: 61d8f2a41bdacb457fd500965e9308996b5f005d049a2ee5a4b012d437b649510509d54ec87be3bbdb7f829e88d03ba5de6001d0614357bef01311c6c5cb1634

data/README.md

@@ -11,19 +11,19 @@ Solidus provides a generator to help with copying the right view into your host
 
 Simply call the generator to copy all views into your host app.
 
-```shell
+```bash
 $ bundle exec rails g solidus:views:override
 ```
 
 If you only want to copy certain views into your host app, you can provide the `--only` argument:
 
-```shell
+```bash
 $ bundle exec rails g solidus:views:override --only products/show
 ```
 
 The argument to `--only` can also be a substring of the name of the view from the `app/views/spree` folder:
 
-```shell
+```bash
 $ bundle exec rails g solidus:views:override --only product
 ```
 
@@ -31,10 +31,12 @@ This will copy all views whose directory or filename contains the string "produc
 
 ### Handle upgrades
 
-After upgrading solidus to a new version run the generator again and follow on screen instructions.
+After upgrading Solidus to a new version run the generator again and follow on screen instructions.
 
 ## Testing
 
 Run the tests
 
-    bundle exec rspec
+```bash
+bundle exec rspec
+```

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

@@ -14,7 +14,7 @@ Spree.onCouponCodeApply = function(e) {
     coupon_code: couponCode
   };
   var req = Spree.ajax({
-    method: "PUT",
+    method: 'POST',
     url: Spree.routes.apply_coupon_code(Spree.current_order_id),
     data: JSON.stringify(data),
     contentType: "application/json"

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

@@ -1092,6 +1092,9 @@ div[data-hook="inside_cart_form"] {
 /*--------------------------------------*/
 #order_summary {
   margin-top: 0;
+  h1 {
+    padding-left: 10px;
+  }
 }
 #order {
   p[data-hook="links"] {

data/app/controllers/spree/checkout_controller.rb

@@ -24,6 +24,7 @@ module Spree
     helper 'spree/orders'
 
     rescue_from Spree::Core::GatewayError, with: :rescue_from_spree_gateway_error
+    rescue_from Spree::Order::InsufficientStock, with: :insufficient_stock_error
 
     # Updates the order and advances to the next state (when possible.)
     def update
@@ -168,6 +169,7 @@ module Spree
 
     def apply_coupon_code
       if update_params[:coupon_code].present?
+        Spree::Deprecation.warn('This endpoint is deprecated. Please use `Spree::CouponCodesController#create` endpoint instead.')
         @order.coupon_code = update_params[:coupon_code]
 
         handler = PromotionHandler::Coupon.new(@order).apply
@@ -232,5 +234,22 @@ module Spree
     def check_authorization
       authorize!(:edit, current_order, cookies.signed[:guest_token])
     end
+
+    def insufficient_stock_error
+      packages = @order.shipments.map(&:to_package)
+      if packages.empty?
+        flash[:error] = I18n.t('spree.insufficient_stock_for_order')
+        redirect_to cart_path
+      else
+        availability_validator = Spree::Stock::AvailabilityValidator.new
+        unavailable_items = @order.line_items.reject { |line_item| availability_validator.validate(line_item) }
+        if unavailable_items.any?
+          item_names = unavailable_items.map(&:name).to_sentence
+          flash[:error] = t('spree.inventory_error_flash_for_insufficient_shipment_quantity', unavailable_items: item_names)
+          @order.restart_checkout_flow
+          redirect_to spree.checkout_state_path(@order.state)
+        end
+      end
+    end
   end
 end

data/app/controllers/spree/coupon_codes_controller.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Spree
+  class CouponCodesController < Spree::StoreController
+    before_action :load_order, only: :create
+    around_action :lock_order, only: :create
+
+    def create
+      authorize! :update, @order, cookies.signed[:guest_token]
+
+      if params[:coupon_code].present?
+        @order.coupon_code = params[:coupon_code]
+        handler = PromotionHandler::Coupon.new(@order).apply
+
+        respond_with(@order) do |format|
+          format.html do
+            if handler.successful?
+              flash[:success] = handler.success
+              redirect_to cart_path
+            else
+              flash.now[:error] = handler.error
+              render 'spree/coupon_codes/new'
+            end
+          end
+        end
+      end
+    end
+
+    private
+
+    def load_order
+      @order = current_order
+    end
+  end
+end

data/app/controllers/spree/locale_controller.rb

@@ -7,7 +7,7 @@ module Spree
       requested_locale = params[:switch_to_locale] || params[:locale]
 
       if requested_locale && available_locales.map(&:to_s).include?(requested_locale)
-        session[:locale] = requested_locale
+        session[set_user_language_locale_key] = requested_locale
         I18n.locale = requested_locale
         flash.notice = t('spree.locale_changed')
       else

data/app/controllers/spree/orders_controller.rb

@@ -122,6 +122,7 @@ module Spree
 
     def apply_coupon_code
       if order_params[:coupon_code].present?
+        Spree::Deprecation.warn('This endpoint is deprecated. Please use `Spree::CouponCodesController#create` endpoint instead.')
         @order.coupon_code = order_params[:coupon_code]
 
         handler = PromotionHandler::Coupon.new(@order).apply

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

@@ -1,7 +1,7 @@
 <div class="coupon-code" data-hook='coupon_code'>
   <%= form_for order, url: update_checkout_path(order.state) do |form| %>
     <%= form.label :coupon_code %>
-    <%= form.text_field :coupon_code, placeholder: :coupon_code %>
+    <%= form.text_field :coupon_code, placeholder: true %>
 
     <button type="submit" class="button coupon-code-apply-button" id="coupon-code-apply-button">
       <%= t('spree.apply_code') %>

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

@@ -27,7 +27,9 @@
               <% ship_form.object.manifest.each do |item| %>
                 <tr class="stock-item">
                   <td class="item-image">
-                    <%= render 'spree/shared/image', image: item.variant.display_image, size: :mini %>
+                    <%= render 'spree/shared/image',
+                      image: (item.variant.gallery.images.first || item.variant.product.gallery.images.first),
+                      size: :mini %>
                   </td>
                   <td class="item-name"><%= item.variant.name %></td>
                   <td class="item-qty"><%= item.quantity %></td>
@@ -75,7 +77,9 @@
               <% @differentiator.missing.each do |variant, quantity| %>
                 <tr class="stock-item">
                   <td class="item-image">
-                    <%= render 'spree/shared/image', image: variant.display_image, size: :mini %>
+                    <%= render 'spree/shared/image',
+                      image: (variant.gallery.images.first || variant.product.gallery.images.first),
+                      size: :mini %>
                   </td>
                   <td class="item-name"><%= variant.name %></td>
                   <td class="item-qty"><%= quantity %></td>

data/app/views/spree/coupon_codes/new.html.erb

@@ -0,0 +1,6 @@
+<div id="coupon_code" data-hook="coupon_code">
+  <%= form_tag order_coupon_codes_path(@order), method: :post do %>
+    <%= text_field_tag :coupon_code, nil, placeholder: t("spree.coupon_code"), size: 10 %>
+    <%= submit_tag t("spree.apply_code") %>
+  <% end %>
+</div>

data/app/views/spree/orders/_form.html.erb

@@ -15,7 +15,7 @@
   </tbody>
   <% if order.adjustments.nonzero.exists? || order.line_item_adjustments.nonzero.exists? || order.shipment_adjustments.nonzero.exists? || order.shipments.any? %>
     <tr class="cart-subtotal">
-      <td colspan="4" align='right'><h5><%= t('spree.cart_subtotal', count: order.line_items.sum(:quantity)) %></h5></th>
+      <td colspan="4" align='right'><h5><%= t('spree.cart_subtotal', count: order.line_items.sum(:quantity)) %></h5></td>
       <td colspan><h5><%= order.display_item_total %></h5></td>
       <td></td>
     </tr>

data/app/views/spree/orders/_line_item.html.erb

@@ -2,11 +2,9 @@
 <%= order_form.fields_for :line_items, line_item do |item_form| -%>
   <tr class="<%= cycle('', 'alt') %> line-item">
     <td class="cart-item-image" data-hook="cart_item_image">
-      <% if variant.images.empty? %>
-        <%= link_to(render('spree/shared/image', image: variant.product.display_image, size: :small), variant.product) %>
-      <% else %>
-        <%= link_to(render('spree/shared/image', image: variant.images.first, size: :small), variant.product) %>
-      <% end %>
+      <%= link_to(render('spree/shared/image',
+                         image: (variant.gallery.images.first || variant.product.gallery.images.first),
+                         size: :small), variant.product) %>
     </td>
     <td class="cart-item-description" data-hook="cart_item_description">
       <h4><%= link_to line_item.name, product_path(variant.product) %></h4>

data/app/views/spree/orders/edit.html.erb

@@ -16,19 +16,16 @@
         <div data-hook="inside_cart_form">
 
           <div data-hook="cart_items">
-            <%= render 'form', order_form: order_form %>
+            <%= render 'spree/orders/form', order_form: order_form %>
           </div>
 
           <div class="links columns sixteen alpha omega" data-hook="cart_buttons">
-            <%= order_form.text_field :coupon_code, size: 10, placeholder: t('spree.coupon_code') %>
-            <%= button_tag class: 'primary', id: 'update-button' do %>
-              <%= t('spree.update') %>
-            <% end %>
+            <%= button_tag t("spree.update"), class: "primary", id: "update-button" %>
+
             <%= button_tag class: 'button checkout primary', id: 'checkout-link', name: 'checkout' do %>
               <%= t('spree.checkout') %>
             <% end %>
           </div>
-
         </div>
       <% end %>
     </div>
@@ -41,6 +38,8 @@
         <%= link_to t('spree.continue_shopping'), products_path, class: 'continue button gray' %>
         </p>
       <% end %>
+
+      <%= render template: 'spree/coupon_codes/new' %>
     </div>
 
   <% end %>

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

@@ -1,5 +1,8 @@
 <% if defined?(image) && image %>
   <%= render 'spree/shared/image', image: image, size: :product, itemprop: "image" %>
 <% else %>
-  <%= render 'spree/shared/image', image: @product.display_image, size: :product, itemprop: "image" %>
+  <%= render 'spree/shared/image',
+    image: @product.gallery.images.first,
+    size: :product,
+    itemprop: "image" %>
 <% end %>

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

@@ -1,17 +1,19 @@
 <%# no need for thumbnails unless there is more than one image %>
-<% if (@product.images + @product.variant_images).uniq.size > 1 %>
+<% if @product.gallery.images.size > 1 %>
   <ul id="product-thumbnails" class="thumbnails inline" data-hook>
-    <% @product.images.each do |i| %>
-      <li class='tmb-all tmb-<%= i.viewable.id %>'>
-        <%= link_to(image_tag(i.attachment.url(:mini)), i.attachment.url(:product)) %>
+
+    <% @product.gallery.images.each do |image| %>
+      <% next if image.viewable_id != @product.master.id %>
+      <li class='tmb-all tmb-<%= image.viewable_id %>'>
+        <%= link_to(image_tag(image.url(:mini)), image.url(:product)) %>
       </li>
     <% end %>
 
     <% if @product.has_variants? %>
-      <% @product.variant_images.each do |i| %>
-        <% next if @product.images.include?(i) %>
-        <li class='vtmb tmb-<%= i.viewable.id %>'>
-          <%= link_to(image_tag(i.attachment.url(:mini)), i.attachment.url(:product)) %>
+      <% @product.gallery.images.each do |image| %>
+        <% next if image.viewable_id == @product.master.id %>
+        <li class='vtmb tmb-<%= image.viewable_id %>'>
+          <%= link_to(image_tag(image.url(:mini)), image.url(:product)) %>
         </li>
       <% end %>
     <% end %>

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

@@ -1,11 +1,11 @@
 <% size ||= :mini %>
 <% itemprop ||= nil %>
 
-<% if image && image.attachment? %>
-  <% if itemprop %>
-    <%= image_tag image.attachment(size), itemprop: itemprop %>
+<% if image_url = image.try(:url, size)  %>
+  <% if image_alt = image.try(:alt) %>
+    <%= image_tag image_url, alt: image_alt, itemprop: itemprop %>
   <% else %>
-    <%= image_tag image.attachment(size) %>
+    <%= image_tag image_url, itemprop: itemprop %>
   <% end %>
 <% else %>
   <span class="image-placeholder <%= size %>"></span>

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

@@ -4,7 +4,7 @@
     <%= form_tag spree.select_locale_path, class: 'navbar-form' do %>
       <div class="form-group">
         <label for="switch_to_locale" class="sr-only">
-          <%= Spree.t(:'i18n.language') %>
+          <%= I18n.t('spree.i18n.language') %>
         </label>
         <%=
           select_tag(

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

@@ -62,11 +62,9 @@
     <% order.line_items.each do |item| %>
       <tr data-hook="order_details_line_item_row">
         <td data-hook="order_item_image">
-          <% if item.variant.images.empty? %>
-            <%= link_to(render('spree/shared/image', image: item.variant.product.display_image, size: :small), item.variant.product) %>
-          <% else %>
-            <%= link_to(render('spree/shared/image', image: item.variant.images.first, size: :small), item.variant.product) %>
-          <% end %>
+          <%= link_to(render('spree/shared/image',
+                             image: (item.variant.gallery.images.first || item.variant.product.gallery.images.first),
+                             size: :small), item.variant.product) %>
         </td>
         <td data-hook="order_item_description">
           <h4><%= item.variant.product.name %></h4>

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

@@ -28,7 +28,7 @@
       <li id="product_<%= product.id %>" class="columns three <%= cycle("alpha", "secondary", "", "omega secondary", name: "classes") %>" data-hook="products_list_item" itemscope itemtype="http://schema.org/Product">
         <% cache(@taxon.present? ? [I18n.locale, current_pricing_options, @taxon, product] : [I18n.locale, current_pricing_options, product]) do %>
           <div class="product-image">
-            <%= link_to(render('spree/shared/image', image: product.display_image, size: :small, itemprop: "image"), url, itemprop: 'url') %>
+            <%= link_to(render('spree/shared/image', image: product.gallery.images.first, size: :small, itemprop: "image"), url, itemprop: 'url') %>
           </div>
           <%= link_to truncate(product.name, length: 50), url, class: 'info', itemprop: "name", title: product.name %>
           <span itemprop="offers" itemscope itemtype="http://schema.org/Offer">

data/config/routes.rb

@@ -18,6 +18,7 @@ Spree::Core::Engine.routes.draw do
 
   resources :orders, except: [:index, :new, :create, :destroy] do
     post :populate, on: :collection
+    resources :coupon_codes, only: :create
   end
 
   get '/cart', to: 'orders#edit', as: :cart

data/lib/spree/frontend.rb

@@ -3,7 +3,7 @@
 require 'rails/all'
 require 'jquery-rails'
 require 'canonical-rails'
-require 'sass-rails'
+require 'sassc-rails'
 require 'font-awesome-rails'
 require 'responders'
 require 'kaminari'

data/solidus_frontend.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'font-awesome-rails', '~> 4.0'
   s.add_dependency 'jquery-rails'
   s.add_dependency 'kaminari', '~> 1.1'
-  s.add_dependency 'sass-rails'
+  s.add_dependency 'sassc-rails'
   s.add_dependency 'truncate_html', '~> 0.9', '>= 0.9.2'
 
   s.add_development_dependency 'capybara-accessible'

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -14,7 +14,6 @@ describe Spree::CheckoutController, type: :controller do
 
   before do
     allow(controller).to receive_messages try_spree_current_user: user
-    allow(controller).to receive_messages spree_current_user: user
     allow(controller).to receive_messages current_order: order
   end
 
@@ -90,7 +89,7 @@ describe Spree::CheckoutController, type: :controller do
         order.line_items << FactoryBot.create(:line_item)
       end
 
-      context "with the order in the cart state" do
+      context "with the order in the cart state", partial_double_verification: false do
         before do
           order.update_attributes! user: user
           order.update_column(:state, "cart")
@@ -139,7 +138,7 @@ describe Spree::CheckoutController, type: :controller do
         end
       end
 
-      context "with the order in the address state" do
+      context "with the order in the address state", partial_double_verification: false do
         before do
           order.update_attributes! user: user
           order.update_columns(ship_address_id: create(:address).id, state: "address")
@@ -152,7 +151,7 @@ describe Spree::CheckoutController, type: :controller do
           end
         end
 
-        context "with a billing and shipping address" do
+        context "with a billing and shipping address", partial_double_verification: false do
           subject do
             post :update, params: {
               state: "address",
@@ -184,7 +183,7 @@ describe Spree::CheckoutController, type: :controller do
       # the same thing here.
       # Perhaps we can just remove 'set_payment_parameters_amount' entirely at
       # some point?
-      context "when there is a checkout step between payment and confirm" do
+      context "when there is a checkout step between payment and confirm", partial_double_verification: false do
         before do
           @old_checkout_flow = Spree::Order.checkout_flow
           Spree::Order.class_eval do
@@ -227,7 +226,7 @@ describe Spree::CheckoutController, type: :controller do
         end
       end
 
-      context "when in the payment state" do
+      context "when in the payment state", partial_double_verification: false do
         let(:order) { create(:order_with_line_items) }
         let(:payment_method) { create(:credit_card_payment_method) }
 
@@ -420,6 +419,45 @@ describe Spree::CheckoutController, type: :controller do
         expect(flash[:error]).to eq(I18n.t('spree.payment_processing_failed'))
       end
     end
+
+    context "when InsufficientStock error is raised" do
+      before do
+        allow(controller).to receive_messages current_order: order
+        allow(controller).to receive_messages check_authorization: true
+        allow(controller).to receive_messages ensure_sufficient_stock_lines: true
+      end
+
+      context "when the order has no shipments" do
+        let(:order) { Spree::TestingSupport::OrderWalkthrough.up_to(:address) }
+
+        before do
+          allow(order).to receive_messages shipments: []
+          # Order#next is the tipical failure point here:
+          allow(order).to receive(:next).and_raise(Spree::Order::InsufficientStock)
+        end
+
+        it "redirects the customer to the cart page with an error message" do
+          put :update, params: { state: order.state, order: {} }
+          expect(flash[:error]).to eq(I18n.t('spree.insufficient_stock_for_order'))
+          expect(response).to redirect_to(spree.cart_path)
+        end
+      end
+
+      context "when the order has shipments" do
+        let(:order) { Spree::TestingSupport::OrderWalkthrough.up_to(:payment) }
+
+        context "when items become somehow not available anymore" do
+          before { Spree::StockItem.update_all backorderable: false }
+
+          it "redirects the customer to the address checkout page with an error message" do
+            put :update, params: { state: order.state, order: {} }
+            error = I18n.t('spree.inventory_error_flash_for_insufficient_shipment_quantity', unavailable_items: order.products.first.name)
+            expect(flash[:error]).to eq(error)
+            expect(response).to redirect_to(spree.checkout_state_path(state: :address))
+          end
+        end
+      end
+    end
   end
 
   context "When last inventory item has been purchased" do
@@ -501,6 +539,8 @@ describe Spree::CheckoutController, type: :controller do
       let(:promotion_handler) { instance_double('Spree::PromotionHandler::Coupon', error: nil, success: 'Coupon Applied!') }
 
       it "continues checkout flow normally" do
+        expect(Spree::Deprecation).to receive(:warn)
+
         expect(Spree::PromotionHandler::Coupon)
           .to receive_message_chain(:new, :apply)
           .and_return(promotion_handler)
@@ -515,6 +555,8 @@ describe Spree::CheckoutController, type: :controller do
         let(:promotion_handler) { instance_double('Spree::PromotionHandler::Coupon', error: 'Some error', success: false) }
 
         it "setups the current step correctly before rendering" do
+          expect(Spree::Deprecation).to receive(:warn)
+
           expect(Spree::PromotionHandler::Coupon)
             .to receive_message_chain(:new, :apply)
             .and_return(promotion_handler)
@@ -524,6 +566,8 @@ describe Spree::CheckoutController, type: :controller do
         end
 
         it "render cart with coupon error" do
+          expect(Spree::Deprecation).to receive(:warn)
+
           expect(Spree::PromotionHandler::Coupon)
             .to receive_message_chain(:new, :apply)
             .and_return(promotion_handler)

data/spec/controllers/spree/orders_controller_ability_spec.rb

@@ -7,8 +7,6 @@ module Spree
     ORDER_TOKEN = 'ORDER_TOKEN'
 
     let!(:store) { create(:store) }
-    let(:user) { create(:user) }
-    let(:guest_user) { create(:user) }
     let(:order) { Spree::Order.create }
     let(:variant) { create(:variant) }
 
@@ -21,7 +19,6 @@ module Spree
 
       before do
         allow(controller).to receive_messages current_order: order
-        allow(controller).to receive_messages spree_current_user: user
       end
 
       context '#populate' do

data/spec/controllers/spree/orders_controller_spec.rb

@@ -149,6 +149,8 @@ describe Spree::OrdersController, type: :controller do
             let(:promotion_handler) { instance_double('Spree::PromotionHandler::Coupon', error: nil, success: 'Coupon Applied!') }
 
             it "continues checkout flow normally" do
+              expect(Spree::Deprecation).to receive(:warn)
+
               expect(Spree::PromotionHandler::Coupon)
                 .to receive_message_chain(:new, :apply)
                 .and_return(promotion_handler)
@@ -163,6 +165,8 @@ describe Spree::OrdersController, type: :controller do
               let(:promotion_handler) { instance_double('Spree::PromotionHandler::Coupon', error: 'Some error', success: false) }
 
               it "render cart with coupon error" do
+                expect(Spree::Deprecation).to receive(:warn)
+
                 expect(Spree::PromotionHandler::Coupon)
                   .to receive_message_chain(:new, :apply)
                   .and_return(promotion_handler)

data/spec/controllers/spree/products_controller_spec.rb

@@ -7,7 +7,7 @@ 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')
+    allow(controller).to receive_messages try_spree_current_user: mock_model(Spree.user_class, has_spree_role?: true, last_incomplete_spree_order: nil, spree_api_key: 'fake')
     get :show, params: { id: product.to_param }
     expect(response.status).to eq(200)
   end
@@ -20,7 +20,7 @@ describe Spree::ProductsController, type: :controller do
 
   it "should provide the current user to the searcher class" 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
+    allow(controller).to receive_messages try_spree_current_user: user
     expect_any_instance_of(Spree::Config.searcher_class).to receive(:current_user=).with(user)
     get :index
     expect(response.status).to eq(200)
@@ -29,7 +29,7 @@ describe Spree::ProductsController, type: :controller do
   # Regression test for https://github.com/spree/spree/issues/2249
   it "doesn't error when given an invalid referer" do
     current_user = mock_model(Spree.user_class, has_spree_role?: true, last_incomplete_spree_order: nil, generate_spree_api_key!: nil)
-    allow(controller).to receive_messages spree_current_user: current_user
+    allow(controller).to receive_messages try_spree_current_user: current_user
     request.env['HTTP_REFERER'] = "not|a$url"
 
     # Previously a URI::InvalidURIError exception was being thrown

data/spec/controllers/spree/taxons_controller_spec.rb

@@ -6,7 +6,7 @@ describe Spree::TaxonsController, type: :controller do
   it "should provide the current user to the searcher class" do
     taxon = create(:taxon, permalink: "test")
     user = mock_model(Spree.user_class, last_incomplete_spree_order: nil, spree_api_key: 'fake')
-    allow(controller).to receive_messages spree_current_user: user
+    allow(controller).to receive_messages try_spree_current_user: user
     expect_any_instance_of(Spree::Config.searcher_class).to receive(:current_user=).with(user)
     get :show, params: { id: taxon.permalink }
     expect(response.status).to eq(200)

data/spec/features/checkout_confirm_insufficient_stock_spec.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe "Checkout confirm page submission", type: :feature do
+  include_context 'checkout setup'
+
+  context "when the product from the order is not backorderable but has enough stock quantity" do
+    let(:user) { create(:user) }
+
+    let(:order) { Spree::TestingSupport::OrderWalkthrough.up_to(:payment) }
+    let(:order_product) { order.products.first }
+    let(:order_stock_item) { order_product.stock_items.first }
+
+    before do
+      order_stock_item.update! backorderable: false
+      order_stock_item.set_count_on_hand(1)
+      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)
+    end
+
+    context 'when there are not other backorderable stock locations' do
+      context 'when the customer is on the confirm page and the availabilty drops to zero' do
+        before do
+          visit spree.checkout_state_path(:confirm)
+          order_stock_item.set_count_on_hand(0)
+        end
+
+        it 'redirects to cart page and shows an unavailable product message' do
+          click_button "Place Order"
+          expect(page).to have_content "#{order_product.name} became unavailable"
+          expect(page).to have_current_path spree.cart_path
+        end
+      end
+    end
+
+    context 'when there is another backorderable stock location' do
+      before do
+        create :stock_location, backorderable_default: true, default: false
+      end
+
+      context 'when the customer is on the confirm page and the availabilty drops to zero' do
+        before do
+          visit spree.checkout_state_path(:confirm)
+          order_stock_item.set_count_on_hand(0)
+        end
+
+        it "redirects to the address checkout page and shows an availability changed message" do
+          click_button "Place Order"
+          error_message = "Quantity selected of #{order_product.name} is not available. Still, items may be available from another stock location, please try again."
+          expect(page).to have_content error_message
+          expect(page).to have_current_path spree.checkout_state_path(:address)
+        end
+
+        it "can still complete the order using the backorderable stock location by restarting the checkout" do
+          click_button "Place Order"
+          expect(page).to have_current_path spree.checkout_state_path(:address)
+          click_button "Save and Continue"
+          expect(page).to have_current_path spree.checkout_state_path(:delivery)
+          click_button "Save and Continue"
+          expect(page).to have_current_path spree.checkout_state_path(:payment)
+          click_button "Save and Continue"
+          expect(page).to have_current_path spree.checkout_state_path(:confirm)
+          click_button "Place Order"
+          expect(page).to have_content 'Your order has been processed successfully'
+        end
+      end
+    end
+  end
+end

data/spec/features/checkout_spec.rb

@@ -350,7 +350,7 @@ describe "Checkout", type: :feature, inaccessible: true do
       choose "use_existing_card_no"
 
       fill_in "Name on card", with: 'Spree Commerce'
-      fill_in "Card Number", with: '4111 1111 1111 1111'
+      fill_in_with_force "Card Number", with: '4111 1111 1111 1111'
       fill_in "card_expiry", with: '04 / 20'
       fill_in "Card Code", with: '123'
 

data/spec/features/coupon_code_spec.rb

@@ -130,22 +130,22 @@ describe "Coupon code promotions", type: :feature, js: true do
       end
 
       it "can enter a coupon code and receives success notification" do
-        fill_in "order_coupon_code", with: "onetwo"
-        click_button "Update"
+        fill_in "coupon_code", with: "onetwo"
+        click_button "Apply Code"
         expect(page).to have_content(I18n.t('spree.coupon_code_applied'))
       end
 
       it "can enter a promotion code with both upper and lower case letters" do
-        fill_in "order_coupon_code", with: "ONETwO"
-        click_button "Update"
+        fill_in "coupon_code", with: "ONETwO"
+        click_button "Apply Code"
         expect(page).to have_content(I18n.t('spree.coupon_code_applied'))
       end
 
       it "informs the user about a coupon code which has exceeded its usage" do
         expect_any_instance_of(Spree::Promotion).to receive(:usage_limit_exceeded?).and_return(true)
 
-        fill_in "order_coupon_code", with: "onetwo"
-        click_button "Update"
+        fill_in "coupon_code", with: "onetwo"
+        click_button "Apply Code"
         expect(page).to have_content(I18n.t('spree.coupon_code_max_usage'))
       end
 
@@ -160,8 +160,8 @@ describe "Coupon code promotions", type: :feature, js: true do
         specify do
           visit spree.cart_path
 
-          fill_in "order_coupon_code", with: "onetwo"
-          click_button "Update"
+          fill_in "coupon_code", with: "onetwo"
+          click_button "Apply Code"
           expect(page).to have_content(I18n.t(:item_total_less_than_or_equal, scope: [:spree, :eligibility_errors, :messages], amount: "$100.00"))
         end
       end
@@ -170,8 +170,8 @@ describe "Coupon code promotions", type: :feature, js: true do
         promotion.expires_at = Date.today.beginning_of_week
         promotion.starts_at = Date.today.beginning_of_week.advance(day: 3)
         promotion.save!
-        fill_in "order_coupon_code", with: "onetwo"
-        click_button "Update"
+        fill_in "coupon_code", with: "onetwo"
+        click_button "Apply Code"
         expect(page).to have_content(I18n.t('spree.coupon_code_expired'))
       end
 
@@ -191,8 +191,8 @@ describe "Coupon code promotions", type: :feature, js: true do
           click_button "add-to-cart-button"
 
           visit spree.cart_path
-          fill_in "order_coupon_code", with: "onetwo"
-          click_button "Update"
+          fill_in "coupon_code", with: "onetwo"
+          click_button "Apply Code"
 
           fill_in "order_line_items_attributes_0_quantity", with: 2
           fill_in "order_line_items_attributes_1_quantity", with: 2
@@ -237,8 +237,8 @@ describe "Coupon code promotions", type: :feature, js: true do
             expect(page).to have_content("$30.00")
           end
 
-          fill_in "order_coupon_code", with: "onetwo"
-          click_button "Update"
+          fill_in "coupon_code", with: "onetwo"
+          click_button "Apply Code"
 
           within '#cart_adjustments' do
             expect(page).to have_content("Promotion (Onetwo) -$30.00")

data/spec/features/promotion_code_invalidation_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.feature "Promotion Code Invalidation" do
+RSpec.feature "Promotion Code Invalidation", js: true do
   given!(:promotion) do
     FactoryBot.create(
       :promotion_with_item_adjustment,
@@ -28,7 +28,7 @@ RSpec.feature "Promotion Code Invalidation" do
 
   scenario "adding the promotion to a cart with two applicable items" do
     fill_in "Coupon code", with: "PROMO"
-    click_button "Update"
+    click_button "Apply Code"
 
     expect(page).to have_content("The coupon code was successfully applied to your order")
 

data/spec/features/quantity_promotions_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.feature "Quantity Promotions" do
+RSpec.feature "Quantity Promotions", js: true do
   given(:action) do
     Spree::Promotion::Actions::CreateQuantityAdjustments.create(
       calculator: calculator,
@@ -26,8 +26,8 @@ RSpec.feature "Quantity Promotions" do
 
   scenario "adding and removing items from the cart" do
     # Attempt to use the code with too few items.
-    fill_in "Coupon code", with: "PROMO"
-    click_button "Update"
+    fill_in "coupon_code", with: "PROMO"
+    click_button "Apply Code"
     expect(page).to have_content("This coupon code could not be applied to the cart at this time")
 
     # Add another item to our cart.
@@ -36,8 +36,8 @@ RSpec.feature "Quantity Promotions" do
     click_button "Add To Cart"
 
     # Using the code should now succeed.
-    fill_in "Coupon code", with: "PROMO"
-    click_button "Update"
+    fill_in "coupon_code", with: "PROMO"
+    click_button "Apply Code"
     expect(page).to have_content("The coupon code was successfully applied to your order")
     within("#cart_adjustments") do
       expect(page).to have_content("-$10.00")
@@ -70,8 +70,8 @@ RSpec.feature "Quantity Promotions" do
     click_button "Update"
 
     # Apply the promo code and see a $10 discount (for 2 of the 3 items)
-    fill_in "Coupon code", with: "PROMO"
-    click_button "Update"
+    fill_in "coupon_code", with: "PROMO"
+    click_button "Apply Code"
     expect(page).to have_content("The coupon code was successfully applied to your order")
     within("#cart_adjustments") do
       expect(page).to have_content("-$10.00")
@@ -104,8 +104,8 @@ RSpec.feature "Quantity Promotions" do
       click_button "Update"
 
       # Apply the promo code and see a $15 discount
-      fill_in "Coupon code", with: "PROMO"
-      click_button "Update"
+      fill_in "coupon_code", with: "PROMO"
+      click_button "Apply Code"
       expect(page).to have_content("The coupon code was successfully applied to your order")
       within("#cart_adjustments") do
         expect(page).to have_content("-$15.00")

data/spec/spec_helper.rb

@@ -26,6 +26,7 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 require 'database_cleaner'
 
+require 'spree/testing_support/partial_double_verification'
 require 'spree/testing_support/authorization_helpers'
 require 'spree/testing_support/capybara_ext'
 require 'spree/testing_support/factories'

data/spec/support/features/fill_in_with_force.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module FillInWithForce
+  def fill_in_with_force(locator, with:)
+    field_id = find_field(locator)[:id]
+    page.execute_script "document.getElementById('#{field_id}').value = '#{with}';"
+  end
+end
+
+RSpec.configure do |config|
+  config.include FillInWithForce, type: :feature
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_frontend
 version: !ruby/object:Gem::Version
-  version: 2.7.4
+  version: 2.8.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-23 00:00:00.000000000 Z
+date: 2019-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.7.4
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.7.4
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.7.4
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.7.4
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -195,6 +195,7 @@ files:
 - app/assets/stylesheets/spree/frontend/screen.css.scss
 - app/controllers/spree/checkout_controller.rb
 - app/controllers/spree/content_controller.rb
+- app/controllers/spree/coupon_codes_controller.rb
 - app/controllers/spree/home_controller.rb
 - app/controllers/spree/locale_controller.rb
 - app/controllers/spree/orders_controller.rb
@@ -218,6 +219,7 @@ files:
 - app/views/spree/checkout/payment/_check.html.erb
 - app/views/spree/checkout/payment/_gateway.html.erb
 - app/views/spree/content/cvv.html.erb
+- app/views/spree/coupon_codes/new.html.erb
 - app/views/spree/home/index.html.erb
 - app/views/spree/layouts/spree_application.html.erb
 - app/views/spree/orders/_adjustment_row.html.erb
@@ -286,6 +288,7 @@ files:
 - spec/features/caching/products_spec.rb
 - spec/features/caching/taxons_spec.rb
 - spec/features/cart_spec.rb
+- spec/features/checkout_confirm_insufficient_stock_spec.rb
 - spec/features/checkout_spec.rb
 - spec/features/checkout_unshippable_spec.rb
 - spec/features/coupon_code_spec.rb
@@ -304,6 +307,7 @@ files:
 - spec/helpers/order_helper_spec.rb
 - spec/helpers/taxon_filters_helper_spec.rb
 - spec/spec_helper.rb
+- spec/support/features/fill_in_with_force.rb
 - spec/support/shared_contexts/checkout_setup.rb
 - spec/support/shared_contexts/custom_products.rb
 - spec/support/shared_contexts/locales.rb
@@ -328,7 +332,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements:
 - none
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Cart and storefront for the Solidus e-commerce project.