solidus_frontend 2.1.1 → 2.2.0.beta1

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

@@ -1,12 +1,12 @@
 <tbody id="cart_adjustments" data-hook>
   <% if @order.line_item_adjustments.exists? %>
     <% @order.line_item_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
-      <%= render "spree/orders/adjustment_row", :label => label, :adjustments => adjustments, :type => Spree.t(:promotion) %>
+      <%= render "spree/orders/adjustment_row", label: label, adjustments: adjustments, type: Spree.t(:promotion) %>
     <% end %>
   <% end %>
 
   <% @order.all_adjustments.tax.eligible.group_by(&:label).each do |label, adjustments| %>
-    <%= render "spree/orders/adjustment_row", :label => label, :adjustments => adjustments, :type => Spree.t(:tax) %>
+    <%= render "spree/orders/adjustment_row", label: label, adjustments: adjustments, type: Spree.t(:tax) %>
   <% end %>
 
   <% @order.shipments.each do |shipment| %>
@@ -19,6 +19,6 @@
   <% end %>
 
   <% @order.adjustments.eligible.group_by(&:label).each do |label, adjustments| %>
-    <%= render "spree/orders/adjustment_row", :label => label, :adjustments => adjustments, :type => Spree.t(:adjustment) %>
+    <%= render "spree/orders/adjustment_row", label: label, adjustments: adjustments, type: Spree.t(:adjustment) %>
   <% end %>
 </tbody>

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

@@ -1,4 +1,5 @@
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
+<% order = order_form.object %>
+<%= render 'spree/shared/error_messages', target: order %>
 <table id="cart-detail" data-hook>
   <thead>
     <tr data-hook="cart_items_headers">
@@ -10,19 +11,19 @@
     </tr>
   </thead>
   <tbody id="line_items" data-hook>
-    <%= render partial: 'spree/orders/line_item', collection: order_form.object.line_items, locals: {order_form: order_form} %>
+    <%= render partial: 'spree/orders/line_item', collection: order.line_items, locals: { order_form: order_form } %>
   </tbody>
-  <% if @order.adjustments.nonzero.exists? || @order.line_item_adjustments.nonzero.exists? || @order.shipment_adjustments.nonzero.exists? || @order.shipments.any? %>
+  <% 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><%= Spree.t(:cart_subtotal, :count => @order.line_items.sum(:quantity)) %></h5></th>
-      <td colspan><h5><%= order_form.object.display_item_total %></h5></td>
+      <td colspan="4" align='right'><h5><%= Spree.t(:cart_subtotal, count: order.line_items.sum(:quantity)) %></h5></th>
+      <td colspan><h5><%= order.display_item_total %></h5></td>
       <td></td>
     </tr>
     <%= render "spree/orders/adjustments" %>
   <% end %>
   <tr class="cart-total">
     <td colspan="4" align='right'><h5><%= Spree.t(:total) %></h5></th>
-    <td colspan><h5><%= order_form.object.display_total %></h5></td>
+    <td colspan><h5><%= order.display_total %></h5></td>
     <td></td>
   </tr>
 </table>

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

@@ -24,13 +24,13 @@
       <%= line_item.single_money.to_html %>
     </td>
     <td class="cart-item-quantity" data-hook="cart_item_quantity">
-      <%= item_form.number_field :quantity, :min => 0, :class => "line_item_quantity", :size => 5 %>
+      <%= item_form.number_field :quantity, min: 0, class: "line_item_quantity", size: 5 %>
     </td>
     <td class="cart-item-total" data-hook="cart_item_total">
       <%= line_item.display_amount.to_html unless line_item.quantity.nil? %>
     </td>
     <td class="cart-item-delete" data-hook="cart_item_delete">
-      <%= link_to image_tag('icons/delete.png'), '#', :class => 'delete', :id => "delete_#{dom_id(line_item)}" %>
+      <%= link_to image_tag('icons/delete.png'), '#', class: 'delete', id: "delete_#{dom_id(line_item)}" %>
     </td>
   </tr>
 <% end -%>

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

