spree_auth_devise 3.3.3 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e902c04485979a2fa5edef1ee2030009f72b7bdd
-  data.tar.gz: 1693dcc6df3d9d607141148bdf046d12d94e1486
+  metadata.gz: 72b63b113f23fe2ff681bffdd430e616de92a4da
+  data.tar.gz: 253e30bae89b04b54f15ea8bdf3bc1f48140b1cf
 SHA512:
-  metadata.gz: 62a8aa9e430c10648caa3ad8f0fc67ca7c34c2b5c5750004cbabf2fbaad9ded6d0c57f69d3ed2bcd1bbbf10c3a8011de9b9d1ac4631debe77a8ff66e17948ed4
-  data.tar.gz: 19dab7108baddae24a3d3f4acba1c0d5d07ae3f339a9b4e44eebe3bf03e0d403e4c588df0b47d5e58e70ac5ac20899a15a8c9f2403b31cafae1b1e1e225d976a
+  metadata.gz: 78c9dd93e1af15d08a44ce4a0ad8b09f5e592fc1a7d6c7468883b2db908c7d7f3f68636899d265fc4da7ec49728b9801d739fb74561aadb1f669d4f73ccd1d9a
+  data.tar.gz: 5c295a34dbe244c6688bc5a37e4116c3fe64adaa54e17cc6a309261f486c5de23853de96b750edad8533134053fccc0007044627ef3ff747fec754a394df584a

data/.travis.yml

@@ -5,6 +5,9 @@ script:
   - bundle exec rake test_app
   - bundle exec rake spec
 
+addons:
+  chrome: stable
+
 env:
   - DB=mysql
   - DB=postgres
@@ -12,13 +15,14 @@ env:
 language: ruby
 
 rvm:
-  - 2.4.2
-  - 2.3.1
-  - 2.2.7
+  - 2.5.1
+  - 2.4.4
+  - 2.3.7
 
 gemfile:
-  - gemfiles/spree_3_1.gemfile
   - gemfiles/spree_3_2.gemfile
+  - gemfiles/spree_3_5.gemfile
+  - gemfiles/spree_3_6.gemfile
   - gemfiles/spree_master.gemfile
 
 matrix:
@@ -27,3 +31,9 @@ matrix:
 
 before_install:
   - 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 ~/
+  - rm ~/chromedriver_linux64.zip
+  - sudo mv -f ~/chromedriver /usr/local/share/
+  - sudo chmod +x /usr/local/share/chromedriver
+  - sudo ln -s /usr/local/share/chromedriver /usr/local/bin/chromedriver

data/Appraisals

@@ -1,12 +1,18 @@
-appraise 'spree-3-1' do
-  gem 'spree', '~> 3.1.0'
-end
-
 appraise 'spree-3-2' do
   gem 'spree', '~> 3.2.0'
   gem 'rails-controller-testing'
 end
 
+appraise 'spree-3-5' do
+  gem 'spree', '~> 3.5.0'
+  gem 'rails-controller-testing'
+end
+
+appraise 'spree-3-6' do
+  gem 'spree', '~> 3.6.0'
+  gem 'rails-controller-testing'
+end
+
 appraise 'spree-master' do
   gem 'spree', github: 'spree/spree', branch: 'master'
   gem 'rails-controller-testing'

data/README.md

@@ -115,6 +115,14 @@ Inside of your host application you can then use CanCan like you normally would.
 
 This methodology can also be used by gems that extend spree and want/need to add permissions.
 
+### Ruby 2.5 issues
+
+If you encounter issues when using Ruby 2.5, please run:
+
+```
+bundle update devise
+```
+
 ## Testing
 
 You need to do a quick one-time creation of a test application and then you can use it to run the tests.

data/app/controllers/metal_decorator.rb

@@ -1,6 +1,10 @@
 # For the API
 ActionController::Metal.class_eval do
   def spree_current_user
-    @spree_current_user ||= env['warden'].user
+    @spree_current_user ||=  if defined? env
+                               env['warden'].user
+                             else
+                               request.env['warden'].user
+                             end
   end
 end

data/app/models/spree/auth_configuration.rb

@@ -3,5 +3,6 @@ module Spree
     preference :registration_step, :boolean, default: true
     preference :signout_after_password_change, :boolean, default: true
     preference :confirmable, :boolean, default: false
+    preference :validatable, :boolean, default: true
   end
 end

data/app/models/spree/user.rb

@@ -5,8 +5,9 @@ module Spree
     include UserPaymentSource
 
     devise :database_authenticatable, :registerable, :recoverable,
