spree_auth_devise 3.4.0 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 72b63b113f23fe2ff681bffdd430e616de92a4da
-  data.tar.gz: 253e30bae89b04b54f15ea8bdf3bc1f48140b1cf
+SHA256:
+  metadata.gz: 45307062e764620c14c90a2e46698079e68fcc2cf4a275c9b68b4dd7c440e235
+  data.tar.gz: 51a0e596192d24d194635e319ae70894d3d7ff9dcb098c7783c0b70f865f3a53
 SHA512:
-  metadata.gz: 78c9dd93e1af15d08a44ce4a0ad8b09f5e592fc1a7d6c7468883b2db908c7d7f3f68636899d265fc4da7ec49728b9801d739fb74561aadb1f669d4f73ccd1d9a
-  data.tar.gz: 5c295a34dbe244c6688bc5a37e4116c3fe64adaa54e17cc6a309261f486c5de23853de96b750edad8533134053fccc0007044627ef3ff747fec754a394df584a
+  metadata.gz: 0467202177d333b27390f4f6fd025e54d8600dfa514419a93d8f9d836740928d7226f8f89a841c215cd5b7e7a83e266bd04f06af4bddd0e961c4faf12d7d944e
+  data.tar.gz: 9d362bd0a46360b6907526dfb50c193b2399551bcd64e7804a65521cc893fc50e49adaf01a7ac981530677dfab3db5345ae65a8f48eb835bd82d6a54378f9327

data/.travis.yml

@@ -22,7 +22,7 @@ rvm:
 gemfile:
   - gemfiles/spree_3_2.gemfile
   - gemfiles/spree_3_5.gemfile
-  - gemfiles/spree_3_6.gemfile
+  - gemfiles/spree_3_7.gemfile
   - gemfiles/spree_master.gemfile
 
 matrix:

data/Appraisals

@@ -8,8 +8,8 @@ appraise 'spree-3-5' do
   gem 'rails-controller-testing'
 end
 
-appraise 'spree-3-6' do
-  gem 'spree', '~> 3.6.0'
+appraise 'spree-3-7' do
+  gem 'spree', '~> 3.7.0.rc3'
   gem 'rails-controller-testing'
 end
 

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## Spree Auth Devise v3.3.0 (unreleased)
 
-* `Rails 5.1` support with `spree_extension` gem for compatiblity with all Rails version 4.2+
+* `Rails 5.1` support with `spree_extension` gem for compatibility with all Rails version 4.2+
 
 ## Spree Auth Devise v3.2.0 (2017-06-15)
 

data/README.md

@@ -132,3 +132,14 @@ You need to do a quick one-time creation of a test application and then you can
 Then run the rspec tests.
 
     bundle exec rspec