@@ -6,25 +6,25 @@
 
     <div data-hook="empty_cart">
       <p><%= Spree.t(:your_cart_is_empty) %></p>
-      <p><%= link_to Spree.t(:continue_shopping), products_path, :class => 'button continue' %></p>
+      <p><%= link_to Spree.t(:continue_shopping), products_path, class: 'button continue' %></p>
     </div>
 
   <% else %>
 
     <div data-hook="outside_cart_form">
-      <%= form_for @order, :url => update_cart_path, :html => {:id => 'update-cart'} do |order_form| %>
+      <%= form_for @order, url: update_cart_path, html: {id: 'update-cart'} do |order_form| %>
         <div data-hook="inside_cart_form">
 
           <div data-hook="cart_items">
-            <%= render :partial => 'form', :locals => { :order_form => order_form } %>
+            <%= render '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 => Spree.t(:coupon_code) %>
-            <%= button_tag :class => 'primary', :id => 'update-button' do %>
+            <%= order_form.text_field :coupon_code, size: 10, placeholder: Spree.t(:coupon_code) %>
+            <%= button_tag class: 'primary', id: 'update-button' do %>
               <%= Spree.t(:update) %>
             <% end %>
-            <%= button_tag :class => 'button checkout primary', :id => 'checkout-link', :name => 'checkout' do %>
+            <%= button_tag class: 'button checkout primary', id: 'checkout-link', name: 'checkout' do %>
               <%= Spree.t(:checkout) %>
             <% end %>
           </div>
@@ -34,11 +34,11 @@
     </div>
 
     <div id="empty-cart" data-hook>
-      <%= form_tag empty_cart_path, :method => :put do %>
+      <%= form_tag empty_cart_path, method: :put do %>
         <p id="clear_cart_link" data-hook>
-        <%= submit_tag Spree.t(:empty_cart), :class => 'button gray' %>
+        <%= submit_tag Spree.t(:empty_cart), class: 'button gray' %>
         <%= Spree.t(:or) %>
-        <%= link_to Spree.t(:continue_shopping), products_path, :class => 'continue button gray' %>
+        <%= link_to Spree.t(:continue_shopping), products_path, class: 'continue button gray' %>
         </p>
       <% end %>
     </div>

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

@@ -1,20 +1,20 @@
 <fieldset id="order_summary" data-hook>
-  <legend><%= Spree.t(:order_number, :number => @order.number) %></legend>
+  <legend><%= Spree.t(:order_number, number: @order.number) %></legend>
   <h1><%= accurate_title %></h1>
   <% if order_just_completed?(@order) %>
     <strong><%= Spree.t(:thank_you_for_your_order) %></strong>
   <% end %>
 
   <div id="order" data-hook>
-    <%= render :partial => 'spree/shared/order_details', :locals => { :order => @order } %>
+    <%= render partial: 'spree/shared/order_details', locals: { order: @order } %>
 
     <br class="clear" />
 
     <p data-hook="links">
-      <%= link_to Spree.t(:back_to_store), spree.root_path, :class => "button" %>
+      <%= link_to Spree.t(:back_to_store), spree.root_path, class: "button" %>
       <% unless order_just_completed?(@order) %>
         <% if try_spree_current_user && respond_to?(:account_path) %>
-          <%= link_to Spree.t(:my_account), spree.account_path, :class => "button" %>
+          <%= link_to Spree.t(:my_account), spree.account_path, class: "button" %>
         <% end %>
       <% end %>
     </p>

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

@@ -1,4 +1,4 @@
-<%= form_for :order, :url => populate_orders_path do |f| %>
+<%= form_for :order, url: populate_orders_path do |f| %>
   <div id="inside-product-cart-form" data-hook="inside_product_cart_form" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
 
     <% if @product.variants_and_option_values_for(current_pricing_options).any? %>
