devise 3.2.3 → 3.2.4

data/test/integration/rememberable_test.rb

@@ -31,7 +31,7 @@ class RememberMeTest < ActionDispatch::IntegrationTest
   end
 
   test 'handle unverified requests gets rid of caches' do
-    swap ApplicationController, :allow_forgery_protection => true do
+    swap ApplicationController, allow_forgery_protection: true do
       post exhibit_user_url(1)
       assert_not warden.authenticated?(:user)
 
@@ -43,19 +43,19 @@ class RememberMeTest < ActionDispatch::IntegrationTest
   end
 
   test 'handle unverified requests does not create cookies on sign in' do
-    swap ApplicationController, :allow_forgery_protection => true do
+    swap ApplicationController, allow_forgery_protection: true do
       get new_user_session_path
       assert request.session[:_csrf_token]
 
-      post user_session_path, :authenticity_token => "oops", :user =>
-           { email: "jose.valim@gmail.com", password: "123456", :remember_me => "1" }
+      post user_session_path, authenticity_token: "oops", user:
+           { email: "jose.valim@gmail.com", password: "123456", remember_me: "1" }
       assert_not warden.authenticated?(:user)
       assert_not request.cookies['remember_user_token']
     end
   end
 
   test 'generate remember token after sign in' do
-    sign_in_as_user :remember_me => true
+    sign_in_as_user remember_me: true
     assert request.cookies['remember_user_token']
   end
 
@@ -63,15 +63,15 @@ class RememberMeTest < ActionDispatch::IntegrationTest
     # We test this by asserting the cookie is not sent after the redirect
     # since we changed the domain. This is the only difference with the
     # previous test.
-    swap Devise, :rememberable_options => { :domain => "omg.somewhere.com" } do
-      sign_in_as_user :remember_me => true
+    swap Devise, rememberable_options: { domain: "omg.somewhere.com" } do
+      sign_in_as_user remember_me: true
       assert_nil request.cookies["remember_user_token"]
     end
   end
 
   test 'generate remember token with a custom key' do
-    swap Devise, :rememberable_options => { :key => "v1lat_token" } do
-      sign_in_as_user :remember_me => true
+    swap Devise, rememberable_options: { key: "v1lat_token" } do
+      sign_in_as_user remember_me: true
       assert request.cookies["v1lat_token"]
     end
   end
@@ -79,7 +79,7 @@ class RememberMeTest < ActionDispatch::IntegrationTest
   test 'generate remember token after sign in setting session options' do
     begin
       Rails.configuration.session_options[:domain] = "omg.somewhere.com"
-      sign_in_as_user :remember_me => true
+      sign_in_as_user remember_me: true
       assert_nil request.cookies["remember_user_token"]
     ensure
       Rails.configuration.session_options.delete(:domain)
@@ -103,14 +103,14 @@ class RememberMeTest < ActionDispatch::IntegrationTest
   end
 
   test 'does not extend remember period through sign in' do
-    swap Devise, :extend_remember_period => true, :remember_for => 1.year do
+    swap Devise, extend_remember_period: true, remember_for: 1.year do
       user = create_user
       user.remember_me!
 
       user.remember_created_at = old = 10.days.ago
       user.save
 
-      sign_in_as_user :remember_me => true
+      sign_in_as_user remember_me: true
       user.reload
 
       assert warden.user(:user) == user
@@ -135,7 +135,7 @@ class RememberMeTest < ActionDispatch::IntegrationTest
 
   test 'do not remember with expired token' do
     create_user_and_remember
-    swap Devise, :remember_for => 0 do
+    swap Devise, remember_for: 0 do
       get users_path
       assert_not warden.authenticated?(:user)
       assert_redirected_to new_user_session_path

data/test/integration/timeoutable_test.rb

@@ -104,7 +104,7 @@ class SessionTimeoutTest < ActionDispatch::IntegrationTest
     user = sign_in_as_user
     get expire_user_path(user)
 
-    post "/users/sign_in", :email => user.email, :password => "123456"
+    post "/users/sign_in", email: user.email, password: "123456"
 
     assert_response :redirect
     follow_redirect!
