spree_auth_devise 3.4.2 → 3.5.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of spree_auth_devise might be problematic. Click here for more details.

Files changed (29) hide show
  1. checksums.yaml +5 -5
  2. data/.travis.yml +1 -1
  3. data/Appraisals +2 -2
  4. data/CHANGELOG.md +1 -1
  5. data/README.md +11 -0
  6. data/{lib/controllers/frontend → app/controllers}/spree/user_confirmations_controller.rb +0 -0
  7. data/{lib/controllers/frontend → app/controllers}/spree/user_passwords_controller.rb +4 -0
  8. data/{lib/controllers/frontend → app/controllers}/spree/user_registrations_controller.rb +4 -0
  9. data/{lib/controllers/frontend → app/controllers}/spree/user_sessions_controller.rb +4 -0
  10. data/app/views/spree/shared/_login.html.erb +18 -0
  11. data/{lib/views/frontend → app/views}/spree/shared/_user_form.html.erb +7 -3
  12. data/{lib/views/frontend → app/views}/spree/user_mailer/confirmation_instructions.text.erb +0 -0
  13. data/{lib/views/frontend → app/views}/spree/user_mailer/reset_password_instructions.text.erb +0 -0
  14. data/{lib/views/frontend → app/views}/spree/user_passwords/edit.html.erb +4 -4
  15. data/{lib/views/frontend → app/views}/spree/user_passwords/new.html.erb +4 -4
  16. data/{lib/views/frontend → app/views}/spree/user_registrations/new.html.erb +2 -2
  17. data/{lib/views/frontend → app/views}/spree/user_sessions/new.html.erb +0 -0
  18. data/gemfiles/{spree_3_6.gemfile → spree_3_7.gemfile} +1 -1
  19. data/lib/views/frontend/spree/checkout/_new_user.html.erb +1 -1
  20. data/lib/views/frontend/spree/checkout/registration.html.erb +4 -3
  21. data/lib/views/frontend/spree/users/edit.html.erb +4 -4
  22. data/spec/controllers/spree/checkout_controller_spec.rb +12 -2
  23. data/spec/features/checkout_spec.rb +7 -9
  24. data/spec/features/order_spec.rb +2 -8
  25. data/spec/features/sign_out_spec.rb +1 -6
  26. data/spec/support/add_to_cart.rb +15 -0
  27. data/spree_auth_devise.gemspec +4 -3
  28. metadata +40 -24
  29. data/lib/views/frontend/spree/shared/_login.html.erb +0 -18
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA256:
3
- metadata.gz: 771d1db19ed8144e21710c6667c2e2bf73974b8c8c24b693ba601b6f6cc48278
4
- data.tar.gz: d0fbe3b9e2f1def80007e7b8e50c449813c42b1fe4d96b2a74fae0501a650fc8
2
+ SHA1:
3
+ metadata.gz: 2824a140e6fc9a9aef40c8ee8b398727ecff720e
4
+ data.tar.gz: a5ceb54218dbadbd85a38299ba6bb5426c7359d6
5
5
  SHA512:
6
- metadata.gz: 27e41a104b15b1ba7cb8bb6b0c61b0c42b1d9a1c3059b8275c2dbdb67354acd020602bc1ec9f4e80fa254157ba8c22aa78dcf677810f41ec19f856d6e5bca668
7
- data.tar.gz: d75b190842f95ee4e60636e09926efec998c79873d43926479adcd541866dbebebd776ff033ba12a83d75c61528452a1c8ec96124b0a8aec778f17045f222d8a
6
+ metadata.gz: 095cd14cf5a2ceb7fcd43e455633d75d4ce00f1ee1d024454a742f475b590b792b3b94bb67f8e9dba2057060959e7ea2f567bcab0cbf2dddca280747eae41640
7
+ data.tar.gz: 1554b3f69188b0276e572bc18d4152811a58c876cb54999685a38c116e23376d3c29178947d9495644839c886c3f0cf06c91f669591ad1dd6e6e3509b408ec30
data/.travis.yml CHANGED
@@ -22,7 +22,7 @@ rvm:
22
22
  gemfile:
23
23
  - gemfiles/spree_3_2.gemfile
24
24
  - gemfiles/spree_3_5.gemfile
25
- - gemfiles/spree_3_6.gemfile
25
+ - gemfiles/spree_3_7.gemfile
26
26
  - gemfiles/spree_master.gemfile
27
27
 