-           :rememberable, :trackable, :validatable, :encryptable, encryptor: 'authlogic_sha512'
+           :rememberable, :trackable, :encryptable, encryptor: 'authlogic_sha512'
     devise :confirmable if Spree::Auth::Config[:confirmable]
+    devise :validatable if Spree::Auth::Config[:validatable]
 
     acts_as_paranoid
     after_destroy :scramble_email_and_password

data/config/initializers/warden.rb

@@ -1,14 +1,20 @@
 # Merges users orders to their account after sign in and sign up.
 Warden::Manager.after_set_user except: :fetch do |user, auth, _opts|
-  if auth.cookies.signed[:guest_token].present?
-    if user.is_a?(Spree::User)
-      Spree::Order.incomplete.where(guest_token: auth.cookies.signed[:guest_token], user_id: nil).each do |order|
-        order.associate_user!(user)
-      end
+  guest_token = auth.cookies.signed[:guest_token]
+  token       = auth.cookies.signed[:token]
+
+  if token.present? && user.is_a?(Spree::User)
+    Spree::Order.incomplete.where(token: token, user_id: nil).each do |order|
+      order.associate_user!(user)
+    end
+  elsif guest_token.present? && user.is_a?(Spree::User)
+    Spree::Order.incomplete.where(guest_token: guest_token, user_id: nil).each do |order|
+      order.associate_user!(user)
     end
   end
 end
 
 Warden::Manager.before_logout do |_user, auth, _opts|
-  auth.cookies.delete :guest_token
+  auth.cookies.delete(:guest_token)
+  auth.cookies.delete(:token)
 end

data/gemfiles/spree_3_2.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "spree", "~> 3.2.0"
 gem "rails-controller-testing"
+gem "spree", "~> 3.2.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/spree_3_5.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails-controller-testing"
+gem "spree", "~> 3.5.0"
+
+gemspec path: "../"

data/gemfiles/spree_3_6.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails-controller-testing"
+gem "spree", "~> 3.6.0"
+
+gemspec path: "../"

data/gemfiles/spree_master.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "spree", :github => "spree/spree", :branch => "master"
 gem "rails-controller-testing"
+gem "spree", github: "spree/spree", branch: "master"
 
-gemspec :path => "../"
+gemspec path: "../"

data/lib/controllers/backend/spree/admin/user_sessions_controller.rb

@@ -28,7 +28,11 @@ class Spree::Admin::UserSessionsController < Devise::SessionsController
     end
   end
 
-  def authorization_failure; end
+  def authorization_failure
+    return if try_spree_current_user
+    store_location
+    return redirect_to spree.admin_login_path
+  end
 
   protected
 

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

@@ -9,7 +9,7 @@ Spree::CheckoutController.class_eval do
 
   def update_registration
     if order_params[:email] =~ Devise.email_regexp && current_order.update_attribute(:email, order_params[:email])
-      redirect_to spree.checkout_path
+      redirect_to spree.checkout_state_path(:address)
     else
       flash[:error] = t(:email_is_invalid, scope: [:errors, :messages])
       @user = Spree::User.new

data/lib/views/frontend/spree/user_sessions/new.html.erb

@@ -5,16 +5,13 @@
         <h3 class="panel-title"><%= Spree.t(:login_as_existing) %></h3>
     </div>
       <div id="existing-customer" class="panel-body" data-hook="login">
-          <% if flash[:alert] %>
-            <div class="alert alert-danger"><%= flash[:alert] %></div>
-          <% end %>
           <%= render :partial => 'spree/shared/login' %>
           <div class="text-center">
-            <%= Spree.t(:or) %> 
+            <%= 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 data-hook="login_extras"></div>
       </div>
   </div>
-</div>
+</div>

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

@@ -0,0 +1,17 @@
+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 }
+
+    context 'user signed in' do
+      before { allow(controller).to receive(:spree_current_user) { build_stubbed(:user) } }
+
+      it { is_expected.to render_template 'authorization_failure' }
+    end
+
+    context 'user not signed in' do
+      it { is_expected.to redirect_to spree.admin_login_path }
+    end
+  end
+end

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -127,7 +127,7 @@ RSpec.describe Spree::CheckoutController, type: :controller do
       allow(order).to receive(:update_attributes) { true }
       allow(controller).to receive(:check_authorization)
       spree_put :update_registration, { order: { email: 'jobs@spreecommerce.com' } }
-      expect(response).to redirect_to spree.checkout_path
+      expect(response).to redirect_to spree.checkout_state_path(:address)
     end
 
     it 'checks if the user is authorized for :edit' do