+
+About Spark Solutions
+----------------------
+[![Spark Solutions](http://sparksolutions.co/wp-content/uploads/2015/01/logo-ss-tr-221x100.png)][spark]
+
+Spree Auth Devise is maintained by [Spark Solutions Sp. z o.o.][spark].
+
+We are passionate about open source software.
+We are [available for hire][spark].
+
+[spark]:http://sparksolutions.co?utm_source=github

data/{lib/controllers/frontend → app/controllers}/spree/user_passwords_controller.rb

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

data/{lib/controllers/frontend → app/controllers}/spree/user_registrations_controller.rb

@@ -6,6 +6,10 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
   include Spree::Core::ControllerHelpers::Order
   include Spree::Core::ControllerHelpers::Store
 
+  if defined?(SpreeI18n::ControllerLocaleHelper)
+    include SpreeI18n::ControllerLocaleHelper
+  end
+
   before_action :check_permissions, only: [:edit, :update]
   skip_before_action :require_no_authentication
 

data/{lib/controllers/frontend → app/controllers}/spree/user_sessions_controller.rb

@@ -6,6 +6,10 @@ class Spree::UserSessionsController < Devise::SessionsController
   include Spree::Core::ControllerHelpers::Order
   include Spree::Core::ControllerHelpers::Store
 
+  if defined?(SpreeI18n::ControllerLocaleHelper)
+    include SpreeI18n::ControllerLocaleHelper
+  end
+
   def create
     authenticate_spree_user!
 

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

@@ -0,0 +1,18 @@
+<%= form_for Spree::User.new, :as => :spree_user, :url => spree.create_new_session_path do |f| %>
+  <div id="password-credentials">
+    <div class="form-group">
+      <%= f.label :email, Spree.t(:email) %>
+      <%= f.email_field :email, placeholder: "#{Spree.t(:email)}", :class => 'form-control', :tabindex => 1, autofocus: true %>
+    </div>
+    <div class="form-group">
+      <%= f.label :password, Spree.t(:password) %>
+      <%= f.password_field :password, placeholder: "#{Spree.t(:password)}", :class => 'form-control', :tabindex => 2 %>
+    </div>
+  </div>
+  <div>
+    <%= f.check_box :remember_me, :tabindex => 3 %>
+    <%= f.label :remember_me, Spree.t(:remember_me) %>
+  </div>
+
+  <div><%= f.submit Spree.t(:login), :class => 'btn btn-lg btn-success btn-block', :tabindex => 4 %></div>
+<% end %>

data/{lib/views/frontend → app/views}/spree/shared/_user_form.html.erb

@@ -1,13 +1,17 @@
 <fieldset id="password-credentials">
   <div class="form-group">
+    <%= f.label :email, Spree.t(:email), class: 'required', title: 'required' %>
     <%= f.email_field :email, :class => 'form-control', :placeholder => Spree.t(:email) %>
   </div>
   <hr />
   <div class="form-group">
+    <%= f.label :password, Spree.t(:password), class: 'required', title: 'required' %>
     <%= f.password_field :password, :class => 'form-control', :placeholder => Spree.t(:password) %>
-  </div> 
+
+  </div>
   <div class="form-group">
+    <%= f.label :password_confirmation, Spree.t(:password_confirmation), class: 'required', title: 'required' %>
     <%= f.password_field :password_confirmation, :class => 'form-control', :placeholder => Spree.t(:confirm_password) %>
-  </div> 
+  </div>
 </fieldset>
-<div data-hook="signup_below_password_fields"></div>
+<div data-hook="signup_below_password_fields"></div>

data/{lib/views/frontend → app/views}/spree/user_passwords/edit.html.erb

@@ -6,14 +6,14 @@
     </div>
     <div class="panel-body">
       <%= form_for @spree_user, :as => :spree_user, :url => spree.update_password_path, :method => :put do |f| %>
-        <p>
+        <div class="form-group">
           <%= f.label :password, Spree.t(:password) %>
           <%= f.password_field :password, :class => "form-control" %>
-        </p>
-        <p>
+        </div>
+        <div class="form-group">
           <%= f.label :password_confirmation, Spree.t(:confirm_password) %>
           <%= f.password_field :password_confirmation, :class => "form-control" %>
-        </p>
+        </div>
         <%= f.hidden_field :reset_password_token %>
         <%= f.submit Spree.t(:update), :class => 'btn btn-lg btn-success btn-block' %>
       <% end %>

data/{lib/views/frontend → app/views}/spree/user_passwords/new.html.erb

@@ -8,13 +8,13 @@
       <p><%= Spree.t(:instructions_to_reset_password) %></p>
 
       <%= form_for Spree::User.new, :as => :spree_user, :url => spree.reset_password_path do |f| %>
-        <p>
+        <div class="form-group">
           <%= f.label :email, Spree.t(:email) %>
           <%= f.email_field :email, :class => "form-control" %>
-        </p>
-        <p>
+        </div>
+        <div>
           <%= f.submit Spree.t(:reset_password), :class => 'btn btn-lg btn-success btn-block' %>
-        </p>
+        </div>
       <% end %>
     </div>
   </div>

data/{lib/views/frontend → app/views}/spree/user_registrations/new.html.erb

@@ -9,11 +9,11 @@
           <%= 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 } %>
-              <p><%= f.submit Spree.t(:create), :class => 'btn btn-lg btn-success btn-block' %></p>
+              <div><%= f.submit Spree.t(:create), :class => 'btn btn-lg btn-success btn-block' %></div>
             </div>
           <% end %>
           <div class="text-center">
-            <%= Spree.t(:or) %> 
+            <%= Spree.t(:or) %>
               <%= link_to Spree.t(:login_as_existing), spree.login_path %>
           </div>
           <div data-hook="login_extras"></div>

data/config/initializers/warden.rb

@@ -1,18 +1,14 @@
 # Merges users orders to their account after sign in and sign up.
 Warden::Manager.after_set_user except: :fetch do |user, auth, _opts|
-  guest_token = auth.cookies.signed[:guest_token]
-  token       = auth.cookies.signed[:token]
+  token = auth.cookies.signed[:guest_token] || auth.cookies.signed[:token]
+  token_attr = Spree::Order.has_attribute?(:token) ? :token : :guest_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|
+    Spree::Order.incomplete.where(token_attr => token, user_id: nil).each do |order|
       order.associate_user!(user)
     end
   end
-end
+end 
 
 Warden::Manager.before_logout do |_user, auth, _opts|
   auth.cookies.delete(:guest_token)

data/gemfiles/{spree_3_6.gemfile → spree_3_7.gemfile}

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails-controller-testing"
-gem "spree", "~> 3.6.0"
+gem "spree", "~> 3.7.0.rc3"
 
 gemspec path: "../"

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

@@ -1,4 +1,4 @@
-require 'spree/core/validators/email'
+require 'spree/core/validators/email' if Spree.version.to_f < 3.5
 Spree::CheckoutController.class_eval do
   before_action :check_authorization
   before_action :check_registration, except: [:registration, :update_registration]

data/lib/spree_auth_devise.rb

@@ -1,6 +1,5 @@
 require 'spree_core'
 require 'spree/auth/devise'
 require 'spree/authentication_helpers'
-require 'coffee_script'
 require 'deface'
 require 'spree_extension'

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

@@ -7,7 +7,7 @@
       <%= form_for @user, :as => :spree_user, :url => spree.registration_path(@user) do |f| %>
         <div data-hook="signup_inside_form">
           <%= render :partial => 'spree/shared/user_form', :locals => { :f => f } %>
-          <p><%= f.submit Spree.t(:create), :class => 'btn btn-lg btn-success btn-block' %></p>
+          <div><%= f.submit Spree.t(:create), :class => 'btn btn-lg btn-success btn-block' %></div>
         </div>
       <% end %>
       <div class="text-center">

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

@@ -12,10 +12,11 @@
         </div>
         <div id="guest_checkout" class="panel-body" data-hook>
           <%= form_for @order, :url => update_checkout_registration_path, :method => :put, :html => { :id => 'checkout_form_registration' } do |f| %>
-            <p>
+            <div class="form-group">
+              <%= f.label :email, Spree.t(:email), class: 'required', title: 'required' %>
               <%= f.email_field :email, :class => 'form-control title', :placeholder => Spree.t(:email) %>
-            </p>
-            <p><%= f.submit Spree.t(:continue), :class => 'btn btn-lg btn-success btn-block' %></p>
+            </div>
+            <div><%= f.submit Spree.t(:continue), :class => 'btn btn-lg btn-success btn-block' %></div>
           <% end %>
         </div>
       </div>

data/lib/views/frontend/spree/users/edit.html.erb

@@ -5,13 +5,13 @@
     </div>
     <div class="panel-body">
       <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
-      
+
       <%= form_for Spree::User.new, :as => @user, :url => spree.user_path(@user), :method => :put do |f| %>
         <%= render :partial => 'spree/shared/user_form', :locals => { :f => f } %>
-        <p>
+        <div>
           <%= f.submit Spree.t(:update), :class => 'btn btn-primary' %>
-        </p>
+        </div>
       <% end %>
     </div>
   </div>
-</div>
+</div>

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -67,10 +67,20 @@ RSpec.describe Spree::CheckoutController, type: :controller do
       end
 
       context 'with a token' do
-        before { allow(order).to receive(:guest_token) { 'ABC' } }
+        before do
+          if Spree.version.to_f > 3.6
+            allow(order).to receive(:token) { 'ABC' }
+          else
+            allow(order).to receive(:guest_token) { 'ABC' }
+          end
+        end
 
         it 'redirects to the tokenized order view' do
-          request.cookie_jar.signed[:guest_token] = 'ABC'
+          if Spree.version.to_f > 3.6
+            request.cookie_jar.signed[:token] = 'ABC'
+          else
+            request.cookie_jar.signed[:guest_token] = 'ABC'
+          end
           spree_post :update, { state: 'confirm' }
           expect(response).to redirect_to spree.order_path(order)
           expect(flash.notice).to eq Spree.t(:order_processed_successfully)

data/spec/controllers/spree/user_sessions_controller_spec.rb

@@ -106,6 +106,26 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
         end
       end
 
+      context 'with a guest_token from a pre-3.7 version of Spree present' do
+        before do
+          request.cookie_jar.signed[:guest_token] = 'ABC'
+          request.cookie_jar.signed[:token] = 'DEF'
+        end
+          
+        it 'assigns the correct token attribute for the order' do 
+          if Spree.version.to_f > 3.6
+            order = create(:order, email: user.email, token: 'ABC', user_id: nil, created_by_id: nil)
+          else
+            order = create(:order, email: user.email, guest_token: 'ABC', user_id: nil, created_by_id: nil)
+          end
+          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 
+      end
+
       context "and html format is used" do
         it "redirects to default after signing in" do
           spree_post :create, spree_user: { email: user.email, password: 'secret' }

data/spec/features/checkout_spec.rb

@@ -31,9 +31,7 @@ RSpec.feature 'Checkout', :js, type: :feature do
 
     scenario 'allow a visitor to checkout as guest, without registration' do
       Spree::Auth::Config.set(registration_step: true)
-      click_link 'RoR Mug'
-      click_button 'Add To Cart'
-      within('h1') { expect(page).to have_text 'Shopping Cart' }
+      add_to_cart 'RoR Mug'
       click_button 'Checkout'
 
       expect(page).to have_content(/Checkout as a Guest/i)
@@ -60,13 +58,13 @@ RSpec.feature 'Checkout', :js, type: :feature do
 
     scenario 'associate an uncompleted guest order with user after logging in' do
       user = create(:user, email: 'email@person.com', password: 'password', password_confirmation: 'password')
-      click_link 'RoR Mug'
-      click_button 'Add To Cart'
+      add_to_cart 'RoR Mug'
 
       visit spree.login_path
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password
       click_button 'Login'
+      expect(page).to have_text('Cart')
       click_link 'Cart'
 
       expect(page).to have_text 'RoR Mug'
@@ -93,8 +91,7 @@ RSpec.feature 'Checkout', :js, type: :feature do
     scenario 'associate an incomplete guest order with user after successful password reset' do
       create(:store)
       user = create(:user, email: 'email@person.com', password: 'password', password_confirmation: 'password')
-      click_link 'RoR Mug'
-      click_button 'Add To Cart'
+      add_to_cart 'RoR Mug'
 
       visit spree.login_path
       click_link 'Forgot Password?'
@@ -112,7 +109,9 @@ RSpec.feature 'Checkout', :js, type: :feature do
       fill_in 'Password Confirmation', with: 'password'
       click_button 'Update'
 
+      expect(page).to have_text('Cart')
       click_link 'Cart'
+      expect(page).to have_text('RoR Mug')
       click_button 'Checkout'
 
       str_addr = 'bill_address'
@@ -129,8 +128,7 @@ RSpec.feature 'Checkout', :js, type: :feature do
     end
 
     scenario 'allow a user to register during checkout' do
-      click_link 'RoR Mug'
-      click_button 'Add To Cart'
+      add_to_cart 'RoR Mug'
       click_button 'Checkout'
 
       expect(page).to have_text 'Registration'

data/spec/features/order_spec.rb

@@ -17,10 +17,7 @@ RSpec.feature 'Orders', :js, type: :feature do
     user = create(:user, email: 'email@person.com', password: 'password', password_confirmation: 'password')
 
     using_session('first') do
-      visit spree.root_path
-
-      click_link 'RoR Mug'
-      click_button 'Add To Cart'
+      add_to_cart 'RoR Mug'
 
       visit spree.login_path
       fill_in 'Email', with: user.email
@@ -32,10 +29,7 @@ RSpec.feature 'Orders', :js, type: :feature do
     end
 
     using_session('second') do
-      visit spree.root_path
-
-      click_link 'RoR Shirt'
-      click_button 'Add To Cart'
+      add_to_cart 'RoR Shirt'
 
       visit spree.login_path
       fill_in 'Email', with: user.email

data/spec/features/sign_out_spec.rb

@@ -31,12 +31,7 @@ RSpec.feature 'Sign Out', type: :feature, js: true do
     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'
+      add_to_cart 'RoR Mug'
       expect(page).to have_text 'RoR Mug'
 
       click_link 'Logout'

data/spec/support/add_to_cart.rb

@@ -0,0 +1,15 @@
+def add_to_cart(product_name)
+  visit spree.root_path
+  click_link product_name
+  if Spree.version.to_f > 3.6
+    expect(page).to have_selector('form#add-to-cart-form')
+    expect(page).to have_selector('button#add-to-cart-button')
+    wait_for_condition do
+      expect(page.find('#add-to-cart-button').disabled?).to eq(false)
+    end
+  end
+  click_button 'Add To Cart'
+  wait_for_condition do
+    expect(page).to have_content(Spree.t(:shopping_cart))
+  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.4.0'
+  s.version     = '3.5.2'
   s.summary     = 'Provides authentication and authorization services for use with Spree by using Devise and CanCan.'
   s.description = s.summary
 
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'devise', '~> 4.4.0'
+  s.add_dependency 'devise', '>= 4.4', '< 4.7'
   s.add_dependency 'devise-encryptable', '0.2.0'
 
   spree_version = '>= 3.1.0', '< 4.0'
@@ -29,13 +29,14 @@ Gem::Specification.new do |s|
   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 'sass-rails'
   s.add_development_dependency 'database_cleaner', '~> 1.5'
   s.add_development_dependency 'email_spec', '~> 2.1'
   s.add_development_dependency 'factory_bot', '~> 4.7'
   s.add_development_dependency 'ffaker'
   s.add_development_dependency 'launchy'
-  s.add_development_dependency 'mysql2', '~> 0.5.1'
-  s.add_development_dependency 'pg', '~> 0.18'
+  s.add_development_dependency 'mysql2'
+  s.add_development_dependency 'pg'
   s.add_development_dependency 'selenium-webdriver'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rspec-rails', '~> 3.5'

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: spree_auth_devise
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-06 00:00:00.000000000 Z
+date: 2019-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: '4.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.4'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: devise-encryptable
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +120,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: sass-rails
+  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: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -188,30 +208,30 @@ dependencies:
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -367,11 +387,23 @@ files:
 - README.md
 - Rakefile
 - app/controllers/metal_decorator.rb
+- app/controllers/spree/user_confirmations_controller.rb
+- app/controllers/spree/user_passwords_controller.rb
+- app/controllers/spree/user_registrations_controller.rb
+- app/controllers/spree/user_sessions_controller.rb
 - app/mailers/spree/user_mailer.rb
 - app/models/spree/auth_configuration.rb
 - app/models/spree/user.rb
 - app/overrides/auth_shared_login_bar.rb
 - app/overrides/spree/admin/shared/_header/auth_admin_login_navigation_bar.html.erb.deface
+- app/views/spree/shared/_login.html.erb
+- app/views/spree/shared/_user_form.html.erb
+- app/views/spree/user_mailer/confirmation_instructions.text.erb
+- app/views/spree/user_mailer/reset_password_instructions.text.erb
+- app/views/spree/user_passwords/edit.html.erb
+- app/views/spree/user_passwords/new.html.erb
+- app/views/spree/user_registrations/new.html.erb
+- app/views/spree/user_sessions/new.html.erb
 - bin/rails
 - config.ru
 - config/initializers/devise.rb
@@ -399,7 +431,7 @@ files:
 - db/seeds.rb
 - gemfiles/spree_3_2.gemfile
 - gemfiles/spree_3_5.gemfile
-- gemfiles/spree_3_6.gemfile
+- gemfiles/spree_3_7.gemfile
 - gemfiles/spree_master.gemfile
 - lib/assets/javascripts/spree/backend/spree_auth.js.erb
 - lib/assets/javascripts/spree/frontend/account.js
@@ -414,10 +446,6 @@ files:
 - lib/controllers/backend/spree/admin/user_sessions_controller.rb
 - lib/controllers/frontend/spree/checkout_controller_decorator.rb
 - lib/controllers/frontend/spree/store_controller_decorator.rb
-- lib/controllers/frontend/spree/user_confirmations_controller.rb
-- lib/controllers/frontend/spree/user_passwords_controller.rb
-- lib/controllers/frontend/spree/user_registrations_controller.rb
-- lib/controllers/frontend/spree/user_sessions_controller.rb
 - lib/controllers/frontend/spree/users_controller.rb
 - lib/generators/spree/auth/install/install_generator.rb
 - lib/generators/spree/auth/install/templates/config/initializers/devise.rb
@@ -437,15 +465,7 @@ files:
 - lib/views/frontend/spree/checkout/registration.html.erb
 - lib/views/frontend/spree/shared/_flashes.html.erb
 - lib/views/frontend/spree/shared/_link_to_account.html.erb
-- lib/views/frontend/spree/shared/_login.html.erb
 - lib/views/frontend/spree/shared/_login_bar.html.erb
-- lib/views/frontend/spree/shared/_user_form.html.erb
-- lib/views/frontend/spree/user_mailer/confirmation_instructions.text.erb
-- lib/views/frontend/spree/user_mailer/reset_password_instructions.text.erb
-- lib/views/frontend/spree/user_passwords/edit.html.erb
-- lib/views/frontend/spree/user_passwords/new.html.erb
-- lib/views/frontend/spree/user_registrations/new.html.erb
-- lib/views/frontend/spree/user_sessions/new.html.erb
 - lib/views/frontend/spree/users/edit.html.erb
 - lib/views/frontend/spree/users/show.html.erb
 - spec/controllers/spree/admin/orders_controller_spec.rb
@@ -477,6 +497,7 @@ files:
 - spec/models/user_spec.rb
 - spec/spec_helper.rb
 - spec/support/ability.rb
+- spec/support/add_to_cart.rb
 - spec/support/authentication_helpers.rb
 - spec/support/cache_helpers.rb
 - spec/support/capybara.rb
@@ -508,8 +529,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Provides authentication and authorization services for use with Spree by
@@ -544,6 +564,7 @@ test_files:
 - spec/models/user_spec.rb
 - spec/spec_helper.rb
 - spec/support/ability.rb
+- spec/support/add_to_cart.rb
 - spec/support/authentication_helpers.rb
 - spec/support/cache_helpers.rb
 - spec/support/capybara.rb

data/lib/views/frontend/spree/shared/_login.html.erb

@@ -1,18 +0,0 @@
-<%= form_for Spree::User.new, :as => :spree_user, :url => spree.create_new_session_path do |f| %>
-  <div id="password-credentials">
-    <p>
-      <%= f.label :email, Spree.t(:email) %>
-      <%= f.email_field :email, :class => 'form-control', :tabindex => 1, autofocus: true %>
-    </p>
-    <p>
-      <%= f.label :password, Spree.t(:password) %>
-      <%= f.password_field :password, :class => 'form-control', :tabindex => 2 %>
-    </p>
-  </div>
-  <p>
-    <%= f.check_box :remember_me, :tabindex => 3 %>
-    <%= f.label :remember_me, Spree.t(:remember_me) %>
-  </p>
-
-  <p><%= f.submit Spree.t(:login), :class => 'btn btn-lg btn-success btn-block', :tabindex => 4 %></p>
-<% end %>