devise 3.2.3 → 3.2.4

data/test/integration/omniauthable_test.rb

@@ -61,8 +61,8 @@ class OmniauthableIntegrationTest < ActionDispatch::IntegrationTest
 
     assert_difference "User.count" do
       visit "/users/sign_up"
-      fill_in "Password", :with => "12345678"
-      fill_in "Password confirmation", :with => "12345678"
+      fill_in "Password", with: "12345678"
+      fill_in "Password confirmation", with: "12345678"
       click_button "Sign up"
     end
 
@@ -111,7 +111,7 @@ class OmniauthableIntegrationTest < ActionDispatch::IntegrationTest
   test "generates a proper link when SCRIPT_NAME is set" do
     header 'SCRIPT_NAME', '/q'
     visit "/users/sign_in"
-    assert_select "a", :href => "/q/users/auth/facebook"
+    assert_select "a", href: "/q/users/auth/facebook"
   end
 
   test "handles callback error parameter according to the specification" do

data/test/integration/recoverable_test.rb

@@ -12,7 +12,7 @@ class PasswordTest < ActionDispatch::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")
@@ -21,21 +21,21 @@ class PasswordTest < ActionDispatch::IntegrationTest
 
   def reset_password(options={}, &block)
     unless options[:visit] == false
-      visit edit_user_password_path(:reset_password_token => options[:reset_password_token] || "abcdef")
+      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'
@@ -43,11 +43,11 @@ class PasswordTest < ActionDispatch::IntegrationTest
   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
 
     mail = ActionMailer::Base.deliveries.last
@@ -56,11 +56,11 @@ class PasswordTest < ActionDispatch::IntegrationTest
   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
@@ -71,10 +71,10 @@ class PasswordTest < ActionDispatch::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'
@@ -82,11 +82,11 @@ class PasswordTest < ActionDispatch::IntegrationTest
   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
@@ -116,7 +116,7 @@ class PasswordTest < ActionDispatch::IntegrationTest
 
   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
@@ -141,7 +141,7 @@ class PasswordTest < ActionDispatch::IntegrationTest
 
   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'
@@ -154,7 +154,7 @@ class PasswordTest < ActionDispatch::IntegrationTest
     user = create_user
     request_forgot_password
     reset_password do
-      fill_in 'Confirm new password', :with => 'other_password'
+      fill_in 'Confirm new password', with: 'other_password'
     end
 
     assert_response :success
@@ -179,12 +179,12 @@ class PasswordTest < ActionDispatch::IntegrationTest
     user = create_user
     request_forgot_password
 
-    reset_password {  fill_in 'Confirm new password', :with => 'other_password' }
+    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 :visit => false
+    reset_password visit: false
     assert_contain 'Your password was changed successfully.'
     assert user.reload.valid_password?('987654321')
   end
@@ -199,8 +199,8 @@ class PasswordTest < ActionDispatch::IntegrationTest
 
   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)
+      swap Devise, unlock_strategy: strategy do
+        user = create_user(locked: true)
         request_forgot_password
         reset_password
 
@@ -213,8 +213,8 @@ class PasswordTest < ActionDispatch::IntegrationTest
   end
 
   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)
+    swap Devise, unlock_strategy: :email do
+      user = create_user(locked: true)
       request_forgot_password
       reset_password
 
@@ -225,8 +225,8 @@ class PasswordTest < ActionDispatch::IntegrationTest
   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)
+    swap Devise, unlock_strategy: :both do
+      user = create_user(locked: true)
       request_forgot_password
       reset_password
 
@@ -238,22 +238,22 @@ class PasswordTest < ActionDispatch::IntegrationTest
 
   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
@@ -262,8 +262,8 @@ class PasswordTest < ActionDispatch::IntegrationTest
   test 'change password with valid parameters in XML format should return valid response' do
     create_user
     request_forgot_password
