devise 3.2.3 → 3.2.4

data/test/integration/confirmable_test.rb

@@ -3,17 +3,17 @@ require 'test_helper'
 class ConfirmationTest < ActionDispatch::IntegrationTest
 
   def visit_user_confirmation_with_token(confirmation_token)
-    visit user_confirmation_path(:confirmation_token => confirmation_token)
+    visit user_confirmation_path(confirmation_token: confirmation_token)
   end
 
   def resend_confirmation
-    user = create_user(:confirm => false)
+    user = create_user(confirm: false)
     ActionMailer::Base.deliveries.clear
 
     visit new_user_session_path
     click_link "Didn't receive confirmation instructions?"
 
-    fill_in 'email', :with => user.email
+    fill_in 'email', with: user.email
     click_button 'Resend confirmation instructions'
   end
 
@@ -39,8 +39,8 @@ class ConfirmationTest < ActionDispatch::IntegrationTest
   end
 
   test 'user with valid confirmation token should not be able to confirm an account after the token has expired' do
-    swap Devise, :confirm_within => 3.days do
-      user = create_user(:confirm => false, :confirmation_sent_at => 4.days.ago)
+    swap Devise, confirm_within: 3.days do
+      user = create_user(confirm: false, confirmation_sent_at: 4.days.ago)
       assert_not user.confirmed?
       visit_user_confirmation_with_token(user.raw_confirmation_token)
 
@@ -51,8 +51,8 @@ class ConfirmationTest < ActionDispatch::IntegrationTest
   end
 
   test 'user with valid confirmation token should be able to confirm an account before the token has expired' do
-    swap Devise, :confirm_within => 3.days do
-      user = create_user(:confirm => false, :confirmation_sent_at => 2.days.ago)
+    swap Devise, confirm_within: 3.days do
+      user = create_user(confirm: false, confirmation_sent_at: 2.days.ago)
       assert_not user.confirmed?
       visit_user_confirmation_with_token(user.raw_confirmation_token)
 
@@ -65,14 +65,14 @@ class ConfirmationTest < ActionDispatch::IntegrationTest
   test 'user should be redirected to a custom path after confirmation' do
     Devise::ConfirmationsController.any_instance.stubs(:after_confirmation_path_for).returns("/?custom=1")
 
-    user = create_user(:confirm => false)
+    user = create_user(confirm: false)
     visit_user_confirmation_with_token(user.raw_confirmation_token)
 
     assert_current_url "/?custom=1"
   end
 
   test 'already confirmed user should not be able to confirm the account again' do
-    user = create_user(:confirm => false)
+    user = create_user(confirm: false)
     user.confirmed_at = Time.now
     user.save
     visit_user_confirmation_with_token(user.raw_confirmation_token)
@@ -82,21 +82,21 @@ class ConfirmationTest < ActionDispatch::IntegrationTest
   end
 
   test 'already confirmed user should not be able to confirm the account again neither request confirmation' do
-    user = create_user(:confirm => false)
+    user = create_user(confirm: false)
     user.confirmed_at = Time.now
     user.save
 
     visit_user_confirmation_with_token(user.raw_confirmation_token)
     assert_contain 'already confirmed'
 
-    fill_in 'email', :with => user.email
+    fill_in 'email', with: user.email
     click_button 'Resend confirmation instructions'
     assert_contain 'already confirmed'
   end
 
   test 'not confirmed user with setup to block without confirmation should not be able to sign in' do
-    swap Devise, :allow_unconfirmed_access_for => 0.days do
-      sign_in_as_user(:confirm => false)
+    swap Devise, allow_unconfirmed_access_for: 0.days do
+      sign_in_as_user(confirm: false)
 
       assert_contain 'You have to confirm your account before continuing'
       assert_not warden.authenticated?(:user)
@@ -104,9 +104,9 @@ class ConfirmationTest < ActionDispatch::IntegrationTest
   end
 
   test 'not confirmed user should not see confirmation message if invalid credentials are given' do
