spree_auth_devise 3.1.0 → 3.2.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac4c5f43e14c76fb098fc727c2749e4c3e2784e3
-  data.tar.gz: ea45c92f87d2da7a95a7a84f417c4343bc0713de
+  metadata.gz: b630de047d5f4283ed5ba9e231ea628746ec44e4
+  data.tar.gz: 0004afefacaefd265e29ed1c6ba63ddcf3ecb371
 SHA512:
-  metadata.gz: 1f5feb17f90670ba23070017133349ba09599e4d83f283700f4032a3ab6572408327e21b8faad00db5d4cd77751a993fba210643d6d256e415d07cb619c0d6c1
-  data.tar.gz: 17948f62075b6e0eb1841f457dd5d8d581bff2815b8ce694aa96f2bc2fb27abe024bab1097c966c089c40a247f5329ba5b101ce23335407cba67d19b40abe06f
+  metadata.gz: 336eacc0e625a31d85682f35e6d8f70fff506059a2cdaea427f0f73ebfc5ed346e69bea426007d957588db422a75f0cee7df23dc1a39e7afbb3bbd14ad38c0ea
+  data.tar.gz: df132a9472e5d2a4e9dbf45187472f6f05e09098e41bcde3c7dd5d45c5f6f398d93f1d83416336b0d0c11c84fa0d4dbe1da55b2b9f87c88a188b9fae81cb84ea

data/.travis.yml

@@ -2,10 +2,15 @@ before_script:
   - bundle exec rake test_app
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
+cache:
+  bundler: true
+
 env:
   - DB=mysql
   - DB=postgres
 language: ruby
 rvm:
-  - 2.1.5
+  - 2.3.1
+  - 2.2.5
+
 sudo: false

data/CHANGELOG.md