data/spec/controllers/spree/products_controller_spec.rb

@@ -1,20 +1,31 @@
 RSpec.describe Spree::ProductsController, type: :controller do
   let!(:product) { create(:product, available_on: 1.year.from_now) }
-  let!(:user)    { build(:user, spree_api_key: 'fake') }
+  let!(:user) { build_stubbed(:user, spree_api_key: 'fake') }
 
-  it 'allows admins to view non-active products' do
+  subject(:request) { spree_get :show, id: product.to_param }
+
+  before do
     allow(controller).to receive(:before_save_new_order)
     allow(controller).to receive(:spree_current_user) { user }
+  end
+
+  it 'allows admins to view non-active products' do
     allow(user).to receive(:has_spree_role?) { true }
-    spree_get :show, id: product.to_param
+
+    request
     expect(response.status).to eq(200)
   end
 
   it 'cannot view non-active products' do
-    allow(controller).to receive(:before_save_new_order)
-    allow(controller).to receive(:spree_current_user) { user }
     allow(user).to receive(:has_spree_role?) { false }
-    spree_get :show, id: product.to_param
-    expect(response.status).to eq(404)
+
+    # this behaviour was introduced in rails 5.1 & Spree 3.5
+    # https://github.com/spree/spree/commit/acf52960f5b9582cdfe01f0cb563766b44aabbd5
+    if Spree.version.to_f > 3.4
+      expect { request }.to raise_error(ActiveRecord::RecordNotFound)
+    else
+      request
+      expect(response.status).to eq(404)
+    end
   end
 end

data/spec/controllers/spree/user_sessions_controller_spec.rb

@@ -5,6 +5,58 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
 
   context "#create" do
     context "using correct login information" do
+      if Gem.loaded_specs['spree_core'].version >= Gem::Version.create('3.7.0')
+        #regression tests for https://github.com/spree/spree_auth_devise/pull/438
+        context 'with a token present' do
+          before do
+            request.cookie_jar.signed[:token] = 'ABC'
+          end
+
+          it 'assigns orders with the correct token and no user present' do
+            order = create(:order, email: user.email, token: 'ABC', user_id: nil, created_by_id: nil)
+            spree_post :create, spree_user: { email: user.email, password: 'secret' }
+
+            order.reload
+            expect(order.user_id).to eq user.id
+            expect(order.created_by_id).to eq user.id
+          end
+
+          it 'assigns orders with the correct token and no user or email present' do
+            order = create(:order, token: 'ABC', user_id: nil, created_by_id: nil)
+            spree_post :create, spree_user: { email: user.email, password: 'secret' }
+
+            order.reload
+            expect(order.user_id).to eq user.id
+            expect(order.created_by_id).to eq user.id
+          end
+
+          it 'does not assign completed orders' do
+            order = create(:order, email: user.email, token: 'ABC',
+                           user_id: nil, created_by_id: nil,
+                           completed_at: 1.minute.ago)
+            spree_post :create, spree_user: { email: user.email, password: 'secret' }
+
+            order.reload
+            expect(order.user_id).to be_nil
+            expect(order.created_by_id).to be_nil
+          end
+
+          it 'does not assign orders with an existing user' do
+            order = create(:order, token: 'ABC', user_id: 200)
+            spree_post :create, spree_user: { email: user.email, password: 'secret' }
+
+            expect(order.reload.user_id).to eq 200
+          end
+
+          it 'does not assign orders with a different token' do
+            order = create(:order, token: 'DEF', user_id: nil, created_by_id: nil)
+            spree_post :create, spree_user: { email: user.email, password: 'secret' }
+
+            expect(order.reload.user_id).to be_nil
+          end
+        end
+      end
+
       context 'with a guest token present' do
         before do
           request.cookie_jar.signed[:guest_token] = 'ABC'

data/spec/features/account_spec.rb

@@ -1,6 +1,10 @@
 RSpec.feature 'Accounts', type: :feature do
-  context 'editing' do
-    scenario 'can edit an admin user', js: true do
+  describe 'editing', js: true do
+    before do
+      allow_bypass_sign_in
+    end
+
+    scenario 'can edit an admin user' do
       user = create(:admin_user, email: 'admin@person.com', password: 'password', password_confirmation: 'password')
       visit spree.login_path
 
@@ -12,8 +16,7 @@ RSpec.feature 'Accounts', type: :feature do
       expect(page).to have_text 'admin@person.com'
     end
 