28
28
  matrix:
data/Appraisals CHANGED
@@ -8,8 +8,8 @@ appraise 'spree-3-5' do
8
8
  gem 'rails-controller-testing'
9
9
  end
10
10
 
11
- appraise 'spree-3-6' do
12
- gem 'spree', '~> 3.6.0'
11
+ appraise 'spree-3-7' do
12
+ gem 'spree', '~> 3.7.0.rc3'
13
13
  gem 'rails-controller-testing'
14
14
  end
15
15
 
data/CHANGELOG.md CHANGED
@@ -1,6 +1,6 @@
1
1
  ## Spree Auth Devise v3.3.0 (unreleased)
2
2
 
3
- * `Rails 5.1` support with `spree_extension` gem for compatiblity with all Rails version 4.2+
3
+ * `Rails 5.1` support with `spree_extension` gem for compatibility with all Rails version 4.2+
4
4
 
5
5
  ## Spree Auth Devise v3.2.0 (2017-06-15)
6
6
 
data/README.md CHANGED
@@ -132,3 +132,14 @@ You need to do a quick one-time creation of a test application and then you can
132
132
  Then run the rspec tests.
133
133
 
134
134
  bundle exec rspec
135
+
136
+ About Spark Solutions
137
+ ----------------------
138
+ [![Spark Solutions](http://sparksolutions.co/wp-content/uploads/2015/01/logo-ss-tr-221x100.png)][spark]
139
+
140
+ Spree Auth Devise is maintained by [Spark Solutions Sp. z o.o.][spark].
141
+
142
+ We are passionate about open source software.
143
+ We are [available for hire][spark].
144
+
145
+ [spark]:http://sparksolutions.co?utm_source=github
@@ -6,6 +6,10 @@ class Spree::UserPasswordsController < Devise::PasswordsController
6
6
  include Spree::Core::ControllerHelpers::Order
7
7
  include Spree::Core::ControllerHelpers::Store
8
8
 
9
+ if defined?(SpreeI18n::ControllerLocaleHelper)
10
+ include SpreeI18n::ControllerLocaleHelper
11
+ end
12
+
9
13
  # Overridden due to bug in Devise.
10
14
  # respond_with resource, :location => new_session_path(resource_name)
11
15
  # is generating bad url /session/new.user
@@ -6,6 +6,10 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
6
6
  include Spree::Core::ControllerHelpers::Order
7
7
  include Spree::Core::ControllerHelpers::Store
8
8
 
9
+ if defined?(SpreeI18n::ControllerLocaleHelper)
10
+ include SpreeI18n::ControllerLocaleHelper
11
+ end
12
+
9
13
  before_action :check_permissions, only: [:edit, :update]
10
14
  skip_before_action :require_no_authentication
11
15
 
@@ -6,6 +6,10 @@ class Spree::UserSessionsController < Devise::SessionsController
6
6
  include Spree::Core::ControllerHelpers::Order
7
7
  include Spree::Core::ControllerHelpers::Store
8
8
 
9
+ if defined?(SpreeI18n::ControllerLocaleHelper)
10
+ include SpreeI18n::ControllerLocaleHelper
11
+ end
12
+
9
13
  def create
10
14
  authenticate_spree_user!
11
15
 
@@ -0,0 +1,18 @@
1
+ <%= form_for Spree::User.new, :as => :spree_user, :url => spree.create_new_session_path do |f| %>
2
+ <div id="password-credentials">
3
+ <div class="form-group">
4
+ <%= f.label :email, Spree.t(:email) %>
5
+ <%= f.email_field :email, placeholder: "#{Spree.t(:email)}", :class => 'form-control', :tabindex => 1, autofocus: true %>
6
+ </div>
7
+ <div class="form-group">
8
+ <%= f.label :password, Spree.t(:password) %>
9
+ <%= f.password_field :password, placeholder: "#{Spree.t(:password)}", :class => 'form-control', :tabindex => 2 %>
10
+ </div>
11
+ </div>
12
+ <div>
13
+ <%= f.check_box :remember_me, :tabindex => 3 %>
14
+ <%= f.label :remember_me, Spree.t(:remember_me) %>
15
+ </div>
16
+
17
+ <div><%= f.submit Spree.t(:login), :class => 'btn btn-lg btn-success btn-block', :tabindex => 4 %></div>
18
+ <% end %>
@@ -1,13 +1,17 @@
1
1
  <fieldset id="password-credentials">
2
2
  <div class="form-group">
3
+ <%= f.label :email, Spree.t(:email), class: 'required', title: 'required' %>
3
4
  <%= f.email_field :email, :class => 'form-control', :placeholder => Spree.t(:email) %>
4
5
  </div>
5
6
  <hr />
6
7
  <div class="form-group">
8
+ <%= f.label :password, Spree.t(:password), class: 'required', title: 'required' %>
7
9
  <%= f.password_field :password, :class => 'form-control', :placeholder => Spree.t(:password) %>
8
- </div>
10
+
11
+ </div>
9
12
  <div class="form-group">
13
+ <%= f.label :password_confirmation, Spree.t(:password_confirmation), class: 'required', title: 'required' %>
10
14
  <%= f.password_field :password_confirmation, :class => 'form-control', :placeholder => Spree.t(:confirm_password) %>
11
- </div>
15
+ </div>
12
16
  </fieldset>
13
- <div data-hook="signup_below_password_fields"></div>
17
+ <div data-hook="signup_below_password_fields"></div>
@@ -6,14 +6,14 @@
6
6
  </div>
7
7
  <div class="panel-body">
8
8
  <%= form_for @spree_user, :as => :spree_user, :url => spree.update_password_path, :method => :put do |f| %>
9
- <p>
9
+ <div class="form-group">
10
10
  <%= f.label :password, Spree.t(:password) %>
11
11
  <%= f.password_field :password, :class => "form-control" %>
12
- </p>
13
- <p>
12
+ </div>
13
+ <div class="form-group">
14
14
  <%= f.label :password_confirmation, Spree.t(:confirm_password) %>
15
15
  <%= f.password_field :password_confirmation, :class => "form-control" %>
16
- </p>
16
+ </div>
17
17
  <%= f.hidden_field :reset_password_token %>
18
18
  <%= f.submit Spree.t(:update), :class => 'btn btn-lg btn-success btn-block' %>
19
19
  <% end %>
@@ -8,13 +8,13 @@
8
8
  <p><%= Spree.t(:instructions_to_reset_password) %></p>
9
9
 
10
10
  <%= form_for Spree::User.new, :as => :spree_user, :url => spree.reset_password_path do |f| %>
11
- <p>
11
+ <div class="form-group">
12
12
  <%= f.label :email, Spree.t(:email) %>
13
13
  <%= f.email_field :email, :class => "form-control" %>
14
- </p>
15
- <p>
14
+ </div>
15
+ <div>
16
16
  <%= f.submit Spree.t(:reset_password), :class => 'btn btn-lg btn-success btn-block' %>
17
- </p>
17
+ </div>
18
18
  <% end %>
19
19
  </div>
20
20
  </div>
@@ -9,11 +9,11 @@
9
9
  <%= form_for resource, :as => :spree_user, :url => spree.registration_path do |f| %>
10
10
  <div data-hook="signup_inside_form">
11
11
  <%= render :partial => 'spree/shared/user_form', :locals => { :f => f } %>
12
- <p><%= f.submit Spree.t(:create), :class => 'btn btn-lg btn-success btn-block' %></p>
12
+ <div><%= f.submit Spree.t(:create), :class => 'btn btn-lg btn-success btn-block' %></div>
13
13
  </div>
14
14
  <% end %>
15
15
  <div class="text-center">
16
- <%= Spree.t(:or) %>
16
+ <%= Spree.t(:or) %>
17
17
  <%= link_to Spree.t(:login_as_existing), spree.login_path %>
18
18
  </div>
19
19
  <div data-hook="login_extras"></div>
@@ -3,6 +3,6 @@
3
3
  source "https://rubygems.org"
4
4
 
5
5
  gem "rails-controller-testing"
6
- gem "spree", "~> 3.6.0"
6
+ gem "spree", "~> 3.7.0.rc3"
7
7
 
8
8
  gemspec path: "../"
@@ -7,7 +7,7 @@
7
7
  <%= form_for @user, :as => :spree_user, :url => spree.registration_path(@user) do |f| %>
8
8
  <div data-hook="signup_inside_form">
9
9
  <%= render :partial => 'spree/shared/user_form', :locals => { :f => f } %>
10
- <p><%= f.submit Spree.t(:create), :class => 'btn btn-lg btn-success btn-block' %></p>
10
+ <div><%= f.submit Spree.t(:create), :class => 'btn btn-lg btn-success btn-block' %></div>
11
11
  </div>
12
12
  <% end %>
13
13
  <div class="text-center">
@@ -12,10 +12,11 @@
12
12
  </div>
13
13
  <div id="guest_checkout" class="panel-body" data-hook>
14
14
  <%= form_for @order, :url => update_checkout_registration_path, :method => :put, :html => { :id => 'checkout_form_registration' } do |f| %>
15
- <p>
15
+ <div class="form-group">
16
+ <%= f.label :email, Spree.t(:email), class: 'required', title: 'required' %>
16
17
  <%= f.email_field :email, :class => 'form-control title', :placeholder => Spree.t(:email) %>
17
- </p>
18
- <p><%= f.submit Spree.t(:continue), :class => 'btn btn-lg btn-success btn-block' %></p>
18
+ </div>
19
+ <div><%= f.submit Spree.t(:continue), :class => 'btn btn-lg btn-success btn-block' %></div>
19
20
  <% end %>
20
21
  </div>
21
22
  </div>
@@ -5,13 +5,13 @@
5
5
  </div>
6
6
  <div class="panel-body">
7
7
  <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
8
-
8
+
9
9
  <%= form_for Spree::User.new, :as => @user, :url => spree.user_path(@user), :method => :put do |f| %>
10
10
  <%= render :partial => 'spree/shared/user_form', :locals => { :f => f } %>
11
- <p>
11
+ <div>
12
12
  <%= f.submit Spree.t(:update), :class => 'btn btn-primary' %>
13
- </p>
13
+ </div>
14
14
  <% end %>
15
15
  </div>
16
16
  </div>
17
- </div>
17
+ </div>
@@ -67,10 +67,20 @@ RSpec.describe Spree::CheckoutController, type: :controller do
67
67
  end
68
68
 
69
69
  context 'with a token' do
70
- before { allow(order).to receive(:guest_token) { 'ABC' } }
70
+ before do
71
+ if Spree.version.to_f > 3.6
72
+ allow(order).to receive(:token) { 'ABC' }
73
+ else
74
+ allow(order).to receive(:guest_token) { 'ABC' }
75
+ end
76
+ end
71
77
 
72
78
  it 'redirects to the tokenized order view' do
73
- request.cookie_jar.signed[:guest_token] = 'ABC'
79
+ if Spree.version.to_f > 3.6
80
+ request.cookie_jar.signed[:token] = 'ABC'
81
+ else
82
+ request.cookie_jar.signed[:guest_token] = 'ABC'
83
+ end
74
84
  spree_post :update, { state: 'confirm' }
75
85
  expect(response).to redirect_to spree.order_path(order)
76
86
  expect(flash.notice).to eq Spree.t(:order_processed_successfully)
@@ -31,9 +31,7 @@ RSpec.feature 'Checkout', :js, type: :feature do
31
31
 
32
32
  scenario 'allow a visitor to checkout as guest, without registration' do
33
33
  Spree::Auth::Config.set(registration_step: true)
34
- click_link 'RoR Mug'
35
- click_button 'Add To Cart'
36
- within('h1') { expect(page).to have_text 'Shopping Cart' }
34
+ add_to_cart 'RoR Mug'
37
35
  click_button 'Checkout'
38
36
 
39
37
  expect(page).to have_content(/Checkout as a Guest/i)
@@ -60,13 +58,13 @@ RSpec.feature 'Checkout', :js, type: :feature do
60
58
 
61
59
  scenario 'associate an uncompleted guest order with user after logging in' do
62
60
  user = create(:user, email: 'email@person.com', password: 'password', password_confirmation: 'password')
63
- click_link 'RoR Mug'
64
- click_button 'Add To Cart'
61
+ add_to_cart 'RoR Mug'
65
62
 
66
63
  visit spree.login_path
67
64
  fill_in 'Email', with: user.email
68
65
  fill_in 'Password', with: user.password
69
66
  click_button 'Login'
67
+ expect(page).to have_text('Cart')
70
68
  click_link 'Cart'
71
69
 
72
70
  expect(page).to have_text 'RoR Mug'
@@ -93,8 +91,7 @@ RSpec.feature 'Checkout', :js, type: :feature do
93
91
  scenario 'associate an incomplete guest order with user after successful password reset' do
94
92
  create(:store)
95
93
  user = create(:user, email: 'email@person.com', password: 'password', password_confirmation: 'password')
96
- click_link 'RoR Mug'
97
- click_button 'Add To Cart'
94
+ add_to_cart 'RoR Mug'
98
95
 
99
96
  visit spree.login_path
100
97
  click_link 'Forgot Password?'
@@ -112,7 +109,9 @@ RSpec.feature 'Checkout', :js, type: :feature do
112
109
  fill_in 'Password Confirmation', with: 'password'
113
110
  click_button 'Update'
114
111
 
112
+ expect(page).to have_text('Cart')
115
113
  click_link 'Cart'
114
+ expect(page).to have_text('RoR Mug')
116
115
  click_button 'Checkout'
117
116
 
118
117
  str_addr = 'bill_address'
@@ -129,8 +128,7 @@ RSpec.feature 'Checkout', :js, type: :feature do
129
128
  end
130
129
 
131
130
  scenario 'allow a user to register during checkout' do
132
- click_link 'RoR Mug'
133
- click_button 'Add To Cart'
131
+ add_to_cart 'RoR Mug'
134
132
  click_button 'Checkout'
135
133
 
136
134
  expect(page).to have_text 'Registration'
@@ -17,10 +17,7 @@ RSpec.feature 'Orders', :js, type: :feature do
17
17
  user = create(:user, email: 'email@person.com', password: 'password', password_confirmation: 'password')
18
18
 
19
19
  using_session('first') do
20
- visit spree.root_path
21
-
22
- click_link 'RoR Mug'
23
- click_button 'Add To Cart'
20
+ add_to_cart 'RoR Mug'
24
21
 
25
22
  visit spree.login_path
26
23
  fill_in 'Email', with: user.email
@@ -32,10 +29,7 @@ RSpec.feature 'Orders', :js, type: :feature do
32
29
  end
33
30
 
34
31
  using_session('second') do
35
- visit spree.root_path
36
-
37
- click_link 'RoR Shirt'
38
- click_button 'Add To Cart'
32
+ add_to_cart 'RoR Shirt'
39
33
 
40
34
  visit spree.login_path
41
35
  fill_in 'Email', with: user.email
@@ -31,12 +31,7 @@ RSpec.feature 'Sign Out', type: :feature, js: true do
31
31
  let!(:other_user) { create(:user) }
32
32
 
33
33
  it 'clears token cookies' do
34
- visit spree.root_path
35
-
36
- click_link 'RoR Mug'
37
- click_button 'Add To Cart'
38
-
39
- click_link 'Cart'
34
+ add_to_cart 'RoR Mug'
40
35
  expect(page).to have_text 'RoR Mug'
41
36
 
42
37
  click_link 'Logout'
@@ -0,0 +1,15 @@
1
+ def add_to_cart(product_name)
2
+ visit spree.root_path
3
+ click_link product_name
4
+ if Spree.version.to_f > 3.6
5
+ expect(page).to have_selector('form#add-to-cart-form')
6
+ expect(page).to have_selector('button#add-to-cart-button')
7
+ wait_for_condition do
8
+ expect(page.find('#add-to-cart-button').disabled?).to eq(false)
9
+ end
10
+ end
11
+ click_button 'Add To Cart'
12
+ wait_for_condition do
13
+ expect(page).to have_content(Spree.t(:shopping_cart))
14
+ end
15
+ end
@@ -3,7 +3,7 @@
3
3
  Gem::Specification.new do |s|
4
4
  s.platform = Gem::Platform::RUBY
5
5
  s.name = 'spree_auth_devise'
6
- s.version = '3.4.2'
6
+ s.version = '3.5.0'
7
7
  s.summary = 'Provides authentication and authorization services for use with Spree by using Devise and CanCan.'
8
8
  s.description = s.summary
9
9
 
@@ -29,13 +29,14 @@ Gem::Specification.new do |s|
29
29
  s.add_development_dependency 'capybara', '~> 2.7'
30
30
  s.add_development_dependency 'capybara-screenshot'
31
31
  s.add_development_dependency 'coffee-rails', '~> 4.2'
32
+ s.add_development_dependency 'sass-rails'
32
33
  s.add_development_dependency 'database_cleaner', '~> 1.5'
33
34
  s.add_development_dependency 'email_spec', '~> 2.1'
34
35
  s.add_development_dependency 'factory_bot', '~> 4.7'
35
36
  s.add_development_dependency 'ffaker'
36
37
  s.add_development_dependency 'launchy'
37
- s.add_development_dependency 'mysql2', '~> 0.5.1'
38
- s.add_development_dependency 'pg', '~> 0.18'
38
+ s.add_development_dependency 'mysql2'
39
+ s.add_development_dependency 'pg'
39
40
  s.add_development_dependency 'selenium-webdriver'
40
41
  s.add_development_dependency 'pry'
41
42
  s.add_development_dependency 'rspec-rails', '~> 3.5'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_auth_devise
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.4.2
4
+ version: 3.5.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-10-09 00:00:00.000000000 Z
11
+ date: 2019-01-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: devise
@@ -114,6 +114,20 @@ dependencies:
114
114
  - - "~>"
115
115
  - !ruby/object:Gem::Version
116
116
  version: '4.2'
117
+ - !ruby/object:Gem::Dependency
118
+ name: sass-rails
119
+ requirement: !ruby/object:Gem::Requirement
120
+ requirements:
121
+ - - ">="
122
+ - !ruby/object:Gem::Version
123
+ version: '0'
124
+ type: :development
125
+ prerelease: false
126
+ version_requirements: !ruby/object:Gem::Requirement
127
+ requirements:
128
+ - - ">="
129
+ - !ruby/object:Gem::Version
130
+ version: '0'
117
131
  - !ruby/object:Gem::Dependency
118
132
  name: database_cleaner
119
133
  requirement: !ruby/object:Gem::Requirement
@@ -188,30 +202,30 @@ dependencies:
188
202
  name: mysql2
189
203
  requirement: !ruby/object:Gem::Requirement
190
204
  requirements:
191
- - - "~>"
205
+ - - ">="
192
206
  - !ruby/object:Gem::Version
193
- version: 0.5.1
207
+ version: '0'
194
208
  type: :development
195
209
  prerelease: false
196
210
  version_requirements: !ruby/object:Gem::Requirement
197
211
  requirements:
198
- - - "~>"
212
+ - - ">="
199
213
  - !ruby/object:Gem::Version
200
- version: 0.5.1
214
+ version: '0'
201
215
  - !ruby/object:Gem::Dependency
202
216
  name: pg
203
217
  requirement: !ruby/object:Gem::Requirement
204
218
  requirements:
205
- - - "~>"
219
+ - - ">="
206
220
  - !ruby/object:Gem::Version
207
- version: '0.18'
221
+ version: '0'
208
222
  type: :development
209
223
  prerelease: false
210
224
  version_requirements: !ruby/object:Gem::Requirement
211
225
  requirements:
212
- - - "~>"
226
+ - - ">="
213
227
  - !ruby/object:Gem::Version
214
- version: '0.18'
228
+ version: '0'
215
229
  - !ruby/object:Gem::Dependency
216
230
  name: selenium-webdriver
217
231
  requirement: !ruby/object:Gem::Requirement
@@ -367,11 +381,23 @@ files:
367
381
  - README.md
368
382
  - Rakefile
369
383
  - app/controllers/metal_decorator.rb
384
+ - app/controllers/spree/user_confirmations_controller.rb
385
+ - app/controllers/spree/user_passwords_controller.rb
386
+ - app/controllers/spree/user_registrations_controller.rb
387
+ - app/controllers/spree/user_sessions_controller.rb
370
388
  - app/mailers/spree/user_mailer.rb
371
389
  - app/models/spree/auth_configuration.rb
372
390
  - app/models/spree/user.rb
373
391
  - app/overrides/auth_shared_login_bar.rb
374
392
  - app/overrides/spree/admin/shared/_header/auth_admin_login_navigation_bar.html.erb.deface
393
+ - app/views/spree/shared/_login.html.erb
394
+ - app/views/spree/shared/_user_form.html.erb
395
+ - app/views/spree/user_mailer/confirmation_instructions.text.erb
396
+ - app/views/spree/user_mailer/reset_password_instructions.text.erb
397
+ - app/views/spree/user_passwords/edit.html.erb
398
+ - app/views/spree/user_passwords/new.html.erb
399
+ - app/views/spree/user_registrations/new.html.erb
400
+ - app/views/spree/user_sessions/new.html.erb
375
401
  - bin/rails
376
402
  - config.ru
377
403
  - config/initializers/devise.rb
@@ -399,7 +425,7 @@ files:
399
425
  - db/seeds.rb
400
426
  - gemfiles/spree_3_2.gemfile
401
427
  - gemfiles/spree_3_5.gemfile
402
- - gemfiles/spree_3_6.gemfile
428
+ - gemfiles/spree_3_7.gemfile
403
429
  - gemfiles/spree_master.gemfile
404
430
  - lib/assets/javascripts/spree/backend/spree_auth.js.erb
405
431
  - lib/assets/javascripts/spree/frontend/account.js
@@ -414,10 +440,6 @@ files:
414
440
  - lib/controllers/backend/spree/admin/user_sessions_controller.rb
415
441
  - lib/controllers/frontend/spree/checkout_controller_decorator.rb
416
442
  - lib/controllers/frontend/spree/store_controller_decorator.rb
417
- - lib/controllers/frontend/spree/user_confirmations_controller.rb
418
- - lib/controllers/frontend/spree/user_passwords_controller.rb
419
- - lib/controllers/frontend/spree/user_registrations_controller.rb
420
- - lib/controllers/frontend/spree/user_sessions_controller.rb
421
443
  - lib/controllers/frontend/spree/users_controller.rb
422
444
  - lib/generators/spree/auth/install/install_generator.rb
423
445
  - lib/generators/spree/auth/install/templates/config/initializers/devise.rb
@@ -437,15 +459,7 @@ files:
437
459
  - lib/views/frontend/spree/checkout/registration.html.erb
438
460
  - lib/views/frontend/spree/shared/_flashes.html.erb
439
461
  - lib/views/frontend/spree/shared/_link_to_account.html.erb
440
- - lib/views/frontend/spree/shared/_login.html.erb
441
462
  - lib/views/frontend/spree/shared/_login_bar.html.erb
442
- - lib/views/frontend/spree/shared/_user_form.html.erb
443
- - lib/views/frontend/spree/user_mailer/confirmation_instructions.text.erb
444
- - lib/views/frontend/spree/user_mailer/reset_password_instructions.text.erb
445
- - lib/views/frontend/spree/user_passwords/edit.html.erb
446
- - lib/views/frontend/spree/user_passwords/new.html.erb
447
- - lib/views/frontend/spree/user_registrations/new.html.erb
448
- - lib/views/frontend/spree/user_sessions/new.html.erb
449
463
  - lib/views/frontend/spree/users/edit.html.erb
450
464
  - lib/views/frontend/spree/users/show.html.erb
451
465
  - spec/controllers/spree/admin/orders_controller_spec.rb
@@ -477,6 +491,7 @@ files:
477
491
  - spec/models/user_spec.rb
478
492
  - spec/spec_helper.rb
479
493
  - spec/support/ability.rb
494
+ - spec/support/add_to_cart.rb
480
495
  - spec/support/authentication_helpers.rb
481
496
  - spec/support/cache_helpers.rb
482
497
  - spec/support/capybara.rb
@@ -509,7 +524,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
509
524
  requirements:
510
525
  - none
511
526
  rubyforge_project:
512
- rubygems_version: 2.7.6
527
+ rubygems_version: 2.6.10
513
528
  signing_key:
514
529
  specification_version: 4
515
530
  summary: Provides authentication and authorization services for use with Spree by
@@ -544,6 +559,7 @@ test_files:
544
559
  - spec/models/user_spec.rb
545
560
  - spec/spec_helper.rb
546
561
  - spec/support/ability.rb
562
+ - spec/support/add_to_cart.rb
547
563
  - spec/support/authentication_helpers.rb
548
564
  - spec/support/cache_helpers.rb
549
565
  - spec/support/capybara.rb
@@ -1,18 +0,0 @@
1
- <%= form_for Spree::User.new, :as => :spree_user, :url => spree.create_new_session_path do |f| %>
2
- <div id="password-credentials">
3
- <p>
4
- <%= f.label :email, Spree.t(:email) %>
5
- <%= f.email_field :email, :class => 'form-control', :tabindex => 1, autofocus: true %>
6
- </p>
7
- <p>
8
- <%= f.label :password, Spree.t(:password) %>
9
- <%= f.password_field :password, :class => 'form-control', :tabindex => 2 %>
10
- </p>
11
- </div>
12
- <p>
13
- <%= f.check_box :remember_me, :tabindex => 3 %>
14
- <%= f.label :remember_me, Spree.t(:remember_me) %>
15
- </p>
16
-
17
- <p><%= f.submit Spree.t(:login), :class => 'btn btn-lg btn-success btn-block', :tabindex => 4 %></p>
18
- <% end %>