-    swap Devise, :allow_unconfirmed_access_for => 0.days do
-      sign_in_as_user(:confirm => false) do
-        fill_in 'password', :with => 'invalid'
+    swap Devise, allow_unconfirmed_access_for: 0.days do
+      sign_in_as_user(confirm: false) do
+        fill_in 'password', with: 'invalid'
       end
 
       assert_contain 'Invalid email or password'
@@ -115,8 +115,8 @@ class ConfirmationTest < ActionDispatch::IntegrationTest
   end
 
   test 'not confirmed user but configured with some days to confirm should be able to sign in' do
-    swap Devise, :allow_unconfirmed_access_for => 1.day do
-      sign_in_as_user(:confirm => false)
+    swap Devise, allow_unconfirmed_access_for: 1.day do
+      sign_in_as_user(confirm: false)
 
       assert_response :success
       assert warden.authenticated?(:user)
@@ -124,8 +124,8 @@ class ConfirmationTest < ActionDispatch::IntegrationTest
   end
 
   test 'unconfirmed but signed in user should be redirected to their root path' do
-    swap Devise, :allow_unconfirmed_access_for => 1.day do
-      user = sign_in_as_user(:confirm => false)
+    swap Devise, allow_unconfirmed_access_for: 1.day do
+      user = sign_in_as_user(confirm: false)
 
       visit_user_confirmation_with_token(user.raw_confirmation_token)
       assert_contain 'Your account was successfully confirmed.'
@@ -134,57 +134,57 @@ class ConfirmationTest < ActionDispatch::IntegrationTest
   end
 
   test 'error message is configurable by resource name' do
-    store_translations :en, :devise => {
-      :failure => { :user => { :unconfirmed => "Not confirmed user" } }
+    store_translations :en, devise: {
+      failure: { user: { unconfirmed: "Not confirmed user" } }
     } do
-      sign_in_as_user(:confirm => false)
+      sign_in_as_user(confirm: false)
       assert_contain 'Not confirmed user'
     end
   end
 
   test 'resent confirmation token with valid E-Mail in XML format should return valid response' do
-    user = create_user(:confirm => false)
-    post user_confirmation_path(:format => 'xml'), :user => { :email => user.email }
+    user = create_user(confirm: false)
+    post user_confirmation_path(format: 'xml'), user: { email: user.email }
     assert_response :success
     assert_equal response.body, {}.to_xml
   end
 
   test 'resent confirmation token with invalid E-Mail in XML format should return invalid response' do
-    create_user(:confirm => false)
-    post user_confirmation_path(:format => 'xml'), :user => { :email => 'invalid.test@test.com' }
+    create_user(confirm: false)
+    post user_confirmation_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 'confirm account with valid confirmation token in XML format should return valid response' do
-    user = create_user(:confirm => false)
-    get user_confirmation_path(:confirmation_token => user.raw_confirmation_token, :format => 'xml')
+    user = create_user(confirm: false)
+    get user_confirmation_path(confirmation_token: user.raw_confirmation_token, format: 'xml')
     assert_response :success
     assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<user>)
   end
 
   test 'confirm account with invalid confirmation token in XML format should return invalid response' do
-    create_user(:confirm => false)
-    get user_confirmation_path(:confirmation_token => 'invalid_confirmation', :format => 'xml')
+    create_user(confirm: false)
+    get user_confirmation_path(confirmation_token: 'invalid_confirmation', format: 'xml')
     assert_response :unprocessable_entity
     assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<errors>)
   end
 
   test 'request an account confirmation account with JSON, should return an empty JSON' do
-    user = create_user(:confirm => false)
+    user = create_user(confirm: false)
 
-    post user_confirmation_path, :user => { :email => user.email }, :format => :json
+    post user_confirmation_path, user: { email: user.email }, format: :json
     assert_response :success
     assert_equal response.body, {}.to_json
   end
 
   test "when in paranoid mode and with a valid e-mail, should not say that the e-mail is valid" do
