spree_auth_devise 4.0.1 → 4.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a4c46da7628319c592ae1a9675173fd8add8ca34dbb6fd7d5ffdb92345207c2
-  data.tar.gz: e6d9d38bc3e2fa09ff21fc024193160d04f2ba89c4439d8703b6a19f058a6fcd
+  metadata.gz: 11fab6b968334f977554a9a95b6a80e37047b42add498201ea0db74ca0701a6a
+  data.tar.gz: cab55c1d0e6344a72c5e11ee8621f43fce3787d99e412515bf9f8059a1727e7c
 SHA512:
-  metadata.gz: 7f0c22c01027c613ab423d73af40ce43f02d4a14e26c76865ecd5a381943c2049366c52f2386697c4fa6a394c15d10b91da06b47d563a6f0081e897e948f77a5
-  data.tar.gz: 235a7977bb12281f9c3a0f00c0b99b59f7ee63d609b34e413ab530b1e2fde43384bc82e0dce91b784abf8f3518ae72a61d022916ceaa110394466e1aff854f39
+  metadata.gz: 83bfc852ef5ac9cd03c19f6a9f8bcbdd17aac744d565102777f4ef1b2910f53d80b6663eee3d7f1dce2dc6f66f0e553270f366086f8e303963f995b72b9d8598
+  data.tar.gz: 66b5fe7c4364a068ee0b2169713480afb3b0064cc3c883f0ddbf6ee6086cd9b5caac2058b2c5c2cab9da82230a6441659df89ce071bc973a2278fd50a73e5341

data/.circleci/config.yml

@@ -0,0 +1,41 @@
+version: 2
+
+jobs:
+  update_staging_repository:
+    docker:
+      - image: circleci/ruby:2.6.3
+    steps:
+      - add_ssh_keys:
+          fingerprints:
+            - 54:50:5e:4e:80:6d:2e:26:43:c6:99:bd:39:b2:71:dc
+      - run: mkdir -p ~/.ssh
+      - run: ssh-keyscan -H github.com >> ~/.ssh/known_hosts
+      - run: ssh-add -D
+      - run: ssh-add ~/.ssh/id_rsa_54505e4e806d2e2643c699bd39b271dc
+      - run: git clone -b master git@github.com:spark-solutions/spree-designs.git
+      - run: gem install bundler -v 1.17.3
+      - run:
+          command: bundle update spree_auth_devise
+          working_directory: ~/project/spree-designs
+      - run:
+          command: |
+            git config user.name 'AutoDeploy'
+            git config user.email 'autodeploy@sparksolutions.co'
+          working_directory: ~/project/spree-designs
+      - run:
+          command: |
+            git add -A
+            git commit -m "Auto-commit v#${CIRCLE_BUILD_NUM}"
+          working_directory: ~/project/spree-designs
+      - run:
+          command: git push origin master
+          working_directory: ~/project/spree-designs
+
+workflows:
+  version: 2
+  update_staging_repository:
+    jobs:
+      - update_staging_repository:
+          filters:
+            branches:
+              only: master

data/.gitignore

