spree_auth_devise 4.0.0.rc2 → 4.1.1

data/lib/views/backend/spree/admin/user_passwords/new.html.erb

@@ -5,7 +5,7 @@
 
   <p><%= Spree.t(:instructions_to_reset_password) %></p>
 
-  <%= form_for Spree::User.new, :as => :spree_user, :url => spree.reset_password_path do |f| %>
+  <%= form_for Spree.user_class.new, :as => :spree_user, :url => spree.reset_password_path do |f| %>
     <p>
       <%= f.label :email, Spree.t(:email) %><br />
       <%= f.email_field :email %>

data/lib/views/backend/spree/admin/user_sessions/new.html.erb

@@ -4,7 +4,7 @@
 
 <div data-hook="login" class="card border-0">
   <div class="card-body">
-    <%= form_for Spree::User.new, :as => :spree_user, :url => spree.admin_create_new_session_path do |f| %>
+    <%= form_for Spree.user_class.new, :as => :spree_user, :url => spree.admin_create_new_session_path do |f| %>
       <div id="password-credentials">
         <div class="form-group text-center">
           <%= f.label :email, Spree.t(:email) %>

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

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

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

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

data/spec/controllers/spree/checkout_controller_spec.rb

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

data/spec/controllers/spree/products_controller_spec.rb

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

data/spec/controllers/spree/user_passwords_controller_spec.rb

@@ -6,14 +6,14 @@ RSpec.describe Spree::UserPasswordsController, type: :controller do
   describe 'GET edit' do
     context 'when the user token has not been specified' do
       it 'redirects to the new session path' do
-        spree_get :edit
+        get :edit
         expect(response).to redirect_to(
           'http://test.host/user/spree_user/sign_in'
         )
       end
 
       it 'flashes an error' do