-    swap Devise, :paranoid => true do
-      user = create_user(:confirm => false)
+    swap Devise, paranoid: true do
+      user = create_user(confirm: false)
       visit new_user_session_path
 
       click_link "Didn't receive confirmation instructions?"
-      fill_in 'email', :with => user.email
+      fill_in 'email', with: user.email
       click_button 'Resend confirmation instructions'
 
       assert_contain "If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes."
@@ -193,11 +193,11 @@ class ConfirmationTest < ActionDispatch::IntegrationTest
   end
 
   test "when in paranoid mode and with a invalid e-mail, should not say that the e-mail is invalid" do
-    swap Devise, :paranoid => true do
+    swap Devise, paranoid: true do
       visit new_user_session_path
 
       click_link "Didn't receive confirmation instructions?"
-      fill_in 'email', :with => "idonthavethisemail@gmail.com"
+      fill_in 'email', with: "idonthavethisemail@gmail.com"
       click_button 'Resend confirmation instructions'
 
       assert_not_contain "1 error prohibited this user from being saved:"
@@ -216,17 +216,17 @@ class ConfirmationOnChangeTest < ActionDispatch::IntegrationTest
   end
 
   def visit_admin_confirmation_with_token(confirmation_token)
-    visit admin_confirmation_path(:confirmation_token => confirmation_token)
+    visit admin_confirmation_path(confirmation_token: confirmation_token)
   end
 
   test 'admin should be able to request a new confirmation after email changed' do
     admin = create_admin
-    admin.update_attributes(:email => 'new_test@example.com')
+    admin.update_attributes(email: 'new_test@example.com')
 
     visit new_admin_session_path
     click_link "Didn't receive confirmation instructions?"
 
-    fill_in 'email', :with => admin.unconfirmed_email
+    fill_in 'email', with: admin.unconfirmed_email
     assert_difference "ActionMailer::Base.deliveries.size" do
       click_button 'Resend confirmation instructions'
     end
@@ -237,7 +237,7 @@ class ConfirmationOnChangeTest < ActionDispatch::IntegrationTest
 
   test 'admin with valid confirmation token should be able to confirm email after email changed' do
     admin = create_admin
-    admin.update_attributes(:email => 'new_test@example.com')
+    admin.update_attributes(email: 'new_test@example.com')
     assert_equal 'new_test@example.com', admin.unconfirmed_email
     visit_admin_confirmation_with_token(admin.raw_confirmation_token)
 
@@ -249,13 +249,13 @@ class ConfirmationOnChangeTest < ActionDispatch::IntegrationTest
 
   test 'admin with previously valid confirmation token should not be able to confirm email after email changed again' do
     admin = create_admin
-    admin.update_attributes(:email => 'first_test@example.com')
+    admin.update_attributes(email: 'first_test@example.com')
     assert_equal 'first_test@example.com', admin.unconfirmed_email
 
     raw_confirmation_token = admin.raw_confirmation_token
     admin = Admin.find(admin.id)
 
-    admin.update_attributes(:email => 'second_test@example.com')
+    admin.update_attributes(email: 'second_test@example.com')
     assert_equal 'second_test@example.com', admin.unconfirmed_email
 
     visit_admin_confirmation_with_token(raw_confirmation_token)
@@ -271,10 +271,10 @@ class ConfirmationOnChangeTest < ActionDispatch::IntegrationTest
 
   test 'admin email should be unique also within unconfirmed_email' do
     admin = create_admin
-    admin.update_attributes(:email => 'new_admin_test@example.com')
+    admin.update_attributes(email: 'new_admin_test@example.com')
     assert_equal 'new_admin_test@example.com', admin.unconfirmed_email
 
-    create_second_admin(:email => "new_admin_test@example.com")
+    create_second_admin(email: "new_admin_test@example.com")
 
     visit_admin_confirmation_with_token(admin.raw_confirmation_token)
     assert_have_selector '#error_explanation'