@@ -49,8 +49,8 @@
         </div>
 
         <div class="add-to-cart">
-          <%= number_field_tag :quantity, 1, :class => 'title', :min => 1 %>
-          <%= button_tag :class => 'large primary', :id => 'add-to-cart-button', :type => :submit do %>
+          <%= number_field_tag :quantity, 1, class: 'title', min: 1 %>
+          <%= button_tag class: 'large primary', id: 'add-to-cart-button', type: :submit do %>
             <%= Spree.t(:add_to_cart) %>
           <% end %>
         </div>

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

@@ -3,7 +3,7 @@
   <table id="product-properties" class="table-display" data-hook>
     <tbody>
       <% @product_properties.each do |product_property| %>
-        <% css_class = cycle('even', 'odd', :name => "properties") %>
+        <% css_class = cycle('even', 'odd', name: "properties") %>
         <tr class="<%= css_class %>">
           <td><strong><%= product_property.property.presentation %></strong></td>
           <td><%= product_property.value %></td>

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

@@ -1,9 +1,9 @@
 <% content_for :sidebar do %>
   <div data-hook="homepage_sidebar_navigation">
     <% if "spree/products" == params[:controller] && @taxon %>
-      <%= render :partial => 'spree/shared/filters' %>
+      <%= render partial: 'spree/shared/filters' %>
     <% else %>
-      <%= render :partial => 'spree/shared/taxonomies' %>
+      <%= render partial: 'spree/shared/taxonomies' %>
     <% end %>
   </div>
 <% end %>
@@ -15,13 +15,13 @@
     <% if @products.empty? %>
       <h6 class="search-results-title"><%= Spree.t(:no_products_found) %></h6>
     <% else %>
-      <%= render :partial => 'spree/shared/products', :locals => { :products => @products, :taxon => @taxon } %>
+      <%= render partial: 'spree/shared/products', locals: { products: @products, taxon: @taxon } %>
     <% end %>
   </div>
 
 <% else %>
 
   <div data-hook="homepage_products">
-    <%= render :partial => 'spree/shared/products', :locals => { :products => @products, :taxon => @taxon } %>
+    <%= render partial: 'spree/shared/products', locals: { products: @products, taxon: @taxon } %>
   </div>
 <% end %>

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

@@ -7,19 +7,19 @@
 
         <div id="product-images" data-hook="product_images">
           <div id="main-image" data-hook>
-            <%= render :partial => 'image' %>
+            <%= render partial: 'image' %>
           </div>
           <div id="thumbnails" data-hook>
-            <%= render :partial => 'thumbnails' %>
+            <%= render partial: 'thumbnails' %>
           </div>
         </div>
 
         <div data-hook="product_properties">
-          <%= render :partial => 'properties' %>
+          <%= render partial: 'properties' %>
         </div>
 
         <div data-hook="promotions">
-          <%= render :partial => 'promotions' %>
+          <%= render partial: 'promotions' %>
         </div>
 
       </div>
@@ -37,12 +37,12 @@
           </div>
 
           <div id="cart-form" data-hook="cart_form">
-            <%= render :partial => 'cart_form' %>
+            <%= render partial: 'cart_form' %>
           </div>
 
         </div>
 
-        <%= render :partial => 'taxons' %>
+        <%= render partial: 'taxons' %>
 
       </div>
     </div>

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

@@ -1,6 +1,6 @@
 <% filters = @taxon ? @taxon.applicable_filters : [Spree::Core::ProductFilters.all_taxons] %>
 <% unless filters.empty? %>
-  <%= form_tag '', :method => :get, :id => 'sidebar_products_search' do %>
+  <%= form_tag '', method: :get, id: 'sidebar_products_search' do %>
     <%= hidden_field_tag 'per_page', params[:per_page] %>
     <% filters.each do |filter| %>
       <% labels = filter[:labels] || filter[:conds].map {|m,c| [m,m]} %>