-    scenario 'can edit a new user', js: true do
-      Spree::Auth::Config.set(signout_after_password_change: false)
+    scenario 'can edit a new user' do
       visit spree.signup_path
 
       fill_in 'Email', with: 'email@person.com'
@@ -33,8 +36,7 @@ RSpec.feature 'Accounts', type: :feature do
       expect(page).to have_text 'Account updated'
     end
 
-    scenario 'can edit an existing user account', js: true do
-      Spree::Auth::Config.set(signout_after_password_change: false)
+    scenario 'can edit an existing user account' do
       user = create(:user, email: 'email@person.com', password: 'secret', password_confirmation: 'secret')
       visit spree.login_path
 

data/spec/features/change_email_spec.rb

@@ -1,6 +1,8 @@
 RSpec.feature 'Change email', type: :feature do
   background do
-    user = create(:user)
+    allow_bypass_sign_in
+
+    user = create(:user, email: 'old@spree.com', password: 'secret')
     visit spree.root_path
     click_link 'Login'
 

data/spec/features/confirmation_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Confirmation' do
+RSpec.feature 'Confirmation', type: :feature, reload_user: true do
   before do
     set_confirmable_option(true)
     Spree::UserMailer.stub(:confirmation_instructions).and_return(double(deliver: true))

data/spec/features/sign_out_spec.rb

@@ -1,6 +1,6 @@
-RSpec.feature 'Sign Out', type: :feature do
+RSpec.feature 'Sign Out', type: :feature, js: true do
   given!(:user) do
-   create(:user,
+    create(:user,
           email: 'email@person.com',
           password: 'secret',
           password_confirmation: 'secret')
@@ -15,10 +15,42 @@ RSpec.feature 'Sign Out', type: :feature do
     click_button 'Login'
   end
 
-  scenario 'allow a signed in user to logout', js: true do
+  scenario 'allow a signed in user to logout' do
     click_link 'Logout'
     visit spree.root_path
     expect(page).to have_text 'Login'
     expect(page).not_to have_text 'Logout'
   end
+
+  describe 'before_logout' do
+    before do
+      create(:product, name: 'RoR Mug')
+      create(:product, name: 'RoR Shirt')
+    end
+
+    let!(:other_user) { create(:user) }
+
+    it 'clears token cookies' do
+      visit spree.root_path
+
+      click_link 'RoR Mug'
+      click_button 'Add To Cart'
+
+      click_link 'Cart'
+      expect(page).to have_text 'RoR Mug'
+
+      click_link 'Logout'
+
+      click_link 'Cart'
+      expect(page).to have_text Spree.t(:your_cart_is_empty)
+
+      visit spree.login_path
+      fill_in 'Email', with: other_user.email
+      fill_in 'Password', with: other_user.password
+      click_button 'Login'
+
+      click_link 'Cart'
+      expect(page).to have_text Spree.t(:your_cart_is_empty)
+    end
+  end
 end

data/spec/models/user_spec.rb

@@ -63,7 +63,7 @@ RSpec.describe Spree::User, type: :model do
     end
   end
 
-  describe "confirmable" do
+  describe "confirmable", reload_user: true do
     it "is confirmable if the confirmable option is enabled" do
       set_confirmable_option(true)
       Spree::UserMailer.stub(:confirmation_instructions).and_return(double(deliver: true))

data/spec/spec_helper.rb

@@ -19,6 +19,9 @@ RSpec.configure do |config|
   config.mock_with :rspec do |mock|
     mock.syntax = [:should, :expect]
   end
+
+  config.order = :random
+  Kernel.srand(config.seed)
 end
 
 Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }

data/spec/support/cache_helpers.rb

@@ -0,0 +1,5 @@
+RSpec.configure do |config|
+  config.before do
+    Rails.cache.clear
+  end
+end

data/spec/support/capybara.rb

@@ -1,9 +1,16 @@
 require 'capybara/rspec'
 require 'capybara/rails'
-require 'capybara/poltergeist'
 require 'capybara-screenshot/rspec'
+require 'selenium-webdriver'
 
 RSpec.configure do |_config|
-  Capybara.javascript_driver = :poltergeist
   Capybara.save_and_open_page_path = ENV['CIRCLE_ARTIFACTS'] if ENV['CIRCLE_ARTIFACTS']
+
+  Capybara.register_driver :chrome do |app|
+    Capybara::Selenium::Driver.new app,
+      browser: :chrome,
+      options: Selenium::WebDriver::Chrome::Options.new(args: %w[disable-popup-blocking headless disable-gpu window-size=1920,1080])
+  end
+
+  Capybara.javascript_driver = :chrome
 end

