devise 2.1.2 → 3.5.10

data/test/integration/recoverable_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class PasswordTest < ActionController::IntegrationTest
+class PasswordTest < ActionDispatch::IntegrationTest
 
   def visit_new_password_path
     visit new_user_session_path
@@ -12,48 +12,55 @@ class PasswordTest < ActionController::IntegrationTest
     assert_response :success
     assert_not warden.authenticated?(:user)
 
-    fill_in 'email', :with => 'user@test.com'
+    fill_in 'email', with: 'user@test.com'
     yield if block_given?
+
+    Devise.stubs(:friendly_token).returns("abcdef")
     click_button 'Send me reset password instructions'
   end
 
   def reset_password(options={}, &block)
-    visit edit_user_password_path(:reset_password_token => options[:reset_password_token]) unless options[:visit] == false
-    assert_response :success
+    unless options[:visit] == false
+      visit edit_user_password_path(reset_password_token: options[:reset_password_token] || "abcdef")
+      assert_response :success
+    end
 
-    fill_in 'New password', :with => '987654321'
-    fill_in 'Confirm new password', :with => '987654321'
+    fill_in 'New password', with: '987654321'
+    fill_in 'Confirm new password', with: '987654321'
     yield if block_given?
     click_button 'Change my password'
   end
 
   test 'reset password with email of different case should succeed when email is in the list of case insensitive keys' do
-    create_user(:email => 'Foo@Bar.com')
+    create_user(email: 'Foo@Bar.com')
 
     request_forgot_password do
-      fill_in 'email', :with => 'foo@bar.com'
+      fill_in 'email', with: 'foo@bar.com'
     end
 
     assert_current_url '/users/sign_in'
-    assert_contain 'You will receive an email with instructions about how to reset your password in a few minutes.'
+    assert_contain 'You will receive an email with instructions on how to reset your password in a few minutes.'
   end
 
   test 'reset password with email should send an email from a custom mailer' do
-    create_user(:email => 'Foo@Bar.com')
+    create_user(email: 'Foo@Bar.com')
 
     User.any_instance.stubs(:devise_mailer).returns(Users::Mailer)
     request_forgot_password do
-      fill_in 'email', :with => 'foo@bar.com'
+      fill_in 'email', with: 'foo@bar.com'
     end
-    assert_equal ['custom@example.com'], ActionMailer::Base.deliveries.last.from
+
+    mail = ActionMailer::Base.deliveries.last
+    assert_equal ['custom@example.com'], mail.from
+    assert_match edit_user_password_path(reset_password_token: 'abcdef'), mail.body.encoded
   end
 
   test 'reset password with email of different case should fail when email is NOT the list of case insensitive keys' do
-    swap Devise, :case_insensitive_keys => [] do
-      create_user(:email => 'Foo@Bar.com')
+    swap Devise, case_insensitive_keys: [] do
+      create_user(email: 'Foo@Bar.com')
 
       request_forgot_password do
-        fill_in 'email', :with => 'foo@bar.com'
+        fill_in 'email', with: 'foo@bar.com'
       end
 
       assert_response :success
@@ -64,22 +71,22 @@ class PasswordTest < ActionController::IntegrationTest
   end
 
   test 'reset password with email with extra whitespace should succeed when email is in the list of strip whitespace keys' do
-    create_user(:email => 'foo@bar.com')
+    create_user(email: 'foo@bar.com')
 
     request_forgot_password do
-      fill_in 'email', :with => ' foo@bar.com '
+      fill_in 'email', with: ' foo@bar.com '
     end
 
     assert_current_url '/users/sign_in'
-    assert_contain 'You will receive an email with instructions about how to reset your password in a few minutes.'
+    assert_contain 'You will receive an email with instructions on how to reset your password in a few minutes.'
   end
 
   test 'reset password with email with extra whitespace should fail when email is NOT the list of strip whitespace keys' do