@@ -22,6 +22,6 @@
         </ul>
       </div>
     <% end %>
-    <%= submit_tag Spree.t(:search), :name => nil %>
+    <%= submit_tag Spree.t(:search), name: nil %>
   <% end %>
 <% end %>

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

@@ -5,7 +5,7 @@
 <%== meta_data_tags %>
 <%= canonical_tag(current_store.url) %>
 <%= favicon_link_tag 'favicon.ico' %>
-<%= stylesheet_link_tag 'spree/frontend/all', :media => 'screen' %>
+<%= stylesheet_link_tag 'spree/frontend/all', media: 'screen' %>
 <%= csrf_meta_tags %>
 <%= javascript_include_tag 'spree/frontend/all' %>
 <!--[if lt IE 9]>

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

@@ -1,5 +1,5 @@
 <header id="header" class="row" data-hook>
   <figure id="logo" class="columns six" data-hook><%= logo %></figure>
-  <%= render :partial => 'spree/shared/nav_bar' %>
-  <%= render :partial => 'spree/shared/main_nav_bar' if store_menu? %>
+  <%= render partial: 'spree/shared/nav_bar' %>
+  <%= render partial: 'spree/shared/main_nav_bar' if store_menu? %>
 </header>

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

@@ -3,10 +3,10 @@
     <li id="home-link" data-hook><%= link_to Spree.t(:home), spree.root_path %></li>
     <li id="link-to-cart" data-hook>
       <noscript>
-        <%= link_to Spree.t(:cart), '/cart' %>
+        <%= link_to Spree.t(:cart), spree.cart_path %>
       </noscript>
       &nbsp;
     </li>
-    <script>Spree.fetch_cart('<%= j spree.cart_link_url %>')</script>
   </ul>
+  <script>Spree.fetch_cart('<%= j spree.cart_link_path %>')</script>
 </nav>

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

@@ -1,7 +1,7 @@
 <nav id="top-nav-bar" class="columns ten">
   <ul id="nav-bar" class="inline" data-hook>
     <li id="search-bar" data-hook>
-      <%= render :partial => 'spree/shared/search' %>
+      <%= render partial: 'spree/shared/search' %>
     </li>
   </ul>
 </nav>

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

@@ -1,16 +1,16 @@
 <div class="row steps-data">
 
-  <% if order.has_step?("address") %>
+  <% if order.has_checkout_step?("address") %>
 
     <div class="columns alpha four" data-hook="order-bill-address">
       <h6><%= Spree.t(:billing_address) %> <%= link_to "(#{Spree.t('actions.edit')})", checkout_state_path(:address) unless order.completed? %></h6>
-      <%= render :partial => 'spree/shared/address', :locals => { :address => order.bill_address } %>
+      <%= render partial: 'spree/shared/address', locals: { address: order.bill_address } %>
     </div>
 
-    <% if order.has_step?("delivery") %>
+    <% if order.has_checkout_step?("delivery") %>
       <div class="columns alpha four" data-hook="order-ship-address">
         <h6><%= Spree.t(:shipping_address) %> <%= link_to "(#{Spree.t('actions.edit')})", checkout_state_path(:address) unless order.completed? %></h6>
-        <%= render :partial => 'spree/shared/address', :locals => { :address => order.ship_address } %>
+        <%= render partial: 'spree/shared/address', locals: { address: order.ship_address } %>
       </div>
 
       <div class="columns alpha four" data-hook="order-shipment">
@@ -19,16 +19,16 @@
           <% order.shipments.each do |shipment| %>
             <div>
               <i class='fa fa-truck'></i>
-              <%= Spree.t(:shipment_details, :stock_location => shipment.stock_location.name, :shipping_method => shipment.selected_shipping_rate.name) %>
+              <%= Spree.t(:shipment_details, stock_location: shipment.stock_location.name, shipping_method: shipment.selected_shipping_rate.name) %>
             </div>
           <% end %>
         </div>