@@ -0,0 +1,17 @@
+## Spree Auth Devise v3.2.0 (master, unreleased)
+
+* Supports `Spree 3.1` and any other newer version lesser than `4.0` (https://github.com/spree/spree_auth_devise/pull/353)
+* `devise` updated to `4.0` (https://github.com/spree/spree_auth_devise/pull/344)
+* updated development dependencies (https://github.com/spree/spree_auth_devise/pull/351)
+* include `Spree::UserMethods` in `Spree::User` (https://github.com/spree/spree_auth_devise/pull/343)
+
+## Spree Auth Devise v3.1.0 (2016-04-05)
+
+* `Spree 3.1` support
+* login / account links are loaded via ajax similar to cart link (https://github.com/spree/spree_auth_devise/pull/320)
+* updated `devise` to `3.5.4` for security reasons (https://github.com/spree/spree_auth_devise/pull/323)
+* explicitly require `deface` in dependencies (https://github.com/spree/spree_auth_devise/pull/331)
+* removed `json` from dependencies (https://github.com/spree/spree_auth_devise/pull/329)
+* fixes `xml` / `json` endpoints (https://github.com/spree/spree_auth_devise/pull/311)
+* `Spree.admin_path` support (https://github.com/spree/spree_auth_devise/pull/307)
+* `CircleCI` support (https://github.com/spree/spree_auth_devise/pull/288)

data/Gemfile

@@ -2,8 +2,4 @@ source 'https://rubygems.org'
 
 gem 'spree', github: 'spree/spree', branch: 'master'
 
-group :test do
-  gem 'mysql2'
-end
-
 gemspec

data/app/mailers/spree/user_mailer.rb

@@ -8,6 +8,7 @@ module Spree
 
     def confirmation_instructions(user, token, opts={})
       @confirmation_url = spree.spree_user_confirmation_url(:confirmation_token => token, :host => Spree::Store.current.url)
+      @email = user.email
 
       mail to: user.email, from: from_address, subject: Spree::Store.current.name + ' ' + I18n.t(:subject, :scope => [:devise, :mailer, :confirmation_instructions])
     end

data/app/models/spree/user.rb

@@ -1,6 +1,7 @@
 module Spree
   class User < Spree::Base
     include UserAddress
+    include UserMethods
     include UserPaymentSource
 
     devise :database_authenticatable, :registerable, :recoverable,
@@ -10,8 +11,6 @@ module Spree
     acts_as_paranoid
     after_destroy :scramble_email_and_password
 
-    has_many :orders
-
     before_validation :set_login
 
     users_table_name = User.table_name
@@ -20,7 +19,7 @@ module Spree
     scope :admin, -> { includes(:spree_roles).where("#{roles_table_name}.name" => "admin") }
 
     def self.admin_created?
-      User.admin.count > 0
+      User.admin.exists?
     end
 
     def admin?

data/circle.yml

@@ -4,8 +4,10 @@ machine:
   services:
     - postgresql
   ruby:
-    version: '2.2'
+    version: '2.2.4'
 
 dependencies:
+  pre:
+    - gem install bundler
   post:
     - bundle exec rake test_app

data/config/initializers/devise.rb

@@ -134,4 +134,10 @@ Devise.setup do |config|
   config.sign_out_via = :get
 
   config.case_insensitive_keys = [:email]
+
+  # keep old config
+  config.email_regexp = /\A[^@\s]+@([^@\s]+\.)+[^@\W]+\z/
+  config.reconfirmable = false
+  config.skip_session_storage = []
+  config.strip_whitespace_keys = []
 end

data/config/initializers/warden.rb

@@ -2,7 +2,7 @@
 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.where(email: user.email, guest_token: auth.cookies.signed[:guest_token], user_id: nil).each do |order|
+      Spree::Order.incomplete.where(guest_token: auth.cookies.signed[:guest_token], user_id: nil).each do |order|
         order.associate_user!(user)
       end
     end

data/config/locales/pt.yml

@@ -0,0 +1,55 @@
+---
+pt:
+  spree:
+    admin_login: "Entrar como Administrador"
+    change_your_password: "Altere a sua senha"
+  devise:
+    confirmations:
+      confirmed: A sua conta foi confirmada com sucesso. Já se encontra conectado.
+      send_instructions: Receberá, brevemente, um e-mail com as instruções de confirmação da sua conta.
+    failure:
+      inactive: A sua conta ainda não foi ativada.
+      invalid: E-mail ou senha inválida.
+      invalid_token: Token de autenticação inválido.
+      locked: A sua conta está bloqueada.
+      timeout: A sua sessão expirou! Por favor, entre novamente para continuar.
+      unauthenticated: Precisa de se autenticar ou de se registar antes de continuar.
+      unconfirmed: Precisa de confirmar a sua conta antes de continuar.
+    mailer:
+      confirmation_instructions:
+        subject: Instruções de confirmação
+      reset_password_instructions:
+        subject: Instruções de redefinição de senha
+      unlock_instructions:
+        subject: Instruções de desbloqueio
+    oauth_callbacks:
+      failure: '%{kind} não foi autorizada porque %{reason}.'
+      success: 'Conta %{kind} foi autorizada com sucesso.'
+    unlocks:
+      send_instructions: Receberá um e-mail com as instruções de desbloqueio da sua conta em poucos minutos.
+      unlocked: A sua conta foi desbloqueada com sucesso. Já se encontra conectado.
+    passwords:
+      spree_user:
+        cannot_be_blank: A sua senha não pode estar em branco.
+        send_instructions: Receberá um e-mail com as instruções de redefinição da sua senha em poucos minutos.
+        no_token: "Não pode aceder a esta página sem ser através de um e-mail de redefinição de senha. Se está a aceder através de um e-mail de redefinição de senha, verifique se está a usar o URL completo."
+        updated: A sua senha foi alterada com sucesso. Já se encontra conectado.
+    user_registrations:
+      destroyed: Até logo! A sua conta foi cancelada com sucesso. Esperamos voltar a vê-lo em breve.
+      inactive_signed_up: 'O seu registo foi concluído com sucesso. No entanto, não conectado porque a sua conta está %{reason}.'
+      signed_up: Bem vindo! O seu registo foi concluído com sucesso.
+      updated: A sua conta foi atualizada com sucesso.
+    user_sessions:
+      signed_in: Entrou com sucesso.
+      signed_out: Saiu com sucesso.
+      already_signed_in: Já está conectado.
+      already_signed_out: Já não está conectado.
+  errors:
+    messages:
+      already_confirmed: já foi confirmado
+      email_is_invalid: O e-mail não pode estar em branco
+      not_found: não foi encontrado
+      not_locked: não estava bloqueado
+      not_saved:
+        one: '1 erro não permitiu que este %{resource} fosse guardado:'
+        other: '%{count} erros não permitiram que este %{resource} fosse guardado:'

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

@@ -1,5 +1,5 @@
 Spree::Admin::OrdersController.class_eval do
-  before_filter :check_authorization
+  before_action :check_authorization
 
   private
     def load_order_action

data/lib/controllers/backend/spree/admin/orders/customer_details_controller_decorator.rb

@@ -1,5 +1,5 @@
 Spree::Admin::Orders::CustomerDetailsController.class_eval do
-  before_filter :check_authorization
+  before_action :check_authorization
 
   private
     def check_authorization

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

@@ -6,7 +6,6 @@ class Spree::Admin::UserPasswordsController < Devise::PasswordsController
   include Spree::Core::ControllerHelpers::Store
 
   helper 'spree/admin/navigation'
-  helper 'spree/admin/tables'
   layout 'spree/layouts/admin'
 
   # Overridden due to bug in Devise.

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

@@ -6,7 +6,6 @@ class Spree::Admin::UserSessionsController < Devise::SessionsController
   include Spree::Core::ControllerHelpers::Store
 
   helper 'spree/admin/navigation'
-  helper 'spree/admin/tables'
   layout :resolve_layout
 
   def create

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

@@ -1,17 +1,17 @@
 require 'spree/core/validators/email'
 Spree::CheckoutController.class_eval do
-  before_filter :check_authorization
-  before_filter :check_registration, :except => [:registration, :update_registration]
+  before_action :check_authorization
+  before_action :check_registration, except: [:registration, :update_registration]
 
   def registration
     @user = Spree::User.new
   end
 
   def update_registration
-    if params[:order][:email] =~ Devise.email_regexp && current_order.update_attribute(:email, params[:order][:email])
+    if order_params[:email] =~ Devise.email_regexp && current_order.update_attribute(:email, order_params[:email])
       redirect_to spree.checkout_path
     else
-      flash[:registration_error] = t(:email_is_invalid, :scope => [:errors, :messages])
+      flash[:error] = t(:email_is_invalid, scope: [:errors, :messages])
       @user = Spree::User.new
       render 'registration'
     end

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

@@ -6,8 +6,8 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
   include Spree::Core::ControllerHelpers::Order
   include Spree::Core::ControllerHelpers::Store
 
-  before_filter :check_permissions, :only => [:edit, :update]
-  skip_before_filter :require_no_authentication
+  before_action :check_permissions, only: [:edit, :update]
+  skip_before_action :require_no_authentication
 
   # GET /resource/sign_up
   def new
@@ -23,9 +23,6 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
     if resource_saved
       if resource.active_for_authentication?
         set_flash_message :notice, :signed_up
-        if current_order
-          current_order.associate_user! @user
-        end
         sign_up(resource_name, resource)
         session[:spree_user_signup] = true
         respond_with resource, location: after_sign_up_path_for(resource)

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

@@ -1,7 +1,7 @@
 class Spree::UsersController < Spree::StoreController
-  skip_before_filter :set_current_order, :only => :show
-  prepend_before_filter :load_object, :only => [:show, :edit, :update]
-  prepend_before_filter :authorize_actions, :only => :new
+  skip_before_action :set_current_order, only: :show
+  prepend_before_action :load_object, only: [:show, :edit, :update]
+  prepend_before_action :authorize_actions, only: :new
 
   include Spree::Core::ControllerHelpers
 

data/lib/views/frontend/spree/checkout/registration.html.erb

@@ -11,9 +11,6 @@
           <h3 class="panel-title"><%= Spree.t(:guest_user_account) %></h3>
         </div>
         <div id="guest_checkout" class="panel-body" data-hook>
-          <% if flash[:registration_error] %>
-            <div class='flash error'><%= flash[:registration_error] %></div>
-          <% end %>
           <%= form_for @order, :url => update_checkout_registration_path, :method => :put, :html => { :id => 'checkout_form_registration' } do |f| %>
             <p>
               <%= f.email_field :email, :class => 'form-control title', :placeholder => Spree.t(:email) %>

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -120,7 +120,7 @@ RSpec.describe Spree::CheckoutController, type: :controller do
     it 'renders the registration view if unable to save' do
       allow(controller).to receive(:check_authorization)
       spree_put :update_registration, { order: { email: 'invalid' } }
-      expect(flash[:registration_error]).to eq I18n.t(:email_is_invalid, scope: [:errors, :messages])
+      expect(flash[:error]).to eq I18n.t(:email_is_invalid, scope: [:errors, :messages])
       expect(response).to render_template :registration
     end
 

data/spec/controllers/spree/user_registrations_controller_spec.rb

@@ -9,5 +9,35 @@ RSpec.describe Spree::UserRegistrationsController, type: :controller do
       spree_post :create, { spree_user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' } }
       expect(response).to redirect_to spree.root_path(thing: 7)
     end
+
+    context 'with a guest token present' do
+      before do
+        request.cookie_jar.signed[:guest_token] = 'ABC'
+      end
+
+      it 'assigns orders with the correct token and no user present' do
+        order = create(:order, guest_token: 'ABC', user_id: nil, created_by_id: nil)
+        spree_post :create, spree_user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' }
+        user = Spree::User.find_by_email('foobar@example.com')
+
+        order.reload
+        expect(order.user_id).to eq user.id
+        expect(order.created_by_id).to eq user.id
+      end
+
+      it 'does not assign orders with an existing user' do
+        order = create(:order, guest_token: 'ABC', user_id: 200)
+        spree_post :create, spree_user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' }
+
+        expect(order.reload.user_id).to eq 200
+      end
+
+      it 'does not assign orders with a different token' do
+        order = create(:order, guest_token: 'DEF', user_id: nil, created_by_id: nil)
+        spree_post :create, spree_user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' }
+
+        expect(order.reload.user_id).to be_nil
+      end
+    end
   end
 end

data/spec/controllers/spree/user_sessions_controller_spec.rb

@@ -6,15 +6,53 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
 
   context "#create" do
     context "using correct login information" do
-      it 'properly assigns orders user from guest_token' do
-        order1 = create(:order, email: user.email, guest_token: 'ABC', user_id: nil, created_by_id: nil)
-        order2 = create(:order, guest_token: 'ABC', user_id: 200)
-        request.cookie_jar.signed[:guest_token] = 'ABC'
-        spree_post :create, spree_user: { email: user.email, password: 'secret' }
-
-        expect(order1.reload.user_id).to eq user.id
-        expect(order1.reload.created_by_id).to eq user.id
-        expect(order2.reload.user_id).to eq 200
+      context 'with a guest token present' do
+        before do
+          request.cookie_jar.signed[:guest_token] = 'ABC'
+        end
+
+        it 'assigns orders with the correct token and no user present' do
+          order = create(:order, email: user.email, guest_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, guest_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, guest_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, guest_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, guest_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
 
       context "and html format is used" do

data/spec/mailers/user_mailer_spec.rb

@@ -3,17 +3,10 @@ RSpec.describe Spree::UserMailer, type: :mailer do
   let!(:store) { create(:store) }
   let(:user) { create(:user) }
 
-  before do
-    user = create(:user)
-    Spree::UserMailer.reset_password_instructions(user, 'token goes here').deliver_later
-    @message = ActionMailer::Base.deliveries.last
-  end
-
   describe '#reset_password_instructions' do
     describe 'message contents' do
       before do
-        described_class.reset_password_instructions(user, 'token goes here').deliver_later
-        @message = ActionMailer::Base.deliveries.last
+        @message = described_class.reset_password_instructions(user, 'token goes here')
       end
 
       context 'subject includes' do
@@ -38,7 +31,7 @@ RSpec.describe Spree::UserMailer, type: :mailer do
     describe 'legacy support for User object' do
       it 'sends an email' do
         expect {
-          described_class.reset_password_instructions(user, 'token goes here').deliver_later
+          described_class.reset_password_instructions(user, 'token goes here').deliver_now
         }.to change(ActionMailer::Base.deliveries, :size).by(1)
       end
     end

data/spec/models/user_spec.rb

@@ -14,9 +14,21 @@ RSpec.describe Spree::User, type: :model do
     expect(user.reset_password_token).not_to be_nil
   end
 
+  describe '.admin_created?' do
+    it 'returns true when admin exists' do
+      create(:admin_user)
+
+      expect(Spree::User).to be_admin_created
+    end
+
+    it 'returns false when admin does not exist' do
+      expect(Spree::User).to_not be_admin_created
+    end
+  end
+
   context '#destroy' do
-    it 'will soft delete' do
-      order = build(:order, completed_at: Time.now)
+    it 'will soft delete with uncompleted orders' do
+      order = build(:order)
       order.save
       user = order.user
       user.destroy
@@ -28,6 +40,13 @@ RSpec.describe Spree::User, type: :model do
       expect(Spree::Order.where(user_id: user.id).first).to eq(order)
     end
 
+    it 'will not soft delete with completed orders' do
+      order = build(:order, completed_at: Time.now)
+      order.save
+      user = order.user
+      expect { user.destroy }.to raise_error(Spree::Core::DestroyWithOrdersError)
+    end
+
     it 'will allow users to register later with same email address as previously deleted account' do
       user1 = build(:user)
       user1.save

data/spec/spec_helper.rb

@@ -8,6 +8,7 @@ require File.expand_path('../dummy/config/environment', __FILE__)
 require 'rspec/rails'
 require 'shoulda-matchers'
 require 'ffaker'
+require 'rails-controller-testing'
 
 RSpec.configure do |config|
   config.filter_run focus: true
@@ -19,6 +20,12 @@ RSpec.configure do |config|
   config.mock_with :rspec do |mock|
     mock.syntax = [:should, :expect]
   end
+
+  [:controller, :view, :request].each do |type|
+    config.include ::Rails::Controller::Testing::TestProcess, type: type
+    config.include ::Rails::Controller::Testing::TemplateAssertions, type: type
+    config.include ::Rails::Controller::Testing::Integration, type: type
+  end
 end
 
 Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }

data/spec/support/capybara.rb

@@ -1,7 +1,9 @@
 require 'capybara/rspec'
 require 'capybara/rails'
 require 'capybara/poltergeist'
+require 'capybara-screenshot/rspec'
 
 RSpec.configure do |config|
   Capybara.javascript_driver = :poltergeist
+  Capybara.save_and_open_page_path = ENV['CIRCLE_ARTIFACTS'] if ENV['CIRCLE_ARTIFACTS']
 end

data/spree_auth_devise.gemspec

@@ -3,11 +3,11 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_auth_devise'
-  s.version     = '3.1.0'
+  s.version     = '3.2.0.beta'
   s.summary     = 'Provides authentication and authorization services for use with Spree by using Devise and CanCan.'
   s.description = s.summary
 
-  s.required_ruby_version = '>= 2.1.0'
+  s.required_ruby_version = '>= 2.2.2'
 
   s.author      = 'Sean Schofield'
   s.email       = 'sean@spreecommerce.com'
@@ -19,27 +19,29 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  spree_version = '~> 3.1.0.beta'
-
-  s.add_dependency 'devise', '~> 3.5.4'
+  s.add_dependency 'devise', '~> 4.0.0'
   s.add_dependency 'devise-encryptable', '0.1.2'
+
+  spree_version = '>= 3.1.0', '< 4.0'
   s.add_dependency 'spree_core', spree_version
 
-  s.add_development_dependency 'capybara', '~> 2.4.1'
-  s.add_development_dependency 'coffee-rails', '~> 4.0.0'
-  s.add_development_dependency 'database_cleaner', '~> 1.2.0'
-  s.add_development_dependency 'email_spec', '~> 1.5.0'
-  s.add_development_dependency 'factory_girl', '~> 4.4'
+  s.add_development_dependency 'capybara', '~> 2.7'
+  s.add_development_dependency 'capybara-screenshot'
+  s.add_development_dependency 'coffee-rails', '~> 4.2'
+  s.add_development_dependency 'database_cleaner', '~> 1.5'
+  s.add_development_dependency 'email_spec', '~> 2.1'
+  s.add_development_dependency 'factory_girl', '~> 4.7'
   s.add_development_dependency 'ffaker'
   s.add_development_dependency 'launchy'
   s.add_development_dependency 'mysql2'
   s.add_development_dependency 'pg'
-  s.add_development_dependency 'poltergeist', '~> 1.5'
+  s.add_development_dependency 'poltergeist', '~> 1.6'
   s.add_development_dependency 'pry'
-  s.add_development_dependency 'rspec-rails', '~> 3.4.1'
-  s.add_development_dependency 'shoulda-matchers', '~> 2.6.2'
-  s.add_development_dependency 'simplecov', '~> 0.9.0'
+  s.add_development_dependency 'rspec-rails', '~> 3.5'
+  s.add_development_dependency 'shoulda-matchers', '~> 3.1'
+  s.add_development_dependency 'simplecov', '~> 0.12'
   s.add_development_dependency 'spree_backend', spree_version
   s.add_development_dependency 'spree_frontend', spree_version
   s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'rails-controller-testing'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_auth_devise
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0.beta
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.4
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.4
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: devise-encryptable
   requirement: !ruby/object:Gem::Requirement
@@ -42,86 +42,106 @@ dependencies:
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0.beta
+        version: 3.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0.beta
+        version: 3.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: capybara-screenshot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: email_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +204,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -212,70 +232,82 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.2
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.2
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: spree_backend
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0.beta
+        version: 3.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.1.0.beta
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: spree_frontend
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.1.0.beta
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.1.0.beta
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -290,6 +322,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails-controller-testing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provides authentication and authorization services for use with Spree
   by using Devise and CanCan.
 email: sean@spreecommerce.com
@@ -300,6 +346,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.md
 - README.md
@@ -323,6 +370,7 @@ files:
 - config/locales/it.yml
 - config/locales/nl.yml
 - config/locales/pt-BR.yml
+- config/locales/pt.yml
 - config/locales/tr.yml
 - config/routes.rb
 - db/default/users.rb
@@ -430,16 +478,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Provides authentication and authorization services for use with Spree by