data/test/integration/database_authenticatable_test.rb

@@ -2,21 +2,21 @@ require 'test_helper'
 
 class DatabaseAuthenticationTest < ActionDispatch::IntegrationTest
   test 'sign in 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')
 
     sign_in_as_user do
-      fill_in 'email', :with => 'foo@bar.com'
+      fill_in 'email', with: 'foo@bar.com'
     end
 
     assert warden.authenticated?(:user)
   end
 
   test 'sign in 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')
 
       sign_in_as_user do
-        fill_in 'email', :with => 'foo@bar.com'
+        fill_in 'email', with: 'foo@bar.com'
       end
 
       assert_not warden.authenticated?(:user)
@@ -24,21 +24,21 @@ class DatabaseAuthenticationTest < ActionDispatch::IntegrationTest
   end
 
   test 'sign in with email including extra spaces 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 ')
 
     sign_in_as_user do
-      fill_in 'email', :with => 'foo@bar.com'
+      fill_in 'email', with: 'foo@bar.com'
     end
 
     assert warden.authenticated?(:user)
   end
 
   test 'sign in with email including extra spaces 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')
 
       sign_in_as_user do
-        fill_in 'email', :with => ' foo@bar.com '
+        fill_in 'email', with: ' foo@bar.com '
       end
 
       assert_not warden.authenticated?(:user)
@@ -46,16 +46,16 @@ class DatabaseAuthenticationTest < ActionDispatch::IntegrationTest
   end
 
   test 'sign in should not authenticate if not using proper authentication keys' do
-    swap Devise, :authentication_keys => [:username] do
+    swap Devise, authentication_keys: [:username] do
       sign_in_as_user
       assert_not warden.authenticated?(:user)
     end
   end
 
   test 'sign in with invalid email should return to sign in form with error message' do
-    store_translations :en, :devise => { :failure => { :admin => { :not_found_in_database => 'Invalid email address' } } } do
+    store_translations :en, devise: { failure: { admin: { not_found_in_database: 'Invalid email address' } } } do
       sign_in_as_admin do
-        fill_in 'email', :with => 'wrongemail@test.com'
+        fill_in 'email', with: 'wrongemail@test.com'
       end
 
       assert_contain 'Invalid email address'
@@ -65,7 +65,7 @@ class DatabaseAuthenticationTest < ActionDispatch::IntegrationTest
 
   test 'sign in with invalid pasword should return to sign in form with error message' do
     sign_in_as_admin do
-      fill_in 'password', :with => 'abcdef'
+      fill_in 'password', with: 'abcdef'
     end
 
     assert_contain 'Invalid email or password'
@@ -73,9 +73,9 @@ class DatabaseAuthenticationTest < ActionDispatch::IntegrationTest
   end
 
   test 'error message is configurable by resource name' do
-    store_translations :en, :devise => { :failure => { :admin => { :invalid => "Invalid credentials" } } } do
+    store_translations :en, devise: { failure: { admin: { invalid: "Invalid credentials" } } } do
       sign_in_as_admin do
-        fill_in 'password', :with => 'abcdef'
+        fill_in 'password', with: 'abcdef'
       end
 
       assert_contain 'Invalid credentials'

data/test/integration/http_authenticatable_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class HttpAuthenticationTest < ActionDispatch::IntegrationTest
   test 'handles unverified requests gets rid of caches but continues signed in' do
-    swap ApplicationController, :allow_forgery_protection => true do
+    swap ApplicationController, allow_forgery_protection: true do
       create_user
       post exhibit_user_url(1), {}, "HTTP_AUTHORIZATION" => "Basic #{Base64.encode64("user@test.com:12345678")}"
       assert warden.authenticated?(:user)
@@ -16,18 +16,18 @@ class HttpAuthenticationTest < ActionDispatch::IntegrationTest
     assert_match '<email>user@test.com</email>', response.body
     assert warden.authenticated?(:user)
 