-    swap Devise, :strip_whitespace_keys => [] do
-      create_user(:email => 'foo@bar.com')
+    swap Devise, strip_whitespace_keys: [] do
+      create_user(email: 'foo@bar.com')
 
       request_forgot_password do
-        fill_in 'email', :with => ' foo@bar.com '
+        fill_in 'email', with: ' foo@bar.com '
       end
 
       assert_response :success
@@ -104,12 +111,12 @@ class PasswordTest < ActionController::IntegrationTest
     request_forgot_password
 
     assert_current_url '/users/sign_in'
-    assert_contain 'You will receive an email with instructions about how to reset your password in a few minutes.'
+    assert_contain 'You will receive an email with instructions on how to reset your password in a few minutes.'
   end
 
   test 'not authenticated user with invalid email should receive an error message' do
     request_forgot_password do
-      fill_in 'email', :with => 'invalid.test@test.com'
+      fill_in 'email', with: 'invalid.test@test.com'
     end
 
     assert_response :success
@@ -132,9 +139,9 @@ class PasswordTest < ActionController::IntegrationTest
     assert_redirected_to "/users/sign_in"
   end
 
-  test 'not authenticated user with invalid reset password token should not be able to change his password' do
+  test 'not authenticated user with invalid reset password token should not be able to change their password' do
     user = create_user
-    reset_password :reset_password_token => 'invalid_reset_password'
+    reset_password reset_password_token: 'invalid_reset_password'
 
     assert_response :success
     assert_current_url '/users/password'
@@ -143,108 +150,142 @@ class PasswordTest < ActionController::IntegrationTest
     assert_not user.reload.valid_password?('987654321')
   end
 
-  test 'not authenticated user with valid reset password token but invalid password should not be able to change his password' do
+  test 'not authenticated user with valid reset password token but invalid password should not be able to change their password' do
     user = create_user
     request_forgot_password
-    reset_password :reset_password_token => user.reload.reset_password_token do
-      fill_in 'Confirm new password', :with => 'other_password'
+    reset_password do
+      fill_in 'Confirm new password', with: 'other_password'
     end
 
     assert_response :success
     assert_current_url '/users/password'
     assert_have_selector '#error_explanation'
-    assert_contain 'Password doesn\'t match confirmation'
+    assert_contain Devise.rails4? ?
+      "Password confirmation doesn't match Password" : "Password doesn't match confirmation"
     assert_not user.reload.valid_password?('987654321')
   end
 
-  test 'not authenticated user with valid data should be able to change his password' do
+  test 'not authenticated user with valid data should be able to change their password' do
     user = create_user
     request_forgot_password
-    reset_password :reset_password_token => user.reload.reset_password_token
+    reset_password
 
     assert_current_url '/'
-    assert_contain 'Your password was changed successfully. You are now signed in.'
+    assert_contain 'Your password has been changed successfully. You are now signed in.'
     assert user.reload.valid_password?('987654321')
   end
 
-  test 'after entering invalid data user should still be able to change his password' do
+  test 'after entering invalid data user should still be able to change their password' do
     user = create_user
     request_forgot_password
-    reset_password :reset_password_token => user.reload.reset_password_token do
-      fill_in 'Confirm new password', :with => 'other_password'
-    end
+
+    reset_password {  fill_in 'Confirm new password', with: 'other_password' }
     assert_response :success
     assert_have_selector '#error_explanation'
     assert_not user.reload.valid_password?('987654321')
 
-    reset_password :reset_password_token => user.reload.reset_password_token, :visit => false
-    assert_contain 'Your password was changed successfully.'
+    reset_password visit: false
+    assert_contain 'Your password has been changed successfully.'
     assert user.reload.valid_password?('987654321')
   end
 
   test 'sign in user automatically after changing its password' do
-    user = create_user
+    create_user
     request_forgot_password