-    put user_password_path(:format => 'xml'), :user => {
-      :reset_password_token => 'abcdef', :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)
@@ -272,7 +272,7 @@ class PasswordTest < ActionDispatch::IntegrationTest
   test 'change password with invalid token in XML format should return invalid response' do
     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
@@ -280,24 +280,24 @@ class PasswordTest < ActionDispatch::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:"
@@ -308,10 +308,10 @@ class PasswordTest < ActionDispatch::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."

data/test/integration/registerable_test.rb

@@ -8,9 +8,9 @@ class RegistrationTest < ActionDispatch::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'
@@ -26,9 +26,9 @@ class RegistrationTest < ActionDispatch::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.'
@@ -41,9 +41,9 @@ class RegistrationTest < ActionDispatch::IntegrationTest
 
     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
 
@@ -76,9 +76,9 @@ class RegistrationTest < ActionDispatch::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,9 +92,9 @@ class RegistrationTest < ActionDispatch::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'
@@ -116,9 +116,9 @@ class RegistrationTest < ActionDispatch::IntegrationTest
     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'
@@ -144,8 +144,8 @@ class RegistrationTest < ActionDispatch::IntegrationTest
     sign_in_as_user
     get edit_user_registration_path
 
-    fill_in 'email', :with => 'user.new@example.com'
-    fill_in 'current password', :with => '12345678'
+    fill_in 'email', with: 'user.new@example.com'
+    fill_in 'current password', with: '12345678'
     click_button 'Update'
 
     assert_current_url '/'
@@ -158,9 +158,9 @@ class RegistrationTest < ActionDispatch::IntegrationTest
     sign_in_as_user
     get edit_user_registration_path
 
-    fill_in 'password', :with => '1234567890'
-    fill_in 'password confirmation', :with => '1234567890'
-    fill_in 'current password', :with => '12345678'
+    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.'
@@ -172,8 +172,8 @@ class RegistrationTest < ActionDispatch::IntegrationTest
     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'
@@ -187,9 +187,9 @@ class RegistrationTest < ActionDispatch::IntegrationTest
     sign_in_as_user
     get edit_user_registration_path
 
-    fill_in 'password', :with => 'pass1234'
-    fill_in 'password confirmation', :with => 'pass1234'
-    fill_in 'current password', :with => '12345678'
+    fill_in 'password', with: 'pass1234'
+    fill_in 'password confirmation', with: 'pass1234'
+    fill_in 'current password', with: '12345678'
     click_button 'Update'
 
     assert_current_url '/'
@@ -202,9 +202,9 @@ class RegistrationTest < ActionDispatch::IntegrationTest
     sign_in_as_user
     get edit_user_registration_path
 
-    fill_in 'password', :with => 'pas123'
-    fill_in 'password confirmation', :with => ''
-    fill_in 'current password', :with => '12345678'
+    fill_in 'password', with: 'pas123'
+    fill_in 'password confirmation', with: ''
+    fill_in 'current password', with: '12345678'
     click_button 'Update'
 
     assert_contain Devise.rails4? ?
@@ -235,21 +235,21 @@ class RegistrationTest < ActionDispatch::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>)
 
@@ -258,7 +258,7 @@ class RegistrationTest < ActionDispatch::IntegrationTest
   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>)
 
@@ -267,28 +267,28 @@ class RegistrationTest < ActionDispatch::IntegrationTest
   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 => '12345678', :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 their account in XML format should return valid response' do
     sign_in_as_user
-    delete user_registration_path(:format => 'xml')
+    delete user_registration_path(format: 'xml')
     assert_response :success
     assert_equal User.count, 0
   end
@@ -299,8 +299,8 @@ class ReconfirmableRegistrationTest < ActionDispatch::IntegrationTest
     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'
@@ -315,9 +315,9 @@ class ReconfirmableRegistrationTest < ActionDispatch::IntegrationTest
     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'
@@ -330,14 +330,14 @@ class ReconfirmableRegistrationTest < ActionDispatch::IntegrationTest
     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'
 
     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'