-    get users_path(:format => :xml)
+    get users_path(format: :xml)
     assert_response 200
   end
 
   test 'sign in should authenticate with http but not emit a cookie if skipping session storage' do
-    swap Devise, :skip_session_storage => [:http_auth] do
+    swap Devise, skip_session_storage: [:http_auth] do
       sign_in_as_new_user_with_http
       assert_response 200
       assert_match '<email>user@test.com</email>', response.body
       assert warden.authenticated?(:user)
 
-      get users_path(:format => :xml)
+      get users_path(format: :xml)
       assert_response 401
     end
   end
@@ -46,7 +46,7 @@ class HttpAuthenticationTest < ActionDispatch::IntegrationTest
   end
 
   test 'returns a custom response with www-authenticate and chosen realm' do
-    swap Devise, :http_authentication_realm => "MyApp" do
+    swap Devise, http_authentication_realm: "MyApp" do
       sign_in_as_new_user_with_http("unknown")
       assert_equal 401, status
       assert_equal 'Basic realm="MyApp"', headers["WWW-Authenticate"]
@@ -54,7 +54,7 @@ class HttpAuthenticationTest < ActionDispatch::IntegrationTest
   end
 
   test 'sign in should authenticate with http even with specific authentication keys' do
-    swap Devise, :authentication_keys => [:username] do
+    swap Devise, authentication_keys: [:username] do
       sign_in_as_new_user_with_http("usertest")
       assert_response :success
       assert_match '<email>user@test.com</email>', response.body
@@ -63,7 +63,7 @@ class HttpAuthenticationTest < ActionDispatch::IntegrationTest
   end
 
   test 'it uses appropriate authentication_keys when configured with hash' do
-    swap Devise, :authentication_keys => ActiveSupport::OrderedHash[:username, false, :email, false] do
+    swap Devise, authentication_keys: ActiveSupport::OrderedHash[:username, false, :email, false] do
       sign_in_as_new_user_with_http("usertest")
       assert_response :success
       assert_match '<email>user@test.com</email>', response.body
@@ -72,7 +72,7 @@ class HttpAuthenticationTest < ActionDispatch::IntegrationTest
   end
 
   test 'it uses the appropriate key when configured explicitly' do
-    swap Devise, :authentication_keys => ActiveSupport::OrderedHash[:email, false, :username, false], :http_authentication_key => :username do
+    swap Devise, authentication_keys: ActiveSupport::OrderedHash[:email, false, :username, false], http_authentication_key: :username do
       sign_in_as_new_user_with_http("usertest")
       assert_response :success
       assert_match '<email>user@test.com</email>', response.body
@@ -81,7 +81,7 @@ class HttpAuthenticationTest < ActionDispatch::IntegrationTest
   end
 
   test 'test request with oauth2 header doesnt get mistaken for basic authentication' do
-    swap Devise, :http_authenticatable => true do
+    swap Devise, http_authenticatable: true do
       add_oauth2_header
       assert_equal 401, status
       assert_equal 'Basic realm="Application"', headers["WWW-Authenticate"]
@@ -92,14 +92,14 @@ class HttpAuthenticationTest < ActionDispatch::IntegrationTest
 
     def sign_in_as_new_user_with_http(username="user@test.com", password="12345678")
       user = create_user
-      get users_path(:format => :xml), {}, "HTTP_AUTHORIZATION" => "Basic #{Base64.encode64("#{username}:#{password}")}"
+      get users_path(format: :xml), {}, "HTTP_AUTHORIZATION" => "Basic #{Base64.encode64("#{username}:#{password}")}"
       user
     end
 
     # Sign in with oauth2 token. This is just to test that it isn't misinterpreted as basic authentication
     def add_oauth2_header
       user = create_user
-      get users_path(:format => :xml), {}, "HTTP_AUTHORIZATION" => "OAuth #{Base64.encode64("#{user.email}:12345678")}"
+      get users_path(format: :xml), {}, "HTTP_AUTHORIZATION" => "OAuth #{Base64.encode64("#{user.email}:12345678")}"
     end
 
 end