-    reset_password :reset_password_token => user.reload.reset_password_token
+    reset_password
 
     assert warden.authenticated?(:user)
   end
 
-  test 'does not sign in user automatically after changing its password if it\'s locked' do
-    user = create_user(:locked => true)
-    request_forgot_password
-    reset_password :reset_password_token => user.reload.reset_password_token
+  test 'does not sign in user automatically after changing its password if config.sign_in_after_reset_password is false' do
+    swap Devise, sign_in_after_reset_password: false do
+      create_user
+      request_forgot_password
+      reset_password
 
-    assert_contain 'Your password was changed successfully.'
-    assert_not_contain 'You are now signed in.'
-    assert_equal new_user_session_path, @request.path
-    assert !warden.authenticated?(:user)
+      assert_contain 'Your password has been changed successfully.'
+      assert_not_contain 'You are now signed in.'
+      assert_equal new_user_session_path, @request.path
+      assert !warden.authenticated?(:user)
+    end
   end
 
-  test 'sign in user automatically and confirm after changing its password if it\'s not confirmed' do
-    user = create_user(:confirm => false)
-    request_forgot_password
-    reset_password :reset_password_token => user.reload.reset_password_token
+  test 'does not sign in user automatically after changing its password if it\'s locked and unlock strategy is :none or :time' do
+    [:none, :time].each do |strategy|
+      swap Devise, unlock_strategy: strategy do
+        user = create_user(locked: true)
+        request_forgot_password
+        reset_password
+
+        assert_contain 'Your password has been changed successfully.'
+        assert_not_contain 'You are now signed in.'
+        assert_equal new_user_session_path, @request.path
+        assert !warden.authenticated?(:user)
+      end
+    end
+  end
 
-    assert warden.authenticated?(:user)
-    assert user.reload.confirmed?
+  test 'unlocks and signs in locked user automatically after changing it\'s password if unlock strategy is :email' do
+    swap Devise, unlock_strategy: :email do
+      user = create_user(locked: true)
+      request_forgot_password
+      reset_password
+
+      assert_contain 'Your password has been changed successfully.'
+      assert !user.reload.access_locked?
+      assert warden.authenticated?(:user)
+    end
+  end
+
+  test 'unlocks and signs in locked user automatically after changing it\'s password if unlock strategy is :both' do
+    swap Devise, unlock_strategy: :both do
+      user = create_user(locked: true)
+      request_forgot_password
+      reset_password
+
+      assert_contain 'Your password has been changed successfully.'
+      assert !user.reload.access_locked?
+      assert warden.authenticated?(:user)
+    end
   end
 
   test 'reset password request with valid E-Mail in XML format should return valid response' do
     create_user
-    post user_password_path(:format => 'xml'), :user => {:email => "user@test.com"}
+    post user_password_path(format: 'xml'), user: {email: "user@test.com"}
     assert_response :success
     assert_equal response.body, { }.to_xml
   end
 
   test 'reset password request with invalid E-Mail in XML format should return valid response' do
     create_user
-    post user_password_path(:format => 'xml'), :user => {:email => "invalid.test@test.com"}
+    post user_password_path(format: 'xml'), user: {email: "invalid.test@test.com"}
     assert_response :unprocessable_entity
     assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<errors>)
   end
 
   test 'reset password request with invalid E-Mail in XML format should return empty and valid response' do
-    swap Devise, :paranoid => true do
+    swap Devise, paranoid: true do
       create_user
-      post user_password_path(:format => 'xml'), :user => {:email => "invalid@test.com"}
+      post user_password_path(format: 'xml'), user: {email: "invalid@test.com"}
       assert_response :success
       assert_equal response.body, { }.to_xml
     end
   end
 
   test 'change password with valid parameters in XML format should return valid response' do
-    user = create_user
+    create_user
     request_forgot_password