-        spree_get :edit
+        get :edit
         expect(flash[:alert]).to include(
           "You can't access this page without coming from a password reset " \
           'email'
@@ -23,7 +23,7 @@ RSpec.describe Spree::UserPasswordsController, type: :controller do
 
     context 'when the user token has been specified' do
       it 'does something' do
-        spree_get :edit, reset_password_token: token
+        get :edit, params: { reset_password_token: token }
         expect(response.code).to eq('200')
       end
     end
@@ -32,7 +32,7 @@ RSpec.describe Spree::UserPasswordsController, type: :controller do
   context '#update' do
     context 'when updating password with blank password' do
       it 'shows error flash message, sets spree_user with token and re-displays password edit form' do
-        spree_put :update, { spree_user: { password: '', password_confirmation: '', reset_password_token: token } }
+        put :update, params: { spree_user: { password: '', password_confirmation: '', reset_password_token: token } }
         expect(assigns(:spree_user).is_a?(Spree::User)).to eq true
         expect(assigns(:spree_user).reset_password_token).to eq token
         expect(flash[:error]).to eq I18n.t(:cannot_be_blank, scope: [:devise, :user_passwords, :spree_user])

data/spec/controllers/spree/user_registrations_controller_spec.rb

@@ -2,11 +2,11 @@ RSpec.describe Spree::UserRegistrationsController, type: :controller do
   before { @request.env['devise.mapping'] = Devise.mappings[:spree_user] }
 
   context '#create' do
-    before { allow(controller).to receive(:after_sign_up_path_for).and_return(spree.root_path(thing: 7)) }
+    before { allow(controller).to receive(:after_sign_up_path_for).and_return(spree.account_path) }
 
-    it 'redirects to after_sign_up_path_for' 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)
+    it 'redirects to account_path' do
+      post :create, params: { spree_user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' } }
+      expect(response).to redirect_to spree.account_path
     end
 
     context 'with a guest token present' do
@@ -24,8 +24,8 @@ RSpec.describe Spree::UserRegistrationsController, type: :controller do
         else
           order = create(:order, guest_token: 'ABC', user_id: nil, created_by_id: nil)
         end
-        spree_post :create, spree_user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' }
-        user = Spree::User.find_by_email('foobar@example.com')
+        post :create, params: { spree_user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' }}
+        user = Spree.user_class.find_by_email('foobar@example.com')
 
         order.reload
         expect(order.user_id).to eq user.id
@@ -38,7 +38,7 @@ RSpec.describe Spree::UserRegistrationsController, type: :controller do
         else
           order = create(:order, guest_token: 'ABC', user_id: 200)
         end
-        spree_post :create, spree_user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' }
+        post :create, params: { spree_user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' }}
 
         expect(order.reload.user_id).to eq 200
       end
@@ -49,7 +49,7 @@ RSpec.describe Spree::UserRegistrationsController, type: :controller do
         else
           order = create(:order, guest_token: 'DEF', user_id: nil, created_by_id: nil)
         end
-        spree_post :create, spree_user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' }
+        post :create, params: { spree_user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' }}
 
         expect(order.reload.user_id).to be_nil
       end

data/spec/controllers/spree/user_sessions_controller_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
 
           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' }
+            post :create, params: { spree_user: { email: user.email, password: 'secret' }}
 
             order.reload
             expect(order.user_id).to eq user.id
@@ -23,7 +23,7 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
 
           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' }
+            post :create, params: { spree_user: { email: user.email, password: 'secret' }}
 
             order.reload
             expect(order.user_id).to eq user.id
@@ -34,7 +34,7 @@ RSpec.describe Spree::UserSessionsController, type: :controller 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' }
+            post :create, params: { spree_user: { email: user.email, password: 'secret' }}
 
             order.reload
             expect(order.user_id).to be_nil
@@ -43,14 +43,14 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
 
           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' }
+            post :create, params: { 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' }
+            post :create, params: { spree_user: { email: user.email, password: 'secret' }}
 
             expect(order.reload.user_id).to be_nil
           end
@@ -72,7 +72,7 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
           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' }
+          post :create, params: { spree_user: { email: user.email, password: 'secret' }}
 
           order.reload
           expect(order.user_id).to eq user.id
@@ -85,7 +85,7 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
           else
             order = create(:order, guest_token: 'ABC', user_id: nil, created_by_id: nil)
           end
-          spree_post :create, spree_user: { email: user.email, password: 'secret' }
+          post :create, params: { spree_user: { email: user.email, password: 'secret' }}
 
           order.reload
           expect(order.user_id).to eq user.id
@@ -102,7 +102,7 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
                            user_id: nil, created_by_id: nil,
                            completed_at: 1.minute.ago)
           end
-          spree_post :create, spree_user: { email: user.email, password: 'secret' }
+          post :create, params: { spree_user: { email: user.email, password: 'secret' }}
 
           order.reload
           expect(order.user_id).to be_nil
@@ -115,7 +115,7 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
           else
               order = create(:order, guest_token: 'ABC', user_id: 200)
           end
-          spree_post :create, spree_user: { email: user.email, password: 'secret' }
+          post :create, params: { spree_user: { email: user.email, password: 'secret' }}
 
           expect(order.reload.user_id).to eq 200
         end
@@ -126,7 +126,7 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
           else
               order = create(:order, guest_token: 'DEF', user_id: nil, created_by_id: nil)
           end
-          spree_post :create, spree_user: { email: user.email, password: 'secret' }
+          post :create, params: { spree_user: { email: user.email, password: 'secret' }}
 
           expect(order.reload.user_id).to be_nil
         end
@@ -144,7 +144,7 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
           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' }
+          post :create, params: { spree_user: { email: user.email, password: 'secret' }}
 
           order.reload
           expect(order.user_id).to eq user.id
@@ -153,15 +153,15 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
       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' }
-          expect(response).to redirect_to spree.root_path
+        it "redirects to account path after signing in" do
+          post :create, params: { spree_user: { email: user.email, password: 'secret' }}
+          expect(response).to redirect_to spree.account_path
         end
       end
 
       context "and js format is used" do
         it "returns a json with ship and bill address" do
-          spree_post :create, spree_user: { email: user.email, password: 'secret' }, format: 'js'
+          post :create, params: { spree_user: { email: user.email, password: 'secret' }, format: 'js' }
           parsed = ActiveSupport::JSON.decode(response.body)
           expect(parsed).to have_key("user")
           expect(parsed).to have_key("ship_address")
@@ -173,7 +173,7 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
     context "using incorrect login information" do
       context "and html format is used" do
         it "renders new template again with errors" do
-          spree_post :create, spree_user: { email: user.email, password: 'wrong' }
+          post :create, params: { spree_user: { email: user.email, password: 'wrong' }}
           expect(response).to render_template('new')
           expect(flash[:error]).to eq I18n.t(:'devise.failure.invalid')
         end
@@ -181,7 +181,7 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
 
       context "and js format is used" do
         it "returns a json with the error" do
-          spree_post :create, spree_user: { email: user.email, password: 'wrong' }, format: 'js'
+          post :create, params: { spree_user: { email: user.email, password: 'wrong' }, format: 'js' }
           parsed = ActiveSupport::JSON.decode(response.body)
           expect(parsed).to have_key("error")
         end

data/spec/controllers/spree/users_controller_spec.rb

@@ -8,14 +8,14 @@ RSpec.describe Spree::UsersController, type: :controller do
   context '#load_object' do
     it 'redirects to signup path if user is not found' do
       allow(controller).to receive(:spree_current_user) { nil }
-      spree_put :update, { user: { email: 'foobar@example.com' } }
+      put :update, params: { user: { email: 'foobar@example.com' } }
       expect(response).to redirect_to spree.login_path
     end
   end
 
   context '#create' do
     it 'creates a new user' do
-      spree_post :create, { user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' } }
+      post :create, params: { user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' } }
       expect(assigns[:user].new_record?).to be false
     end
   end
@@ -23,14 +23,14 @@ RSpec.describe Spree::UsersController, type: :controller do
   context '#update' do
     context 'when updating own account' do
       it 'performs update' do
-        spree_put :update, { user: { email: 'mynew@email-address.com' } }
+        put :update, params: { user: { email: 'mynew@email-address.com' } }
         expect(assigns[:user].email).to eq 'mynew@email-address.com'
         expect(response).to redirect_to spree.account_url(only_path: true)
       end
     end
 
     it 'does not update roles' do
-      spree_put :update, user: { spree_role_ids: [role.id] }
+      put :update, params: { user: { spree_role_ids: [role.id] }}
       expect(assigns[:user].spree_roles).to_not include role
     end
   end

data/spec/features/account_spec.rb

@@ -10,9 +10,9 @@ RSpec.feature 'Accounts', type: :feature do
 
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password
-      click_button 'Login'
+      click_button 'Log in'
 
-      click_link 'My Account'
+      show_user_account
       expect(page).to have_text 'admin@person.com'
     end
 
@@ -22,11 +22,12 @@ RSpec.feature 'Accounts', type: :feature do
       fill_in 'Email', with: 'email@person.com'
       fill_in 'Password', with: 'password'
       fill_in 'Password Confirmation', with: 'password'
-      click_button 'Create'
+      click_button 'Sign Up'
 
-      click_link 'My Account'
+      show_user_account
       expect(page).to have_text 'email@person.com'
-      click_link 'Edit'
+
+      find('a.account-page-user-info-item-title-edit').click
 
       fill_in 'Password', with: 'foobar'
       fill_in 'Password Confirmation', with: 'foobar'
@@ -42,11 +43,12 @@ RSpec.feature 'Accounts', type: :feature do
 
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password
-      click_button 'Login'
+      click_button 'Log in'
 
-      click_link 'My Account'
+      show_user_account
       expect(page).to have_text 'email@person.com'
-      click_link 'Edit'
+
+      find('a.account-page-user-info-item-title-edit').click
 
       fill_in 'Password', with: 'foobar'
       fill_in 'Password Confirmation', with: 'foobar'

data/spec/features/admin/password_reset_spec.rb

@@ -1,6 +1,4 @@
 RSpec.feature 'Admin - Reset Password', type: :feature do
-  let!(:store) { create(:store) }
-
   background do
     ActionMailer::Base.default_url_options[:host] = 'http://example.com'
   end
@@ -8,7 +6,7 @@ RSpec.feature 'Admin - Reset Password', type: :feature do
   scenario 'allows a user to supply an email for the password reset' do
     user = create(:user, email: 'foobar@example.com', password: 'secret', password_confirmation: 'secret')
     visit spree.admin_login_path
-    click_link 'Forgot Password?'
+    click_link 'Forgot password?'
     fill_in 'Email', with: 'foobar@example.com'
     click_button 'Reset my password'
     expect(page).to have_text 'You will receive an email with instructions'
@@ -16,7 +14,7 @@ RSpec.feature 'Admin - Reset Password', type: :feature do
 
   scenario 'shows errors if no email is supplied' do
     visit spree.admin_login_path
-    click_link 'Forgot Password?'
+    click_link 'Forgot password?'
     click_button 'Reset my password'
     expect(page).to have_text "Email can't be blank"
   end

data/spec/features/admin/sign_in_spec.rb

@@ -10,14 +10,12 @@ RSpec.feature 'Admin - Sign In', type: :feature do
   end
 
   scenario 'lets a user sign in successfully', js: true do
-    fill_in 'Email', with: @user.email
-    fill_in 'Password', with: 'secret'
-    click_button 'Login'
+    log_in(email: @user.email, password: 'secret')
+    show_user_menu
 
-    expect(page).to have_text 'Logged in successfully'
     expect(page).not_to have_text 'Login'
-    expect(page).to have_text 'Logout'
-    expect(current_path).to eq '/'
+    expect(page).to have_text 'LOG OUT'
+    expect(current_path).to eq '/account'
   end
 
   scenario 'shows validation errors' do
@@ -35,7 +33,7 @@ RSpec.feature 'Admin - Sign In', type: :feature do
 
     fill_in 'Email', with: user.email
     fill_in 'Password', with: 'secret'
-    click_button 'Login'
+    click_button 'Log in'
     within '.user-menu' do
       expect(page).to have_text 'admin@person.com'
     end

data/spec/features/admin/sign_out_spec.rb

@@ -13,7 +13,7 @@ RSpec.feature 'Admin - Sign Out', type: :feature do
   end
 
   scenario 'allows a signed in user to logout', js: true do
-    click_link 'Logout'
+    log_out
     visit spree.admin_login_path
     expect(page).to have_button 'Login'
     expect(page).not_to have_text 'Logout'

data/spec/features/admin_permissions_spec.rb

@@ -7,7 +7,7 @@ RSpec.feature 'Admin Permissions', type: :feature do
 
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password
-      click_button 'Login'
+      click_button 'Log in'
     end
 
     context 'admin is restricted from accessing orders' do

data/spec/features/change_email_spec.rb

@@ -3,13 +3,7 @@ RSpec.feature 'Change email', type: :feature do
     allow_bypass_sign_in
 
     user = create(:user, email: 'old@spree.com', password: 'secret')
-    visit spree.root_path
-    click_link 'Login'
-
-    fill_in 'spree_user[email]', with: user.email
-    fill_in 'spree_user[password]', with: 'secret'
-    click_button 'Login'
-
+    log_in(email: user.email, password: 'secret')
     visit spree.edit_account_path
   end