-        <%= render(:partial => 'spree/shared/shipment_tracking', :locals => {:order => order}) if order.shipped? %>
+        <%= render(partial: 'spree/shared/shipment_tracking', locals: {order: order}) if order.shipped? %>
       </div>
     <% end %>
   <% end %>
 
-  <% if order.has_step?("payment") %>
+  <% if order.has_checkout_step?("payment") %>
     <div class="columns omega four">
       <h6><%= Spree.t(:payment_information) %> <%= link_to "(#{Spree.t('actions.edit')})", checkout_state_path(:payment) unless order.completed? %></h6>
       <div class="payment-info">

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

@@ -1,11 +1,11 @@
 <% @taxons = @taxon && @taxon.parent ? @taxon.parent.children : Spree::Taxon.roots %>
-<%= form_tag spree.products_path, :method => :get do %>
-  <% cache(cache_key_for_taxons) do %>
+<%= form_tag spree.products_path, method: :get do %>
+  <% cache [I18n.locale, @taxons] do %>
     <%= select_tag :taxon,
           options_for_select([[Spree.t(:all_departments), '']] +
                                 @taxons.map {|t| [t.name, t.id]},
                                 @taxon ? @taxon.id : params[:taxon]), 'aria-label' => 'Taxon' %>
   <% end %>
-  <%= search_field_tag :keywords, params[:keywords], :placeholder => Spree.t(:search) %>
-  <%= submit_tag Spree.t(:search), :name => nil %>
+  <%= search_field_tag :keywords, params[:keywords], placeholder: Spree.t(:search) %>
+  <%= submit_tag Spree.t(:search), name: nil %>
 <% end %>

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 %>
-      <h6 class='taxonomy-root'><%= Spree.t(:shop_by_taxonomy, :taxonomy => taxonomy.name) %></h6>
+      <h6 class='taxonomy-root'><%= Spree.t(:shop_by_taxonomy, taxonomy: taxonomy.name) %></h6>
       <%= taxons_tree(taxonomy.root, @taxon, max_level) %>
     <% end %>
   <% end %>

data/config/initializers/assets.rb