-    put user_password_path(:format => 'xml'), :user => {:reset_password_token => user.reload.reset_password_token, :password => '987654321', :password_confirmation => '987654321'}
+    put user_password_path(format: 'xml'), user: {
+      reset_password_token: 'abcdef', password: '987654321', password_confirmation: '987654321'
+    }
     assert_response :success
     assert warden.authenticated?(:user)
   end
 
   test 'change password with invalid token in XML format should return invalid response' do
-    user = create_user
+    create_user
     request_forgot_password
-    put user_password_path(:format => 'xml'), :user => {:reset_password_token => 'invalid.token', :password => '987654321', :password_confirmation => '987654321'}
+    put user_password_path(format: 'xml'), user: {reset_password_token: 'invalid.token', password: '987654321', password_confirmation: '987654321'}
     assert_response :unprocessable_entity
     assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<errors>)
   end
@@ -252,24 +293,24 @@ class PasswordTest < ActionController::IntegrationTest
   test 'change password with invalid new password in XML format should return invalid response' do
     user = create_user
     request_forgot_password
-    put user_password_path(:format => 'xml'), :user => {:reset_password_token => user.reload.reset_password_token, :password => '', :password_confirmation => '987654321'}
+    put user_password_path(format: 'xml'), user: {reset_password_token: user.reload.reset_password_token, password: '', password_confirmation: '987654321'}
     assert_response :unprocessable_entity
     assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<errors>)
   end
 
   test "when using json requests to ask a confirmable request, should not return the object" do
-    user = create_user(:confirm => false)
+    user = create_user(confirm: false)
 
-    post user_password_path(:format => :json), :user => { :email => user.email }
+    post user_password_path(format: :json), user: { email: user.email }
 
     assert_response :success
     assert_equal response.body, "{}"
   end
 
   test "when in paranoid mode and with an invalid e-mail, asking to reset a password should display a message that does not indicates that the e-mail does not exists in the database" do
-    swap Devise, :paranoid => true do
+    swap Devise, paranoid: true do
       visit_new_password_path
-      fill_in "email", :with => "arandomemail@test.com"
+      fill_in "email", with: "arandomemail@test.com"
       click_button 'Send me reset password instructions'
 
       assert_not_contain "1 error prohibited this user from being saved:"
@@ -280,10 +321,10 @@ class PasswordTest < ActionController::IntegrationTest
   end
 
   test "when in paranoid mode and with a valid e-mail, asking to reset password should display a message that does not indicates that the email exists in the database and redirect to the failure route" do
-    swap Devise, :paranoid => true do
+    swap Devise, paranoid: true do
       user = create_user
       visit_new_password_path
-      fill_in 'email', :with => user.email
+      fill_in 'email', with: user.email
       click_button 'Send me reset password instructions'
 
       assert_contain "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
@@ -297,7 +338,7 @@ class PasswordTest < ActionController::IntegrationTest
 
     assert_equal 10, user.failed_attempts
     request_forgot_password
-    reset_password :reset_password_token => user.reload.reset_password_token
+    reset_password
 
     assert warden.authenticated?(:user)
     user.reload

data/test/integration/registerable_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RegistrationTest < ActionController::IntegrationTest
+class RegistrationTest < ActionDispatch::IntegrationTest
 
   test 'a guest admin should be able to sign in successfully' do
     get new_admin_session_path
@@ -8,16 +8,16 @@ class RegistrationTest < ActionController::IntegrationTest
 
     assert_template 'registrations/new'
 
-    fill_in 'email', :with => 'new_user@test.com'
-    fill_in 'password', :with => 'new_user123'
-    fill_in 'password confirmation', :with => 'new_user123'
+    fill_in 'email', with: 'new_user@test.com'
+    fill_in 'password', with: 'new_user123'
+    fill_in 'password confirmation', with: 'new_user123'
     click_button 'Sign up'
 
     assert_contain 'You have signed up successfully'
     assert warden.authenticated?(:admin)
     assert_current_url "/admin_area/home"
 