@@ -20,3 +20,4 @@ public/spree
 .ruby-gemset
 gemfiles/*.gemfile.lock
 *.gem
+.bundle

data/.travis.yml

@@ -17,31 +17,18 @@ language: ruby
 
 rvm:
   - 2.5.1
-  - 2.4.4
-  - 2.3.8
+  # - 2.6.5
 
 gemfile:
-  - gemfiles/spree_3_5.gemfile
-  - gemfiles/spree_3_7.gemfile
-  - gemfiles/spree_4_0.gemfile
+  - gemfiles/spree_4_1.gemfile
   - gemfiles/spree_master.gemfile
 
 matrix:
     allow_failures:
       - gemfile: gemfiles/spree_master.gemfile
-    exclude:
-      - rvm: 2.3.8
-        gemfile: gemfiles/spree_4_0.gemfile
-      - rvm: 2.4.4
-        gemfile: gemfiles/spree_4_0.gemfile
-      - rvm: 2.3.8
-        gemfile: gemfiles/spree_master.gemfile
-      - rvm: 2.4.4
-        gemfile: gemfiles/spree_master.gemfile
-      - rvm: 2.5.1
-        gemfile: gemfiles/spree_3_5.gemfile
 
 before_install:
+  - gem update bundler
   - mysql -u root -e "GRANT ALL ON *.* TO 'travis'@'%';"
   - wget -N https://chromedriver.storage.googleapis.com/2.35/chromedriver_linux64.zip -P ~/
   - unzip ~/chromedriver_linux64.zip -d ~/

data/Appraisals

@@ -1,20 +1,9 @@
-appraise 'spree-3-5' do
-  gem 'spree', '~> 3.5.0'
-  gem 'rails-controller-testing'
-end
-
-appraise 'spree-3-7' do
-  gem 'sass-rails'
-  gem 'spree', '~> 3.7.0'
-  gem 'rails-controller-testing'
-end
-
-appraise 'spree-4-0' do
-  gem 'spree', '~> 4.0.0.rc2'
+appraise 'spree-4-1' do
   gem 'rails-controller-testing'
+  gem 'spree', github: 'spree/spree', branch: 'master'
 end
 
 appraise 'spree-master' do
-  gem 'spree', github: 'spree/spree', branch: 'master'
   gem 'rails-controller-testing'
+  gem 'spree', github: 'spree/spree', branch: 'master'
 end

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem "rails-controller-testing"
+gem 'rails-controller-testing'
 gem 'spree', github: 'spree/spree', branch: 'master'
 
 gemspec

data/app/controllers/spree/user_confirmations_controller.rb

@@ -6,6 +6,8 @@ class Spree::UserConfirmationsController < Devise::ConfirmationsController
   include Spree::Core::ControllerHelpers::Order
   include Spree::Core::ControllerHelpers::Store
 
+  before_action :set_current_order
+  
   protected
 
   def after_confirmation_path_for(resource_name, resource)

data/app/controllers/spree/user_passwords_controller.rb

@@ -10,6 +10,8 @@ class Spree::UserPasswordsController < Devise::PasswordsController
     include SpreeI18n::ControllerLocaleHelper
   end
 
+  before_action :set_current_order
+
   # Overridden due to bug in Devise.
   #   respond_with resource, :location => new_session_path(resource_name)
   # is generating bad url /session/new.user

data/app/controllers/spree/user_registrations_controller.rb

@@ -11,6 +11,7 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
   end
 
   before_action :check_permissions, only: [:edit, :update]
+  before_action :set_current_order
   skip_before_action :require_no_authentication
 
   # GET /resource/sign_up
@@ -75,9 +76,17 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
     'devise.user_registrations'
   end
 
+  def after_sign_up_path_for(resource)
+    after_sign_in_redirect(resource) if is_navigational_format?
+  end
+
   private
 
   def spree_user_params
     params.require(:spree_user).permit(Spree::PermittedAttributes.user_attributes)
   end
+
+  def after_sign_in_redirect(resource_or_scope)
+    stored_location_for(resource_or_scope) || account_path
+  end
 end

data/app/controllers/spree/user_sessions_controller.rb

@@ -10,6 +10,8 @@ class Spree::UserSessionsController < Devise::SessionsController
     include SpreeI18n::ControllerLocaleHelper
   end
 
+  before_action :set_current_order
+
   def create
     authenticate_spree_user!
 
@@ -17,7 +19,7 @@ class Spree::UserSessionsController < Devise::SessionsController
       respond_to do |format|
         format.html {
           flash[:success] = Spree.t(:logged_in_succesfully)
-          redirect_back_or_default(after_sign_in_path_for(spree_current_user))
+          redirect_back_or_default(after_sign_in_redirect(spree_current_user))
         }
         format.js {
           render json: { user: spree_current_user,
@@ -54,4 +56,24 @@ class Spree::UserSessionsController < Devise::SessionsController
     redirect_to(session["spree_user_return_to"] || default)
     session["spree_user_return_to"] = nil
   end
+
+  def after_sign_in_redirect(resource_or_scope)
+    stored_location_for(resource_or_scope) || account_path
+  end
+
+  def respond_to_on_destroy
+    # We actually need to hardcode this as Rails default responder doesn't
+    # support returning empty response on GET request
+    respond_to do |format|
+      format.all { head :no_content }
+      format.any(*navigational_formats) { redirect_to after_sign_out_redirect(resource_name) }
+    end
+  end
+
+  def after_sign_out_redirect(resource_or_scope)
+    scope = Devise::Mapping.find_scope!(resource_or_scope)
+    router_name = Devise.mappings[scope].router_name
+    context = router_name ? send(router_name) : self
+    context.respond_to?(:login_path) ? context.login_path : "/"
+  end
 end

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

@@ -1,22 +1,25 @@
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @spree_user } %>
-<div class="col-lg-6 offset-lg-3">
-  <div class="card mb-3">
-    <div class="card-header">
-      <h3 class="card-title mb-0 h6"><%= Spree.t(:change_your_password) %></h3>
-    </div>
-    <div class="card-body">
-      <%= form_for @spree_user, :as => :spree_user, :url => spree.update_password_path, :method => :put do |f| %>
-        <div class="form-group">
-          <%= f.label :password, Spree.t(:password) %>
-          <%= f.password_field :password, :class => "form-control" %>
-        </div>
-        <div class="form-group">
-          <%= f.label :password_confirmation, Spree.t(:confirm_password) %>
-          <%= f.password_field :password_confirmation, :class => "form-control" %>
+
+<div class="container user-passwords">
+  <div class="row">
+    <div class="col-lg-6 offset-lg-3">
+      <div class="card mb-3 user-passwords-no-border">
+        <h3 class="spree-mb-large spree-mt-large spree-header"><%= Spree.t(:change_your_password) %></h3>
+        <div class="card-body">
+          <%= form_for @spree_user, as: :spree_user, url: spree.update_password_path, method: :put do |f| %>
+            <div class="form-group">
+              <%= f.label :password, Spree.t(:password), class: 'spree-flat-label' %>
+              <%= f.password_field :password, class: "spree-flat-input" %>
+            </div>
+            <div class="form-group">
+              <%= f.label :password_confirmation, Spree.t(:confirm_password), class: 'spree-flat-label' %>
+              <%= f.password_field :password_confirmation, class: "spree-flat-input" %>
+            </div>
+            <%= f.hidden_field :reset_password_token %>
+            <%= f.submit Spree.t(:update), class: 'btn btn-primary btn-block spree-btn mt-2' %>
+          <% end %>
         </div>
-        <%= f.hidden_field :reset_password_token %>
-        <%= f.submit Spree.t(:update), :class => 'btn btn-lg btn-success btn-block' %>
-      <% end %>
+      </div>
     </div>
   </div>
 </div>

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

@@ -1,21 +1,24 @@
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @spree_user } %>
-<div class="col-lg-6 offset-lg-3" id="forgot-password">
-  <div class="card mb-3">
-    <div class="card-header">
-      <h3 class="card-title mb-0 h6"><%= Spree.t(:forgot_password) %></h3>
-    </div>
-    <div class="card-body">
-      <p><%= Spree.t(:instructions_to_reset_password) %></p>
 
-      <%= form_for Spree::User.new, :as => :spree_user, :url => spree.reset_password_path do |f| %>
-        <div class="form-group">
-          <%= f.label :email, Spree.t(:email) %>
-          <%= f.email_field :email, :class => "form-control" %>
-        </div>
-        <div>
-          <%= f.submit Spree.t(:reset_password), :class => 'btn btn-lg btn-success btn-block' %>
+<div class="container user-passwords">
+  <div class="row">
+    <div class="col-lg-6 offset-lg-3" id="forgot-password">
+      <div class="card mb-3 user-passwords-no-border">
+        <h3 class="spree-mb-large spree-mt-large spree-header"><%= Spree.t(:forgot_password) %></h3>
+        <div class="card-body">
+          <p><%= Spree.t(:instructions_to_reset_password) %></p>
+
+          <%= form_for Spree::User.new, as: :spree_user, url: spree.reset_password_path do |f| %>
+            <div class="form-group">
+              <%= f.label :email, Spree.t(:email), class: 'spree-flat-label' %>
+              <%= f.email_field :email, class: "spree-flat-input" %>
+            </div>
+            <div>
+              <%= f.submit Spree.t(:reset_password), class: 'btn btn-primary btn-block spree-btn mt-2' %>
+            </div>
+          <% end %>
         </div>
-      <% end %>
+      </div>
     </div>
   </div>
 </div>

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

@@ -1,22 +1,17 @@
 <% @body_id = 'signup' %>
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @user } %>
 <div class="col-lg-6 offset-lg-3">
-  <div class="card mb-3">
-      <div class="card-header">
-        <h3 class="card-title mb-0 h6"><%= Spree.t(:new_customer) %></h3>
-      </div>
-      <div id="new-customer" class="card-body" data-hook="login">
-          <%= form_for resource, :as => :spree_user, :url => spree.registration_path do |f| %>
-            <div data-hook="signup_inside_form">
-              <%= render :partial => 'spree/shared/user_form', :locals => { :f => f } %>
-              <div><%= f.submit Spree.t(:create), :class => 'btn btn-lg btn-success btn-block' %></div>
-            </div>
-          <% end %>
-          <div class="text-center">
-            <%= Spree.t(:or) %>
-              <%= link_to Spree.t(:login_as_existing), spree.login_path %>
-          </div>
-          <div data-hook="login_extras"></div>
+  <h3 class="spree-header spree-mb-large spree-mt-large"><%= Spree.t(:new_customer) %></h3>
+  <div id="new-customer" data-hook="login">
+    <%= form_for resource, as: :spree_user, url: spree.registration_path do |f| %>
+      <div data-hook="signup_inside_form">
+        <%= render partial: 'spree/shared/user_form', locals: { f: f, remember_me_field: true } %>
+        <div><%= f.submit Spree.t(:sign_up), class: 'btn btn-primary btn-block spree-btn mb-5' %></div>
       </div>
+    <% end %>
+
+    <h3 class="spree-header header-sm spree-mt-medium mb-3 mb-sm-4 mb-xl-4"><%= Spree.t('already_have_account') %></h3>
+    <%= link_to Spree.t(:log_in), spree.login_path, class: 'btn btn-block btn-outline-primary spree-btn spree-mb-large' %>
+    <div data-hook="login_extras"></div>
   </div>
 </div>

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

@@ -1,17 +1,16 @@
 <% @body_id = 'login' %>
-<div class="col-lg-6 <%= request.path == spree.login_path ? "offset-lg-3" : "" %>">
-  <div class="card mb-3">
-      <div class="card-header">
-        <h3 class="card-title mb-0 h6"><%= Spree.t(:login_as_existing) %></h3>
-      </div>
-      <div id="existing-customer" class="card-body" data-hook="login">
-          <%= render :partial => 'spree/shared/login' %>
-          <div class="text-center">
-            <%= Spree.t(:or) %>
-                <%= link_to Spree.t(:create_a_new_account), spree.signup_path %> |
-                <%= link_to Spree.t(:forgot_password), spree.recover_password_path %>
-          </div>
+<div class="container user-sessions user-sessions-new">
+  <div class="row">
+    <div class="col-lg-6 offset-lg-3">
+      <div class="mb-3">
+        <div id="existing-customer" data-hook="login">
+          <%= render partial: 'spree/shared/login' %>
           <div data-hook="login_extras"></div>
+        </div>
+        <div class="col-lg-11 mx-auto" data-hook="registration">
+          <%= render partial: 'spree/shared/registration', locals: { registration_button: 'registration-button' } %>
+        </div>
       </div>
+    </div>
   </div>
 </div>

data/config/routes.rb

@@ -27,7 +27,6 @@ Spree::Core::Engine.add_routes do
   get '/checkout/registration' => 'checkout#registration', :as => :checkout_registration
   put '/checkout/registration' => 'checkout#update_registration', :as => :update_checkout_registration
 
-  get '/account_link' => 'store#account_link'
   resource :account, controller: 'users'
 
   namespace :admin, path: Spree.admin_path do

data/gemfiles/{spree_3_5.gemfile → spree_4_1.gemfile}

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails-controller-testing"
-gem "spree", "~> 3.5.0"
+gem "spree", github: "spree/spree", branch: "master"
 
 gemspec path: "../"

data/lib/controllers/frontend/spree/users_controller.rb

@@ -1,11 +1,11 @@
 class Spree::UsersController < Spree::StoreController
-skip_before_action :set_current_order, only: :show
+  before_action :set_current_order, except: :show
+  prepend_before_action :load_object, only: [:show, :edit, :update]
   prepend_before_action :authorize_actions, only: :new
 
   include Spree::Core::ControllerHelpers
 
   def show
-    load_object
     @orders = @user.orders.complete.order('completed_at desc')
   end
 
@@ -23,12 +23,7 @@ skip_before_action :set_current_order, only: :show
     end
   end
 
-  def edit
-    load_object
-  end
-
   def update
-    load_object
     if @user.update(user_params)
       if params[:user][:password].present?
         # this logic needed b/c devise wants to log us out after password changes

data/lib/generators/spree/auth/install/install_generator.rb

@@ -10,10 +10,6 @@ module Spree
           paths.flatten
         end
 
-        def add_javascripts
-          append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require spree/frontend/spree_auth\n"
-        end
-
         def generate_devise_key
           return if ENV['CI']
           template 'config/initializers/devise.rb', 'config/initializers/devise.rb'

data/lib/spree/testing_support/auth_helpers.rb

@@ -0,0 +1,36 @@
+module Spree
+  module TestingSupport
+    module AuthHelpers
+      def log_in(email:, password:, remember_me: true)
+        visit spree.login_path
+
+        fill_in 'Email', with: email
+        fill_in 'Password', with: password
+
+        # Regression test for #1257
+        first('label', text: 'Remember me').click if remember_me
+        click_button 'Log in'
+
+        expect(page).to have_content 'Logged in successfully'
+      end
+
+      def log_out
+        show_user_menu
+        click_link 'LOG OUT'
+
+        expect(page).to have_content 'Signed out successfully'
+      end
+
+      def show_user_menu
+        find("button[aria-label='Show user menu']").click
+      end
+
+      def show_user_account
+        within '#nav-bar' do
+          show_user_menu
+          click_link 'MY ACCOUNT'
+        end
+      end
+    end
+  end
+end

data/lib/spree/testing_support/checkout_helpers.rb

@@ -0,0 +1,24 @@
+module Spree
+  module TestingSupport
+    module CheckoutHelpers
+      def fill_in_address
+        address = 'order_bill_address_attributes'
+        fill_in "#{address}_firstname", with: 'Ryan'
+        fill_in "#{address}_lastname", with: 'Bigg'
+        fill_in "#{address}_address1", with: '143 Swan Street'
+        fill_in "#{address}_city", with: 'Richmond'
+        select country.name, from: "#{address}_country_id"
+        select state.name, from: "#{address}_state_id"
+        fill_in "#{address}_zipcode", with: '12345'
+        fill_in "#{address}_phone", with: '(555) 555-5555'
+      end
+
+      def fill_in_credit_card_info(invalid: false)
+        fill_in 'name_on_card', with: 'Spree Commerce'
+        fill_in 'card_number', with: invalid ? '123' : '4111 1111 1111 1111'
+        fill_in 'card_expiry', with: '12 / 24'
+        fill_in 'card_code', with: '123'
+      end
+    end
+  end
+end

data/spec/controllers/spree/admin/orders_controller_spec.rb

@@ -5,7 +5,7 @@ module Spree
 
       context '#authorize_admin' do
         it 'grants access to users with an admin role' do
-          spree_get :new
+          get :new
           expect(response).to redirect_to spree.cart_admin_order_path(Order.last)
         end
       end

data/spec/controllers/spree/admin/user_sessions_controller_spec.rb

@@ -2,7 +2,7 @@ RSpec.describe Spree::Admin::UserSessionsController, type: :controller do
   before { @request.env['devise.mapping'] = Devise.mappings[:spree_user] }
 
   describe '#authorization_failure' do
-    subject { spree_get :authorization_failure }
+    subject { get :authorization_failure }
 
     context 'user signed in' do
       before { allow(controller).to receive(:spree_current_user) { build_stubbed(:user) } }

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -19,14 +19,14 @@ RSpec.describe Spree::CheckoutController, type: :controller do
         before { allow(controller).to receive(:spree_current_user) { user } }
 
         it 'proceeds to the first checkout step' do
-          spree_get :edit, { state: 'address' }
+          get :edit, params: { state: 'address' }
           expect(response).to render_template :edit
         end
       end
 
       context 'when authenticated as guest' do
         it 'redirects to registration step' do
-          spree_get :edit, { state: 'address' }
+          get :edit, params: { state: 'address' }
           expect(response).to redirect_to spree.checkout_registration_path
         end
       end
@@ -42,14 +42,14 @@ RSpec.describe Spree::CheckoutController, type: :controller do
         before { allow(controller).to receive(:spree_current_user) { user } }
 
         it 'proceeds to the first checkout step' do
-          spree_get :edit, { state: 'address' }
+          get :edit, params: { state: 'address' }
           expect(response).to render_template :edit
         end
       end
 
       context 'when authenticated as guest' do
         it 'proceeds to the first checkout step' do
-          spree_get :edit, { state: 'address' }
+          get :edit, params: { state: 'address' }
           expect(response).to render_template :edit
         end
       end
@@ -81,9 +81,8 @@ RSpec.describe Spree::CheckoutController, type: :controller do
           else
             request.cookie_jar.signed[:guest_token] = 'ABC'
           end
-          spree_post :update, { state: 'confirm' }
+          post :update, params: { state: 'confirm' }
           expect(response).to redirect_to spree.order_path(order)
-          expect(flash.notice).to eq Spree.t(:order_processed_successfully)
         end
       end
 
@@ -99,7 +98,7 @@ RSpec.describe Spree::CheckoutController, type: :controller do
         end
 
         it 'redirects to the standard order view' do
-          spree_post :update, { state: 'confirm' }
+          post :update, params: { state: 'confirm' }
           expect(response).to redirect_to spree.order_path(order)
         end
       end
@@ -110,7 +109,7 @@ RSpec.describe Spree::CheckoutController, type: :controller do
     it 'does not check registration' do
       allow(controller).to receive(:check_authorization)
       expect(controller).not_to receive(:check_registration)
-      spree_get :registration
+      get :registration
     end
 
     it 'checks if the user is authorized for :edit' do
@@ -120,7 +119,7 @@ RSpec.describe Spree::CheckoutController, type: :controller do
       else
         request.cookie_jar.signed[:guest_token] = token
       end
-      spree_get :registration, {}
+      get :registration, params: {}
     end
   end
 
@@ -131,12 +130,12 @@ RSpec.describe Spree::CheckoutController, type: :controller do
       controller.stub :check_authorization
       order.stub update: true
       controller.should_not_receive :check_registration
-      spree_put :update_registration, { order: {} }
+      put :update_registration, params: { order: {} }
     end
 
     it 'renders the registration view if unable to save' do
       allow(controller).to receive(:check_authorization)
-      spree_put :update_registration, { order: { email: 'invalid' } }
+      put :update_registration, params: { order: { email: 'invalid' } }
       expect(flash[:error]).to eq I18n.t(:email_is_invalid, scope: [:errors, :messages])
       expect(response).to render_template :registration
     end
@@ -144,7 +143,7 @@ RSpec.describe Spree::CheckoutController, type: :controller do
     it 'redirects to the checkout_path after saving' do
       allow(order).to receive(:update) { true }
       allow(controller).to receive(:check_authorization)
-      spree_put :update_registration, { order: { email: 'jobs@spreecommerce.com' } }
+      put :update_registration, params: { order: { email: 'jobs@spreecommerce.com' } }
       expect(response).to redirect_to spree.checkout_state_path(:address)
     end
 
@@ -156,7 +155,7 @@ RSpec.describe Spree::CheckoutController, type: :controller do
       end
       allow(order).to receive(:update) { true }
       expect(controller).to receive(:authorize!).with(:edit, order, token)
-      spree_put :update_registration, { order: { email: 'jobs@spreecommerce.com' } }
+      put :update_registration, params: { order: { email: 'jobs@spreecommerce.com' } }
     end
   end
 end

data/spec/controllers/spree/products_controller_spec.rb

@@ -2,7 +2,7 @@ RSpec.describe Spree::ProductsController, type: :controller do
   let!(:product) { create(:product, available_on: 1.year.from_now) }
   let!(:user) { build_stubbed(:user, spree_api_key: 'fake') }
 
-  subject(:request) { spree_get :show, id: product.to_param }
+  subject(:request) { get :show, params: { id: product.to_param }}
 
   before do
     allow(controller).to receive(:before_save_new_order)