@@ -1,8 +1 @@
-Rails.application.config.assets.precompile += %w[
-  spree/frontend/all*
-  jquery.validate/localization/messages_*
-  favicon.ico
-  spree/frontend/cart.png
-  credit_cards/*
-  icons/delete.png
-]
+Rails.application.config.assets.precompile << 'solidus_frontend_manifest.js'

data/config/routes.rb

@@ -11,7 +11,7 @@ Spree::Core::Engine.routes.draw do
   get '/checkout', to: 'checkout#edit', as: :checkout
 
   get '/orders/populate', to: 'orders#populate_redirect'
-  get '/orders/:id/token/:token' => 'orders#show', :as => :token_order
+  get '/orders/:id/token/:token' => 'orders#show', as: :token_order
 
   resources :orders, except: [:index, :new, :create, :destroy] do
     post :populate, on: :collection

data/lib/generators/solidus/views/override_generator.rb

@@ -0,0 +1,46 @@
+require 'rails'
+
+module Solidus
+  module Views
+    class OverrideGenerator < ::Rails::Generators::Base
+      def self.views_folder
+        Spree::Frontend::Engine.root.join('app', 'views', 'spree')
+      end
+
+      VIEWS = Dir.glob(views_folder.join('**', '*'))
+
+      desc "Override solidus frontend views in your app. You can either provide single files or complete folders."
+
+      class_option :only,
+        type: :string,
+        default: nil,
+        desc: "Name of file or folder to copy exclusively. Can be a substring."
+
+      source_root views_folder
+
+      def copy_views
+        views_to_copy.each do |file|
+          next if File.directory?(file)
+          dest_file = Pathname.new(file).relative_path_from(source_dir)
+          copy_file file, Rails.root.join('app', 'views', 'spree', dest_file)
+        end
+      end
+
+      private
+
+      def views_to_copy
+        if @options['only']
+          VIEWS.select do |v|
+            Pathname.new(v).relative_path_from(source_dir).to_s.include?(@options['only'])
+          end
+        else
+          VIEWS
+        end
+      end
+
+      def source_dir
+        self.class.views_folder
+      end
+    end
+  end
+end

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Spree::CheckoutController, type: :controller do
   let(:token) { 'some_token' }
-  let(:user) { stub_model(Spree::LegacyUser) }
+  let(:user) { create(:user) }
   let(:order) { FactoryGirl.create(:order_with_totals) }
 
   let(:address_params) do
@@ -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)
-        get :edit, session: { order_id: 1 }
+        get :edit
       end
     end
   end
@@ -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
@@ -218,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: 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!(available_to_users: false) }
-
-          it 'sets the payment amount' do
-            expect {
-              post :update, params: 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
@@ -288,7 +241,7 @@ describe Spree::CheckoutController, type: :controller do
         end
 
         it "should remove completed order from current_order" do
-          post :update, params: { state: "confirm" }, session: { order_id: "foofah" }
+          post :update, params: { state: "confirm" }
           expect(assigns(:current_order)).to be_nil
           expect(assigns(:order)).to eql controller.current_order
         end
@@ -437,7 +390,7 @@ describe Spree::CheckoutController, type: :controller do
   context "When last inventory item has been purchased" do
     let(:product) { mock_model(Spree::Product, name: "Amazing Object") }
     let(:variant) { mock_model(Spree::Variant) }
-    let(:line_item) { mock_model Spree::LineItem, insufficient_stock?: true, amount: 0 }
+    let(:line_item) { mock_model Spree::LineItem, insufficient_stock?: true, amount: 0, name: "Amazing Item" }
     let(:order) { create(:order) }
 
     before do

data/spec/controllers/spree/orders_controller_spec.rb

@@ -81,20 +81,20 @@ 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")
-          put :update, params: { order: { email: "" } }, session: { order_id: order.id }
+          put :update, params: { order: { email: "" } }
           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
-          put :update, session: { order_id: 1 }
+          put :update
           expect(response).to redirect_to(spree.cart_path)
         end
 
         it "should advance the order if :checkout button is pressed" do
           allow(order).to receive(:update_attributes).and_return true
           expect(order).to receive(:next)
-          put :update, { checkout: true }, { order_id: 1 }
+          put :update, params: { checkout: true }
           expect(response).to redirect_to checkout_state_path('address')
         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)
-        put :update, params: { checkout: "checkout" }, session: { order_id: 1 }
+        put :update, params: { checkout: "checkout" }
         expect(order.did_transition).to be true
       end
     end

data/spec/features/caching/products_spec.rb

@@ -13,7 +13,6 @@ describe 'products', type: :feature, caching: true do
     assert_written_to_cache("views/en/USD/spree/products/all--#{product.updated_at.utc.to_s(:number)}")
     assert_written_to_cache("views/en/USD/spree/products/#{product.id}-#{product.updated_at.utc.to_s(:number)}")
     assert_written_to_cache("views/en/spree/taxonomies/#{taxonomy.id}")
-    assert_written_to_cache("views/en/taxons/#{taxon.updated_at.utc.to_i}")
 
     clear_cache_events
   end

data/spec/features/caching/taxons_spec.rb

@@ -8,7 +8,6 @@ describe 'taxons', type: :feature, caching: true do
     # warm up the cache
     visit spree.root_path
     assert_written_to_cache("views/en/spree/taxonomies/#{taxonomy.id}")
-    assert_written_to_cache("views/en/taxons/#{taxon.updated_at.utc.to_i}")
 
     clear_cache_events
   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
@@ -189,7 +188,9 @@ describe "Checkout", type: :feature, inaccessible: true do
     end
 
     before do
+      user.wallet.add(credit_card)
       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)