-    admin = Admin.last :order => "id"
+    admin = Admin.to_adapter.find_first(order: [:id, :desc])
     assert_equal admin.email, 'new_user@test.com'
   end
 
@@ -26,9 +26,9 @@ class RegistrationTest < ActionController::IntegrationTest
     get new_admin_session_path
     click_link 'Sign up'
 
-    fill_in 'email', :with => 'new_user@test.com'
-    fill_in 'password', :with => 'new_user123'
-    fill_in 'password confirmation', :with => 'new_user123'
+    fill_in 'email', with: 'new_user@test.com'
+    fill_in 'password', with: 'new_user123'
+    fill_in 'password confirmation', with: 'new_user123'
     click_button 'Sign up'
 
     assert_contain 'Welcome! You have signed up successfully.'
@@ -36,27 +36,37 @@ class RegistrationTest < ActionController::IntegrationTest
     assert_current_url "/?custom=1"
   end
 
+  test 'a guest admin should not see a warning about minimum password length' do
+    get new_admin_session_path
+    assert_not_contain 'characters minimum'
+  end
+
   def user_sign_up
     ActionMailer::Base.deliveries.clear
 
     get new_user_registration_path
 
-    fill_in 'email', :with => 'new_user@test.com'
-    fill_in 'password', :with => 'new_user123'
-    fill_in 'password confirmation', :with => 'new_user123'
+    fill_in 'email', with: 'new_user@test.com'
+    fill_in 'password', with: 'new_user123'
+    fill_in 'password confirmation', with: 'new_user123'
     click_button 'Sign up'
   end
 
+  test 'a guest user should see a warning about minimum password length' do
+    get new_user_registration_path
+    assert_contain '7 characters minimum'
+  end
+
   test 'a guest user should be able to sign up successfully and be blocked by confirmation' do
     user_sign_up
 
-    assert_contain 'A message with a confirmation link has been sent to your email address. Please open the link to activate your account.'
+    assert_contain 'A message with a confirmation link has been sent to your email address. Please follow the link to activate your account.'
     assert_not_contain 'You have to confirm your account before continuing'
     assert_current_url "/"
 
     assert_not warden.authenticated?(:user)
 
-    user = User.last :order => "id"
+    user = User.to_adapter.find_first(order: [:id, :desc])
     assert_equal user.email, 'new_user@test.com'
     assert_not user.confirmed?
   end
@@ -76,9 +86,9 @@ class RegistrationTest < ActionController::IntegrationTest
     Devise::RegistrationsController.any_instance.stubs(:after_inactive_sign_up_path_for).returns("/?custom=1")
     get new_user_registration_path
 
-    fill_in 'email', :with => 'new_user@test.com'
-    fill_in 'password', :with => 'new_user123'
-    fill_in 'password confirmation', :with => 'new_user123'
+    fill_in 'email', with: 'new_user@test.com'
+    fill_in 'password', with: 'new_user123'
+    fill_in 'password confirmation', with: 'new_user123'
     click_button 'Sign up'
 
     assert_current_url "/?custom=1"
@@ -92,17 +102,18 @@ class RegistrationTest < ActionController::IntegrationTest
 
     get new_user_registration_path
 
-    fill_in 'email', :with => 'invalid_email'
-    fill_in 'password', :with => 'new_user123'
-    fill_in 'password confirmation', :with => 'new_user321'
+    fill_in 'email', with: 'invalid_email'
+    fill_in 'password', with: 'new_user123'
+    fill_in 'password confirmation', with: 'new_user321'
     click_button 'Sign up'
 
     assert_template 'registrations/new'
     assert_have_selector '#error_explanation'
     assert_contain "Email is invalid"
-    assert_contain "Password doesn't match confirmation"
+    assert_contain Devise.rails4? ?
+      "Password confirmation doesn't match Password" : "Password doesn't match confirmation"
     assert_contain "2 errors prohibited"