data/test/integration/lockable_test.rb

@@ -3,18 +3,18 @@ require 'test_helper'
 class LockTest < ActionDispatch::IntegrationTest
 
   def visit_user_unlock_with_token(unlock_token)
-    visit user_unlock_path(:unlock_token => unlock_token)
+    visit user_unlock_path(unlock_token: unlock_token)
   end
 
   def send_unlock_request
-    user = create_user(:locked => true)
+    user = create_user(locked: true)
     ActionMailer::Base.deliveries.clear
 
     visit new_user_session_path
     click_link "Didn't receive unlock instructions?"
 
     Devise.stubs(:friendly_token).returns("abcdef")
-    fill_in 'email', :with => user.email
+    fill_in 'email', with: user.email
     click_button 'Resend unlock instructions'
   end
 
@@ -39,13 +39,13 @@ class LockTest < ActionDispatch::IntegrationTest
   end
 
   test 'unlocked user should not be able to request a unlock token' do
-    user = create_user(:locked => false)
+    user = create_user(locked: false)
     ActionMailer::Base.deliveries.clear
 
     visit new_user_session_path
     click_link "Didn't receive unlock instructions?"
 
-    fill_in 'email', :with => user.email
+    fill_in 'email', with: user.email
     click_button 'Resend unlock instructions'
 
     assert_template 'unlocks/new'
@@ -89,60 +89,60 @@ class LockTest < ActionDispatch::IntegrationTest
   end
 
   test "user should not send a new e-mail if already locked" do
-    user = create_user(:locked => true)
+    user = create_user(locked: true)
     user.failed_attempts = User.maximum_attempts + 1
     user.save!
 
     ActionMailer::Base.deliveries.clear
 
-    sign_in_as_user(:password => "invalid")
+    sign_in_as_user(password: "invalid")
     assert_contain 'Your account is locked.'
     assert ActionMailer::Base.deliveries.empty?
   end
 
   test 'error message is configurable by resource name' do
-    store_translations :en, :devise => {
-        :failure => {:user => {:locked => "You are locked!"}}
+    store_translations :en, devise: {
+        failure: {user: {locked: "You are locked!"}}
     } do
 
-      user = create_user(:locked => true)
+      user = create_user(locked: true)
       user.failed_attempts = User.maximum_attempts + 1
       user.save!
 
-      sign_in_as_user(:password => "invalid")
+      sign_in_as_user(password: "invalid")
       assert_contain "You are locked!"
     end
   end
 
   test "user should not be able to sign in when locked" do
-    store_translations :en, :devise => {
-        :failure => {:user => {:locked => "You are locked!"}}
+    store_translations :en, devise: {
+        failure: {user: {locked: "You are locked!"}}
     } do
 
-      user = create_user(:locked => true)
+      user = create_user(locked: true)
       user.failed_attempts = User.maximum_attempts + 1
       user.save!
 
-      sign_in_as_user(:password => "123456")
+      sign_in_as_user(password: "123456")
       assert_contain "You are locked!"
     end
   end
 
   test 'user should be able to request a new unlock token via XML request' do
-    user = create_user(:locked => true)
+    user = create_user(locked: true)
     ActionMailer::Base.deliveries.clear
 
-    post user_unlock_path(:format => 'xml'), :user => {:email => user.email}
+    post user_unlock_path(format: 'xml'), user: {email: user.email}
     assert_response :success
     assert_equal response.body, {}.to_xml
     assert_equal 1, ActionMailer::Base.deliveries.size
   end
 
   test 'unlocked user should not be able to request a unlock token via XML request' do
-    user = create_user(:locked => false)
+    user = create_user(locked: false)
     ActionMailer::Base.deliveries.clear
 
-    post user_unlock_path(:format => 'xml'), :user => {:email => user.email}
+    post user_unlock_path(format: 'xml'), user: {email: user.email}
     assert_response :unprocessable_entity
     assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<errors>)
     assert_equal 0, ActionMailer::Base.deliveries.size
@@ -152,33 +152,33 @@ class LockTest < ActionDispatch::IntegrationTest
     user = create_user()
     raw  = user.lock_access!
     assert user.access_locked?
-    get user_unlock_path(:format => 'xml', :unlock_token => raw)
+    get user_unlock_path(format: 'xml', unlock_token: raw)
     assert_response :success
     assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<user>)
   end
 
 
   test 'user with invalid unlock token should not be able to unlock the account via XML request' do