data/spec/support/configuration_helpers.rb

@@ -0,0 +1,9 @@
+module ConfigurationHelpers
+  def allow_bypass_sign_in
+    Spree::Auth::Config.set(signout_after_password_change: false)
+  end
+end
+
+RSpec.configure do |config|
+  config.include ConfigurationHelpers
+end

data/spec/support/user_helper.rb

@@ -0,0 +1,11 @@
+RSpec.configure do |config|
+  # allows to keep user const after reload
+  config.around :each, :reload_user do |example|
+    old_user = Spree::User
+
+    example.run
+
+    Spree.send(:remove_const, 'User')
+    Spree.const_set('User', old_user)
+  end
+end

data/spree_auth_devise.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_auth_devise'
-  s.version     = '3.3.3'
+  s.version     = '3.4.0'
   s.summary     = 'Provides authentication and authorization services for use with Spree by using Devise and CanCan.'
   s.description = s.summary
 
@@ -34,9 +34,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'factory_bot', '~> 4.7'
   s.add_development_dependency 'ffaker'
   s.add_development_dependency 'launchy'
-  s.add_development_dependency 'mysql2'
+  s.add_development_dependency 'mysql2', '~> 0.5.1'
   s.add_development_dependency 'pg', '~> 0.18'
-  s.add_development_dependency 'poltergeist', '~> 1.6'
+  s.add_development_dependency 'selenium-webdriver'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rspec-rails', '~> 3.5'
   s.add_development_dependency 'shoulda-matchers', '~> 3.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_auth_devise
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.4.0
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-12 00:00:00.000000000 Z
+date: 2018-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -188,16 +188,16 @@ dependencies:
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -213,19 +213,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.18'
 - !ruby/object:Gem::Dependency
-  name: poltergeist
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -397,8 +397,9 @@ files:
 - db/migrate/20141002154641_add_confirmable_to_users.rb
 - db/migrate/20150416152553_add_missing_indices_on_user.rb
 - db/seeds.rb
-- gemfiles/spree_3_1.gemfile
 - gemfiles/spree_3_2.gemfile
+- gemfiles/spree_3_5.gemfile
+- gemfiles/spree_3_6.gemfile
 - gemfiles/spree_master.gemfile
 - lib/assets/javascripts/spree/backend/spree_auth.js.erb
 - lib/assets/javascripts/spree/frontend/account.js
@@ -448,6 +449,7 @@ files:
 - lib/views/frontend/spree/users/edit.html.erb
 - lib/views/frontend/spree/users/show.html.erb
 - spec/controllers/spree/admin/orders_controller_spec.rb
+- spec/controllers/spree/admin/user_sessions_controller_spec.rb
 - spec/controllers/spree/checkout_controller_spec.rb
 - spec/controllers/spree/products_controller_spec.rb
 - spec/controllers/spree/user_passwords_controller_spec.rb
@@ -476,12 +478,15 @@ files:
 - spec/spec_helper.rb
 - spec/support/ability.rb
 - spec/support/authentication_helpers.rb
+- spec/support/cache_helpers.rb
 - spec/support/capybara.rb
+- spec/support/configuration_helpers.rb
 - spec/support/confirm_helpers.rb
 - spec/support/database_cleaner.rb
 - spec/support/email.rb
 - spec/support/factory_girl.rb
 - spec/support/spree.rb
+- spec/support/user_helper.rb
 - spree_auth_devise.gemspec
 homepage: https://spreecommerce.org
 licenses:
@@ -511,6 +516,7 @@ summary: Provides authentication and authorization services for use with Spree b
   using Devise and CanCan.
 test_files:
 - spec/controllers/spree/admin/orders_controller_spec.rb
+- spec/controllers/spree/admin/user_sessions_controller_spec.rb
 - spec/controllers/spree/checkout_controller_spec.rb
 - spec/controllers/spree/products_controller_spec.rb
 - spec/controllers/spree/user_passwords_controller_spec.rb
@@ -539,9 +545,12 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/ability.rb
 - spec/support/authentication_helpers.rb
+- spec/support/cache_helpers.rb
 - spec/support/capybara.rb
+- spec/support/configuration_helpers.rb
 - spec/support/confirm_helpers.rb
 - spec/support/database_cleaner.rb
 - spec/support/email.rb
 - spec/support/factory_girl.rb
 - spec/support/spree.rb
+- spec/support/user_helper.rb

data/gemfiles/spree_3_1.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "spree", "~> 3.1.0"
-
-gemspec :path => "../"