-    assert_nil User.first
+    assert_nil User.to_adapter.find_first
 
     assert_not warden.authenticated?(:user)
   end
@@ -112,12 +123,12 @@ class RegistrationTest < ActionController::IntegrationTest
     #    https://github.com/mongoid/mongoid/issues/756
     (pending "Fails on Mongoid < 2.1"; break) if defined?(Mongoid) && Mongoid::VERSION.to_f < 2.1
 
-    user = create_user
+    create_user
     get new_user_registration_path
 
-    fill_in 'email', :with => 'user@test.com'
-    fill_in 'password', :with => '123456'
-    fill_in 'password confirmation', :with => '123456'
+    fill_in 'email', with: 'user@test.com'
+    fill_in 'password', with: '123456'
+    fill_in 'password confirmation', with: '123456'
     click_button 'Sign up'
 
     assert_current_url '/users'
@@ -139,85 +150,86 @@ class RegistrationTest < ActionController::IntegrationTest
     assert_redirected_to root_path
   end
 
-  test 'a signed in user should be able to edit his account' do
+  test 'a signed in user should be able to edit their account' do
     sign_in_as_user
     get edit_user_registration_path
 
-    fill_in 'email', :with => 'user.new@example.com'
-    fill_in 'current password', :with => '123456'
+    fill_in 'email', with: 'user.new@example.com'
+    fill_in 'current password', with: '12345678'
     click_button 'Update'
 
     assert_current_url '/'
-    assert_contain 'You updated your account successfully.'
+    assert_contain 'Your account has been updated successfully.'
 
-    assert_equal "user.new@example.com", User.first.email
+    assert_equal "user.new@example.com", User.to_adapter.find_first.email
   end
 
-  test 'a signed in user should still be able to use the website after changing his password' do
+  test 'a signed in user should still be able to use the website after changing their password' do
     sign_in_as_user
     get edit_user_registration_path
 
-    fill_in 'password', :with => '12345678'
-    fill_in 'password confirmation', :with => '12345678'
-    fill_in 'current password', :with => '123456'
+    fill_in 'password', with: '1234567890'
+    fill_in 'password confirmation', with: '1234567890'
+    fill_in 'current password', with: '12345678'
     click_button 'Update'
 
-    assert_contain 'You updated your account successfully.'
+    assert_contain 'Your account has been updated successfully.'
     get users_path
     assert warden.authenticated?(:user)
   end
 
-  test 'a signed in user should not change his current user with invalid password' do
+  test 'a signed in user should not change their current user with invalid password' do
     sign_in_as_user
     get edit_user_registration_path
 
-    fill_in 'email', :with => 'user.new@example.com'
-    fill_in 'current password', :with => 'invalid'
+    fill_in 'email', with: 'user.new@example.com'
+    fill_in 'current password', with: 'invalid'
     click_button 'Update'
 
     assert_template 'registrations/edit'
     assert_contain 'user@test.com'
     assert_have_selector 'form input[value="user.new@example.com"]'
 
-    assert_equal "user@test.com", User.first.email
+    assert_equal "user@test.com", User.to_adapter.find_first.email
   end
 
-  test 'a signed in user should be able to edit his password' do
+  test 'a signed in user should be able to edit their password' do
     sign_in_as_user
     get edit_user_registration_path
 
-    fill_in 'password', :with => 'pas123'
-    fill_in 'password confirmation', :with => 'pas123'
-    fill_in 'current password', :with => '123456'
+    fill_in 'password', with: 'pass1234'
+    fill_in 'password confirmation', with: 'pass1234'
+    fill_in 'current password', with: '12345678'
     click_button 'Update'
 
     assert_current_url '/'
-    assert_contain 'You updated your account successfully.'
+    assert_contain 'Your account has been updated successfully.'
 
-    assert User.first.valid_password?('pas123')
+    assert User.to_adapter.find_first.valid_password?('pass1234')
   end
 