@@ -129,7 +129,7 @@ class SessionTimeoutTest < ActionDispatch::IntegrationTest
   end
 
   test 'user configured timeout limit' do
-    swap Devise, :timeout_in => 8.minutes do
+    swap Devise, timeout_in: 8.minutes do
       user = sign_in_as_user
 
       get users_path
@@ -145,8 +145,8 @@ class SessionTimeoutTest < ActionDispatch::IntegrationTest
   end
 
   test 'error message with i18n' do
-    store_translations :en, :devise => {
-      :failure => { :user => { :timeout => 'Session expired!' } }
+    store_translations :en, devise: {
+      failure: { user: { timeout: 'Session expired!' } }
     } do
       user = sign_in_as_user
 
@@ -158,8 +158,8 @@ class SessionTimeoutTest < ActionDispatch::IntegrationTest
   end
 
   test 'error message with i18n with double redirect' do
-    store_translations :en, :devise => {
-      :failure => { :user => { :timeout => 'Session expired!' } }
+    store_translations :en, devise: {
+      failure: { user: { timeout: 'Session expired!' } }
     } do
       user = sign_in_as_user
 
@@ -172,7 +172,7 @@ class SessionTimeoutTest < ActionDispatch::IntegrationTest
   end
 
   test 'time out not triggered if remembered' do
-    user = sign_in_as_user :remember_me => true
+    user = sign_in_as_user remember_me: true
     get expire_user_path(user)
     assert_not_nil last_request_at
 

data/test/integration/trackable_test.rb

@@ -63,8 +63,8 @@ class TrackableHooksTest < ActionDispatch::IntegrationTest
   end
 
   test "does not update anything if user has signed out along the way" do
-    swap Devise, :allow_unconfirmed_access_for => 0.days do
-      user = create_user(:confirm => false)
+    swap Devise, allow_unconfirmed_access_for: 0.days do
+      user = create_user(confirm: false)
       sign_in_as_user
 
       user.reload

data/test/mailers/confirmation_instructions_test.rb

@@ -67,13 +67,13 @@ class ConfirmationInstructionsTest < ActionMailer::TestCase
   end
 
   test 'setup subject from I18n' do
-    store_translations :en, :devise => { :mailer => { :confirmation_instructions => { :subject => 'Account Confirmation' } } } do
+    store_translations :en, devise: { mailer: { confirmation_instructions: { subject: 'Account Confirmation' } } } do
       assert_equal 'Account Confirmation', mail.subject
     end
   end
 
   test 'subject namespaced by model' do
-    store_translations :en, :devise => { :mailer => { :confirmation_instructions => { :user_subject => 'User Account Confirmation' } } } do
+    store_translations :en, devise: { mailer: { confirmation_instructions: { user_subject: 'User Account Confirmation' } } } do
       assert_equal 'User Account Confirmation', mail.subject
     end
   end
@@ -93,7 +93,7 @@ class ConfirmationInstructionsTest < ActionMailer::TestCase
   end
 
   test 'renders a scoped if scoped_views is set to true' do
-    swap Devise, :scoped_views => true do
+    swap Devise, scoped_views: true do
       assert_equal user.email, mail.body.decoded
     end
   end
@@ -108,7 +108,7 @@ class ConfirmationInstructionsTest < ActionMailer::TestCase
   end
 
   test 'mailer sender accepts a proc' do
-    swap Devise, :mailer_sender => proc { "another@example.com" } do
+    swap Devise, mailer_sender: proc { "another@example.com" } do
       assert_equal ['another@example.com'], mail.from
     end
   end

data/test/mailers/reset_password_instructions_test.rb

@@ -63,13 +63,13 @@ class ResetPasswordInstructionsTest < ActionMailer::TestCase
   end
 
   test 'setup subject from I18n' do
-    store_translations :en, :devise => { :mailer => { :reset_password_instructions => { :subject => 'Reset instructions' } } } do
+    store_translations :en, devise: { mailer: { reset_password_instructions: { subject: 'Reset instructions' } } } do
       assert_equal 'Reset instructions', mail.subject
     end
   end
 
   test 'subject namespaced by model' do
-    store_translations :en, :devise => { :mailer => { :reset_password_instructions => { :user_subject => 'User Reset Instructions' } } } do
+    store_translations :en, devise: { mailer: { reset_password_instructions: { user_subject: 'User Reset Instructions' } } } do
       assert_equal 'User Reset Instructions', mail.subject
     end
   end
@@ -89,7 +89,7 @@ class ResetPasswordInstructionsTest < ActionMailer::TestCase
   end
 
   test 'mailer sender accepts a proc' do
-    swap Devise, :mailer_sender => proc { "another@example.com" } do
+    swap Devise, mailer_sender: proc { "another@example.com" } do
       assert_equal ['another@example.com'], mail.from
     end
   end

data/test/mailers/unlock_instructions_test.rb

@@ -64,13 +64,13 @@ class UnlockInstructionsTest < ActionMailer::TestCase
   end
 
   test 'setup subject from I18n' do
-    store_translations :en, :devise => { :mailer => { :unlock_instructions =>  { :subject => 'Yo unlock instructions' } } } do
+    store_translations :en, devise: { mailer: { unlock_instructions:  { subject: 'Yo unlock instructions' } } } do
       assert_equal 'Yo unlock instructions', mail.subject
     end
   end
 
   test 'subject namespaced by model' do
-    store_translations :en, :devise => { :mailer => { :unlock_instructions => { :user_subject => 'User Unlock Instructions' } } } do
+    store_translations :en, devise: { mailer: { unlock_instructions: { user_subject: 'User Unlock Instructions' } } } do
       assert_equal 'User Unlock Instructions', mail.subject
     end
   end

data/test/models/authenticatable_test.rb

@@ -6,8 +6,8 @@ class AuthenticatableTest < ActiveSupport::TestCase
   end
 
   test 'find_first_by_auth_conditions allows custom filtering parameters' do
-    user = User.create!(:email => "example@example.com", :password => "123456")
-    assert_equal User.find_first_by_auth_conditions({ :email => "example@example.com" }), user
-    assert_nil User.find_first_by_auth_conditions({ :email => "example@example.com" }, :id => user.id.to_s.next)
+    user = User.create!(email: "example@example.com", password: "123456")
+    assert_equal User.find_first_by_auth_conditions({ email: "example@example.com" }), user
+    assert_nil User.find_first_by_auth_conditions({ email: "example@example.com" }, id: user.id.to_s.next)
   end
 end

data/test/models/confirmable_test.rb

@@ -82,7 +82,7 @@ class ConfirmableTest < ActiveSupport::TestCase
 
   test 'should send confirmation instructions by email' do
     assert_email_sent "mynewuser@example.com" do
-      create_user :email => "mynewuser@example.com"
+      create_user email: "mynewuser@example.com"
     end
   end
 
@@ -119,23 +119,23 @@ class ConfirmableTest < ActiveSupport::TestCase
     assert_email_not_sent do
       user = new_user
       user.email = ''
-      user.save(:validate => false)
+      user.save(validate: false)
     end
   end
 
   test 'should find a user to send confirmation instructions' do
     user = create_user
-    confirmation_user = User.send_confirmation_instructions(:email => user.email)
+    confirmation_user = User.send_confirmation_instructions(email: user.email)
     assert_equal confirmation_user, user
   end
 
   test 'should return a new user if no email was found' do
-    confirmation_user = User.send_confirmation_instructions(:email => "invalid@example.com")
+    confirmation_user = User.send_confirmation_instructions(email: "invalid@example.com")
     assert_not confirmation_user.persisted?
   end
 
   test 'should add error to new user email if no email was found' do
-    confirmation_user = User.send_confirmation_instructions(:email => "invalid@example.com")
+    confirmation_user = User.send_confirmation_instructions(email: "invalid@example.com")
     assert confirmation_user.errors[:email]
     assert_equal "not found", confirmation_user.errors[:email].join
   end
@@ -143,7 +143,7 @@ class ConfirmableTest < ActiveSupport::TestCase
   test 'should send email instructions for the user confirm its email' do
     user = create_user
     assert_email_sent user.email do
-      User.send_confirmation_instructions(:email => user.email)
+      User.send_confirmation_instructions(email: user.email)
     end
   end
 
@@ -183,7 +183,7 @@ class ConfirmableTest < ActiveSupport::TestCase
   end
 
   test 'confirm time should fallback to devise confirm in default configuration' do
-    swap Devise, :allow_unconfirmed_access_for => 1.day do
+    swap Devise, allow_unconfirmed_access_for: 1.day do
       user = new_user
       user.confirmation_sent_at = 2.days.ago
       assert_not user.active_for_authentication?
@@ -194,7 +194,7 @@ class ConfirmableTest < ActiveSupport::TestCase
   end
 
   test 'should be active when confirmation sent at is not overpast' do
-    swap Devise, :allow_unconfirmed_access_for => 5.days do
+    swap Devise, allow_unconfirmed_access_for: 5.days do
       Devise.allow_unconfirmed_access_for = 5.days
       user = create_user
 
@@ -246,17 +246,17 @@ class ConfirmableTest < ActiveSupport::TestCase
   end
 
   test 'should find a user to send email instructions for the user confirm its email by authentication_keys' do
-    swap Devise, :authentication_keys => [:username, :email] do
+    swap Devise, authentication_keys: [:username, :email] do
       user = create_user
-      confirm_user = User.send_confirmation_instructions(:email => user.email, :username => user.username)
+      confirm_user = User.send_confirmation_instructions(email: user.email, username: user.username)
       assert_equal confirm_user, user
     end
   end
 
   test 'should require all confirmation_keys' do
-    swap Devise, :confirmation_keys => [:username, :email] do
+    swap Devise, confirmation_keys: [:username, :email] do
       user = create_user
-      confirm_user = User.send_confirmation_instructions(:email => user.email)
+      confirm_user = User.send_confirmation_instructions(email: user.email)
       assert_not confirm_user.persisted?
       assert_equal "can't be blank", confirm_user.errors[:username].join
     end
@@ -275,13 +275,13 @@ class ConfirmableTest < ActiveSupport::TestCase
   end
 
   test 'should accept confirmation email token after 2 days when expiration is set to 3 days' do
-    swap Devise, :confirm_within => 3.days do
+    swap Devise, confirm_within: 3.days do
       assert confirm_user_by_token_with_confirmation_sent_at(2.days.ago)
     end
   end
 
   test 'should not accept confirmation email token after 4 days when expiration is set to 3 days' do
-    swap Devise, :confirm_within => 3.days do
+    swap Devise, confirm_within: 3.days do
       assert_not confirm_user_by_token_with_confirmation_sent_at(4.days.ago)
     end
   end
@@ -327,7 +327,7 @@ class ReconfirmableTest < ActiveSupport::TestCase
     admin = create_admin
     assert admin.confirm!
     assert_nil admin.confirmation_token
-    assert admin.update_attributes(:email => 'new_test@example.com')
+    assert admin.update_attributes(email: 'new_test@example.com')
     assert_not_nil admin.confirmation_token
   end
 
@@ -335,7 +335,7 @@ class ReconfirmableTest < ActiveSupport::TestCase
     admin = create_admin
     assert admin.confirm!
     admin.skip_reconfirmation!
-    assert admin.update_attributes(:email => 'new_test@example.com')
+    assert admin.update_attributes(email: 'new_test@example.com')
     assert_nil admin.confirmation_token
   end
 
@@ -344,16 +344,16 @@ class ReconfirmableTest < ActiveSupport::TestCase
     admin.skip_confirmation_notification!
 
     assert_email_not_sent do
-      admin.update_attributes(:email => 'new_test@example.com')
+      admin.update_attributes(email: 'new_test@example.com')
     end
   end
 
   test 'should regenerate confirmation token after changing email' do
     admin = create_admin
     assert admin.confirm!
-    assert admin.update_attributes(:email => 'old_test@example.com')
+    assert admin.update_attributes(email: 'old_test@example.com')
     token = admin.confirmation_token
-    assert admin.update_attributes(:email => 'new_test@example.com')
+    assert admin.update_attributes(email: 'new_test@example.com')
     assert_not_equal token, admin.confirmation_token
   end
 
@@ -361,7 +361,7 @@ class ReconfirmableTest < ActiveSupport::TestCase
     admin = create_admin
     assert admin.confirm!
     assert_email_sent "new_test@example.com" do
-      assert admin.update_attributes(:email => 'new_test@example.com')
+      assert admin.update_attributes(email: 'new_test@example.com')
     end
     assert_match "new_test@example.com", ActionMailer::Base.deliveries.last.body.encoded
   end
@@ -370,7 +370,7 @@ class ReconfirmableTest < ActiveSupport::TestCase
     admin = create_admin
     assert admin.confirm!
     assert_email_not_sent do
-      assert admin.update_attributes(:password => 'newpass', :password_confirmation => 'newpass')
+      assert admin.update_attributes(password: 'newpass', password_confirmation: 'newpass')
     end
   end
 
@@ -379,21 +379,21 @@ class ReconfirmableTest < ActiveSupport::TestCase
     assert admin.confirm!
     assert_email_not_sent do
       admin.email = ''
-      admin.save(:validate => false)
+      admin.save(validate: false)
     end
   end
 
   test 'should stay confirmed when email is changed' do
     admin = create_admin
     assert admin.confirm!
-    assert admin.update_attributes(:email => 'new_test@example.com')
+    assert admin.update_attributes(email: 'new_test@example.com')
     assert admin.confirmed?
   end
 
   test 'should update email only when it is confirmed' do
     admin = create_admin
     assert admin.confirm!
-    assert admin.update_attributes(:email => 'new_test@example.com')
+    assert admin.update_attributes(email: 'new_test@example.com')
     assert_not_equal 'new_test@example.com', admin.email
     assert admin.confirm!
     assert_equal 'new_test@example.com', admin.email
@@ -402,27 +402,27 @@ class ReconfirmableTest < ActiveSupport::TestCase
   test 'should not allow admin to get past confirmation email by resubmitting their new address' do
     admin = create_admin
     assert admin.confirm!
-    assert admin.update_attributes(:email => 'new_test@example.com')
+    assert admin.update_attributes(email: 'new_test@example.com')
     assert_not_equal 'new_test@example.com', admin.email
-    assert admin.update_attributes(:email => 'new_test@example.com')
+    assert admin.update_attributes(email: 'new_test@example.com')
     assert_not_equal 'new_test@example.com', admin.email
   end
 
   test 'should find a admin by send confirmation instructions with unconfirmed_email' do
     admin = create_admin
     assert admin.confirm!
-    assert admin.update_attributes(:email => 'new_test@example.com')
-    confirmation_admin = Admin.send_confirmation_instructions(:email => admin.unconfirmed_email)
+    assert admin.update_attributes(email: 'new_test@example.com')
+    confirmation_admin = Admin.send_confirmation_instructions(email: admin.unconfirmed_email)
     assert_equal confirmation_admin, admin
   end
 
   test 'should return a new admin if no email or unconfirmed_email was found' do
-    confirmation_admin = Admin.send_confirmation_instructions(:email => "invalid@email.com")
+    confirmation_admin = Admin.send_confirmation_instructions(email: "invalid@email.com")
     assert_not confirmation_admin.persisted?
   end
 
   test 'should add error to new admin email if no email or unconfirmed_email was found' do
-    confirmation_admin = Admin.send_confirmation_instructions(:email => "invalid@email.com")
+    confirmation_admin = Admin.send_confirmation_instructions(email: "invalid@email.com")
     assert confirmation_admin.errors[:email]
     assert_equal "not found", confirmation_admin.errors[:email].join
   end
@@ -431,7 +431,7 @@ class ReconfirmableTest < ActiveSupport::TestCase
     admin = create_admin
     admin.unconfirmed_email = "new_test@email.com"
     assert admin.save
-    admin = Admin.find_by_unconfirmed_email_with_errors(:email => "new_test@email.com")
+    admin = Admin.find_by_unconfirmed_email_with_errors(email: "new_test@email.com")
     assert admin.persisted?
   end