-    get user_unlock_path(:format => 'xml', :unlock_token => 'invalid_token')
+    get user_unlock_path(format: 'xml', unlock_token: 'invalid_token')
     assert_response :unprocessable_entity
     assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<errors>)
   end
 
   test "when using json to ask a unlock request, should not return the user" do
-    user = create_user(:locked => true)
-    post user_unlock_path(:format => "json", :user => {:email => user.email})
+    user = create_user(locked: true)
+    post user_unlock_path(format: "json", user: {email: user.email})
     assert_response :success
     assert_equal response.body, {}.to_json
   end
 
   test "in paranoid mode, when trying to unlock an user that exists it should not say that it exists if it is locked" do
-    swap Devise, :paranoid => true do
-      user = create_user(:locked => true)
+    swap Devise, paranoid: true do
+      user = create_user(locked: true)
 
       visit new_user_session_path
       click_link "Didn't receive unlock instructions?"
 
-      fill_in 'email', :with => user.email
+      fill_in 'email', with: user.email
       click_button 'Resend unlock instructions'
 
       assert_current_url "/users/sign_in"
@@ -187,13 +187,13 @@ class LockTest < ActionDispatch::IntegrationTest
   end
 
   test "in paranoid mode, when trying to unlock an user that exists it should not say that it exists if it is not locked" do
-    swap Devise, :paranoid => true do
-      user = create_user(:locked => false)
+    swap Devise, paranoid: true do
+      user = create_user(locked: false)
 
       visit new_user_session_path
       click_link "Didn't receive unlock instructions?"
 
-      fill_in 'email', :with => user.email
+      fill_in 'email', with: user.email
       click_button 'Resend unlock instructions'
 
       assert_current_url "/users/sign_in"
@@ -202,11 +202,11 @@ class LockTest < ActionDispatch::IntegrationTest
   end
 
   test "in paranoid mode, when trying to unlock an user that does not exists it should not say that it does not exists" do
-    swap Devise, :paranoid => true do
+    swap Devise, paranoid: true do
       visit new_user_session_path
       click_link "Didn't receive unlock instructions?"
 
-      fill_in 'email', :with => "arandomemail@hotmail.com"
+      fill_in 'email', with: "arandomemail@hotmail.com"
       click_button 'Resend unlock instructions'
 
       assert_not_contain "1 error prohibited this user from being saved:"
@@ -219,16 +219,16 @@ class LockTest < ActionDispatch::IntegrationTest
   end
 
   test "in paranoid mode, when locking a user that exists it should not say that the user was locked" do
-    swap Devise, :paranoid => true, :maximum_attempts => 1 do
-      user = create_user(:locked => false)
+    swap Devise, paranoid: true, maximum_attempts: 1 do
+      user = create_user(locked: false)
 
       visit new_user_session_path
-      fill_in 'email', :with => user.email
-      fill_in 'password', :with => "abadpassword"
+      fill_in 'email', with: user.email
+      fill_in 'password', with: "abadpassword"
       click_button 'Sign in'
 
-      fill_in 'email', :with => user.email
-      fill_in 'password', :with => "abadpassword"
+      fill_in 'email', with: user.email
+      fill_in 'password', with: "abadpassword"
       click_button 'Sign in'
 
       assert_current_url "/users/sign_in"