-  test 'a signed in user should not be able to edit his password with invalid confirmation' do
+  test 'a signed in user should not be able to edit their password with invalid confirmation' do
     sign_in_as_user
     get edit_user_registration_path
 
-    fill_in 'password', :with => 'pas123'
-    fill_in 'password confirmation', :with => ''
-    fill_in 'current password', :with => '123456'
+    fill_in 'password', with: 'pas123'
+    fill_in 'password confirmation', with: ''
+    fill_in 'current password', with: '12345678'
     click_button 'Update'
 
-    assert_contain "Password doesn't match confirmation"
-    assert_not User.first.valid_password?('pas123')
+    assert_contain Devise.rails4? ?
+      "Password confirmation doesn't match Password" : "Password doesn't match confirmation"
+    assert_not User.to_adapter.find_first.valid_password?('pas123')
   end
 
-  test 'a signed in user should be able to cancel his account' do
+  test 'a signed in user should be able to cancel their account' do
     sign_in_as_user
     get edit_user_registration_path
 
-    click_link "Cancel my account", :method => :delete
-    assert_contain "Bye! Your account was successfully cancelled. We hope to see you again soon."
+    click_button "Cancel my account"
+    assert_contain "Bye! Your account has been successfully cancelled. We hope to see you again soon."
 
-    assert User.all.empty?
+    assert User.to_adapter.find_all.empty?
   end
 
   test 'a user should be able to cancel sign up by deleting data in the session' do
@@ -233,92 +245,115 @@ class RegistrationTest < ActionController::IntegrationTest
   end
 
   test 'a user with XML sign up stub' do
-    get new_user_registration_path(:format => 'xml')
+    get new_user_registration_path(format: 'xml')
     assert_response :success
     assert_match %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<user>), response.body
     assert_no_match(/<confirmation-token/, response.body)
   end
 
   test 'a user with JSON sign up stub' do
-    get new_user_registration_path(:format => 'json')
+    get new_user_registration_path(format: 'json')
     assert_response :success
     assert_match %({"user":), response.body
     assert_no_match(/"confirmation_token"/, response.body)
   end
 
   test 'an admin sign up with valid information in XML format should return valid response' do
-    post admin_registration_path(:format => 'xml'), :admin => { :email => 'new_user@test.com', :password => 'new_user123', :password_confirmation => 'new_user123' }
+    post admin_registration_path(format: 'xml'), admin: { email: 'new_user@test.com', password: 'new_user123', password_confirmation: 'new_user123' }
     assert_response :success
     assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<admin>)
 
-    admin = Admin.last :order => "id"
+    admin = Admin.to_adapter.find_first(order: [:id, :desc])
     assert_equal admin.email, 'new_user@test.com'
   end
 
   test 'a user sign up with valid information in XML format should return valid response' do
-    post user_registration_path(:format => 'xml'), :user => { :email => 'new_user@test.com', :password => 'new_user123', :password_confirmation => 'new_user123' }
+    post user_registration_path(format: 'xml'), user: { email: 'new_user@test.com', password: 'new_user123', password_confirmation: 'new_user123' }
     assert_response :success
     assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<user>)
 
-    user = User.last :order => "id"
+    user = User.to_adapter.find_first(order: [:id, :desc])
     assert_equal user.email, 'new_user@test.com'
   end
 
   test 'a user sign up with invalid information in XML format should return invalid response' do
-    post user_registration_path(:format => 'xml'), :user => { :email => 'new_user@test.com', :password => 'new_user123', :password_confirmation => 'invalid' }
+    post user_registration_path(format: 'xml'), user: { email: 'new_user@test.com', password: 'new_user123', password_confirmation: 'invalid' }
     assert_response :unprocessable_entity
     assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<errors>)
   end
 
   test 'a user update information with valid data in XML format should return valid response' do
     user = sign_in_as_user
-    put user_registration_path(:format => 'xml'), :user => { :current_password => '123456', :email => 'user.new@test.com' }
+    put user_registration_path(format: 'xml'), user: { current_password: '12345678', email: 'user.new@test.com' }
     assert_response :success
     assert_equal user.reload.email, 'user.new@test.com'
   end
 
   test 'a user update information with invalid data in XML format should return invalid response' do
     user = sign_in_as_user
-    put user_registration_path(:format => 'xml'), :user => { :current_password => 'invalid', :email => 'user.new@test.com' }
+    put user_registration_path(format: 'xml'), user: { current_password: 'invalid', email: 'user.new@test.com' }
     assert_response :unprocessable_entity
     assert_equal user.reload.email, 'user@test.com'
   end
 
-  test 'a user cancel his account in XML format should return valid response' do
-    user = sign_in_as_user
-    delete user_registration_path(:format => 'xml')
+  test 'a user cancel their account in XML format should return valid response' do
+    sign_in_as_user
+    delete user_registration_path(format: 'xml')
     assert_response :success
-    assert_equal User.count, 0
+    assert_equal User.to_adapter.find_all.size, 0
   end
 end
 
-class ReconfirmableRegistrationTest < ActionController::IntegrationTest
-  test 'a signed in admin should see a more appropriate flash message when editing his account if reconfirmable is enabled' do
+class ReconfirmableRegistrationTest < ActionDispatch::IntegrationTest
+  test 'a signed in admin should see a more appropriate flash message when editing their account if reconfirmable is enabled' do
     sign_in_as_admin
     get edit_admin_registration_path
 
-    fill_in 'email', :with => 'admin.new@example.com'
-    fill_in 'current password', :with => '123456'
+    fill_in 'email', with: 'admin.new@example.com'
+    fill_in 'current password', with: '123456'
     click_button 'Update'
 
     assert_current_url '/admin_area/home'
     assert_contain 'but we need to verify your new email address'
+    assert_equal 'admin.new@example.com', Admin.to_adapter.find_first.unconfirmed_email
 
-    assert_equal "admin.new@example.com", Admin.first.unconfirmed_email
+    get edit_admin_registration_path
+    assert_contain 'Currently waiting confirmation for: admin.new@example.com'
   end
 
   test 'a signed in admin should not see a reconfirmation message if they did not change their password' do
     sign_in_as_admin
     get edit_admin_registration_path
 
-    fill_in 'password', :with => 'pas123'
-    fill_in 'password confirmation', :with => 'pas123'
-    fill_in 'current password', :with => '123456'
+    fill_in 'password', with: 'pas123'
+    fill_in 'password confirmation', with: 'pas123'
+    fill_in 'current password', with: '123456'
+    click_button 'Update'
+
+    assert_current_url '/admin_area/home'
+    assert_contain 'Your account has been updated successfully.'
+
+    assert Admin.to_adapter.find_first.valid_password?('pas123')
+  end
+
+  test 'a signed in admin should not see a reconfirmation message if they did not change their email, despite having an unconfirmed email' do
+    sign_in_as_admin
+
+    get edit_admin_registration_path
+    fill_in 'email', with: 'admin.new@example.com'
+    fill_in 'current password', with: '123456'
+    click_button 'Update'
+
+    get edit_admin_registration_path
+    fill_in 'password', with: 'pas123'
+    fill_in 'password confirmation', with: 'pas123'
+    fill_in 'current password', with: '123456'
     click_button 'Update'
 
     assert_current_url '/admin_area/home'
-    assert_contain 'You updated your account successfully.'
+    assert_contain 'Your account has been updated successfully.'
 
-    assert Admin.first.valid_password?('pas123')
+    assert_equal "admin.new@example.com", Admin.to_adapter.find_first.unconfirmed_email
+    assert Admin.to_adapter.find_first.valid_password?('pas123')
   end
-end
+end