loyal_devise 2.1.2 → 2.1.3

data/test/mailers/reset_password_instructions_test.rb

@@ -1,8 +1,6 @@
-# -*- encoding : utf-8 -*-
 require 'test_helper'
 
 class ResetPasswordInstructionsTest < ActionMailer::TestCase
-
   def setup
     setup_mailer
     Devise.mailer = 'Devise::Mailer'
@@ -50,6 +48,16 @@ class ResetPasswordInstructionsTest < ActionMailer::TestCase
     assert_equal ['custom@example.com'], mail.from
   end
 
+  test 'setup sender from custom mailer defaults with proc' do
+    Devise.mailer = 'Users::FromProcMailer'
+    assert_equal ['custom@example.com'], mail.from
+  end
+
+  test 'custom mailer renders parent mailer template' do
+    Devise.mailer = 'Users::Mailer'
+    assert_not_blank mail.body.encoded
+  end
+
   test 'setup reply to as copy from sender' do
     assert_equal ['test@example.com'], mail.reply_to
   end
@@ -67,7 +75,7 @@ class ResetPasswordInstructionsTest < ActionMailer::TestCase
   end
 
   test 'body should have user info' do
-    assert_match(/#{user.email}/, mail.body.encoded)
+    assert_match user.email, mail.body.encoded
   end
 
   test 'body should have link to confirm the account' do

data/test/mailers/unlock_instructions_test.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'test_helper'
 
 class UnlockInstructionsTest < ActionMailer::TestCase
@@ -50,6 +49,16 @@ class UnlockInstructionsTest < ActionMailer::TestCase
     assert_equal ['custom@example.com'], mail.from
   end
 
+  test 'setup sender from custom mailer defaults with proc' do
+    Devise.mailer = 'Users::FromProcMailer'
+    assert_equal ['custom@example.com'], mail.from
+  end
+
+  test 'custom mailer renders parent mailer template' do
+    Devise.mailer = 'Users::Mailer'
+    assert_not_blank mail.body.encoded
+  end
+
   test 'setup reply to as copy from sender' do
     assert_equal ['test@example.com'], mail.reply_to
   end
@@ -67,7 +76,7 @@ class UnlockInstructionsTest < ActionMailer::TestCase
   end
 
   test 'body should have user info' do
-    assert_match(/#{user.email}/, mail.body.encoded)
+    assert_match user.email, mail.body.encoded
   end
 
   test 'body should have link to unlock the account' do

data/test/mapping_test.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'test_helper'
 
 class FakeRequest < Struct.new(:path_info, :params)

data/test/models/authenticatable_test.rb

@@ -1,8 +1,13 @@
-# -*- encoding : utf-8 -*-
 require 'test_helper'
 
 class AuthenticatableTest < ActiveSupport::TestCase
   test 'required_fields should be an empty array' do
     assert_equal Devise::Models::Validatable.required_fields(User), []
   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)
+  end
 end

data/test/models/confirmable_test.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'test_helper'
 
 class ConfirmableTest < ActiveSupport::TestCase
@@ -105,6 +104,24 @@ class ConfirmableTest < ActiveSupport::TestCase
     end
   end
 
+  test 'should skip confirmation e-mail without confirming if skip_confirmation_notification! is invoked' do
+    user = new_user
+    user.skip_confirmation_notification!
+
+    assert_email_not_sent do
+      user.save!
+      assert !user.confirmed?
+    end
+  end
+
+  test 'should not send confirmation when no email is provided' do
+    assert_email_not_sent do
+      user = new_user
+      user.email = ''
+      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)
@@ -205,6 +222,13 @@ class ConfirmableTest < ActiveSupport::TestCase
     assert_not user.active_for_authentication?
   end
 
+  test 'should be active when we set allow_unconfirmed_access_for to nil' do
+    Devise.allow_unconfirmed_access_for = nil
+    user = create_user
+    user.confirmation_sent_at = Date.today
+    assert user.active_for_authentication?
+  end
+
   test 'should not be active without confirmation' do
     user = create_user
     user.confirmation_sent_at = nil
@@ -270,6 +294,24 @@ class ConfirmableTest < ActiveSupport::TestCase
       assert_not_equal user.confirmation_token, old
     end
   end
+  
+  test 'should generate a new token when a valid one does not exist' do
+    swap Devise, :confirm_within => 3.days do
+      user = create_user
+      user.update_attribute(:confirmation_sent_at, 4.days.ago)
+      old = user.confirmation_token
+      user.ensure_confirmation_token!
+      assert_not_equal user.confirmation_token, old
+    end
+  end
+  
+  test 'should not generate a new token when a valid one exists' do
+    user = create_user
+    assert_not_nil user.confirmation_token
+    old = user.confirmation_token
+    user.ensure_confirmation_token!
+    assert_equal user.confirmation_token, old
+  end
 end
 
 class ReconfirmableTest < ActiveSupport::TestCase
@@ -295,7 +337,6 @@ class ReconfirmableTest < ActiveSupport::TestCase
     assert_nil admin.confirmation_token
   end
 
-
   test 'should regenerate confirmation token after changing email' do
     admin = create_admin
     assert admin.confirm!
@@ -311,6 +352,7 @@ class ReconfirmableTest < ActiveSupport::TestCase
     assert_email_sent "new_test@example.com" do
       assert admin.update_attributes(:email => 'new_test@example.com')
     end
+    assert_match "new_test@example.com", ActionMailer::Base.deliveries.last.body.encoded
   end
 
   test 'should not send confirmation by email after changing password' do
@@ -321,6 +363,15 @@ class ReconfirmableTest < ActiveSupport::TestCase
     end
   end
 
+  test 'should not send confirmation by email after changing to a blank email' do
+    admin = create_admin
+    assert admin.confirm!
+    assert_email_not_sent do
+      admin.email = ''
+      admin.save(:validate => false)
+    end
+  end
+
   test 'should stay confirmed when email is changed' do
     admin = create_admin
     assert admin.confirm!

data/test/models/database_authenticatable_test.rb

@@ -1,5 +1,5 @@
-# -*- encoding : utf-8 -*-
 require 'test_helper'
+require 'test_models'
 require 'digest/sha1'
 
 class DatabaseAuthenticatableTest < ActiveSupport::TestCase
@@ -13,6 +13,17 @@ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
     assert_equal email.downcase, user.email
   end
 
+  test 'should downcase case insensitive keys that refer to virtual attributes when saving' do
+    email        = 'Foo@Bar1.com'
+    confirmation = 'Foo@Bar1.com'
+    attributes   = valid_attributes(:email => email, :email_confirmation => confirmation)
+    user = UserWithVirtualAttributes.new(attributes)
+
+    assert_equal confirmation, user.email_confirmation
+    user.save!
+    assert_equal confirmation.downcase, user.email_confirmation
+  end
+
   test 'should remove whitespace from strip whitespace keys when saving' do
     # strip_whitespace_keys is set to :email by default.
     email = ' foo@bar.com '
@@ -23,16 +34,34 @@ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
     assert_equal email.strip, user.email
   end
 
+  test "doesn't throw exception when globally configured strip_whitespace_keys are not present on a model" do
+    swap Devise, :strip_whitespace_keys => [:fake_key] do
+      assert_nothing_raised { create_user }
+    end
+  end
+
+  test "doesn't throw exception when globally configured case_insensitive_keys are not present on a model" do
+    swap Devise, :case_insensitive_keys => [:fake_key] do
+      assert_nothing_raised { create_user }
+    end
+  end
+
   test "param filter should not convert booleans and integer to strings" do
-    conditions = { 'login' => 'foo@bar.com', "bool1" => true, "bool2" => false, "fixnum" => 123, "will_be_converted" => (1..10) }
-    conditions = Devise::ParamFilter.new([], []).filter(conditions)
-    assert_equal( { 'login' => 'foo@bar.com', "bool1" => true, "bool2" => false, "fixnum" => 123, "will_be_converted" => "1..10" }, conditions)
+    conditions = { "login" => "foo@bar.com", "bool1" => true, "bool2" => false, "fixnum" => 123, "will_be_converted" => (1..10) }
+    conditions = Devise::ParameterFilter.new([], []).filter(conditions)
+    assert_equal( { "login" => "foo@bar.com", "bool1" => "true", "bool2" => "false", "fixnum" => "123", "will_be_converted" => "1..10" }, conditions)
+  end
+
+  test 'param filter should filter case_insensitive_keys as insensitive' do
+    conditions = {'insensitive' => 'insensitive_VAL', 'sensitive' => 'sensitive_VAL'}
+    conditions = Devise::ParameterFilter.new(['insensitive'], []).filter(conditions)
+    assert_equal( {'insensitive' => 'insensitive_val', 'sensitive' => 'sensitive_VAL'}, conditions )
   end
 
-  test "param filter should not convert regular expressions to strings" do
-    conditions = { "regexp" => /expression/ }
-    conditions = Devise::ParamFilter.new([], []).filter(conditions)
-    assert_equal( { "regexp" => /expression/ }, conditions)
+  test 'param filter should filter strip_whitespace_keys stripping whitespaces' do
+    conditions = {'strip_whitespace' => ' strip_whitespace_val ', 'do_not_strip_whitespace' => ' do_not_strip_whitespace_val '}
+    conditions = Devise::ParameterFilter.new([], ['strip_whitespace']).filter(conditions)
+    assert_equal( {'strip_whitespace' => 'strip_whitespace_val', 'do_not_strip_whitespace' => ' do_not_strip_whitespace_val '}, conditions )
   end
 
   test 'should respond to password and password confirmation' do
@@ -94,13 +123,6 @@ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
     assert user.reload.valid_password?('pass4321')
   end
 
-  test 'should update password with valid current password and :as option' do
-    user = create_user
-    assert user.update_with_password(:current_password => '12345678',
-      :password => 'pass4321', :password_confirmation => 'pass4321', :as => :admin)
-    assert user.reload.valid_password?('pass4321')
-  end
-
   test 'should add an error to current password when it is invalid' do
     user = create_user
     assert_not user.update_with_password(:current_password => 'other',
@@ -153,12 +175,6 @@ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
     assert_equal 'new@example.com', user.email
   end
 
-  test 'should update the user without password with :as option' do
-    user = create_user
-    user.update_without_password(:email => 'new@example.com', :as => :admin)
-    assert_equal 'new@example.com', user.email
-  end
-
   test 'should not update password without password' do
     user = create_user
     user.update_without_password(:password => 'pass4321', :password_confirmation => 'pass4321')
@@ -166,6 +182,26 @@ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
     assert user.valid_password?('12345678')
   end
 
+  test 'should destroy user if current password is valid' do
+    user = create_user
+    assert user.destroy_with_password('12345678')
+    assert !user.persisted?
+  end
+
+  test 'should not destroy user with invalid password' do
+    user = create_user
+    assert_not user.destroy_with_password('other')
+    assert user.persisted?
+    assert_match "is invalid", user.errors[:current_password].join
+  end
+
+  test 'should not destroy user with blank password' do
+    user = create_user
+    assert_not user.destroy_with_password(nil)
+    assert user.persisted?
+    assert_match "can't be blank", user.errors[:current_password].join
+  end
+
   test 'downcase_keys with validation' do
     user = User.create(:email => "HEllO@example.com", :password => "123456")
     user = User.create(:email => "HEllO@example.com", :password => "123456")

data/test/models/lockable_test.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'test_helper'
 
 class LockableTest < ActiveSupport::TestCase
@@ -60,7 +59,7 @@ class LockableTest < ActiveSupport::TestCase
     assert_not user.active_for_authentication?
   end
 
-  test "should unlock a user by cleaning locked_at, falied_attempts and unlock_token" do
+  test "should unlock a user by cleaning locked_at, failed_attempts and unlock_token" do
     user = create_user
     user.lock_access!
     assert_not_nil user.reload.locked_at

data/test/models/omniauthable_test.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'test_helper'
 
 class OmniauthableTest < ActiveSupport::TestCase

data/test/models/recoverable_test.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'test_helper'
 
 class RecoverableTest < ActiveSupport::TestCase
@@ -111,7 +110,7 @@ class RecoverableTest < ActiveSupport::TestCase
 
   test 'should find a user to reset his password based on reset_password_token' do
     user = create_user
-    user.send :generate_reset_password_token!
+    user.ensure_reset_password_token!
 
     reset_password_user = User.reset_password_by_token(:reset_password_token => user.reset_password_token)
     assert_equal reset_password_user, user
@@ -131,7 +130,7 @@ class RecoverableTest < ActiveSupport::TestCase
 
   test 'should return a new record with errors if password is blank' do
     user = create_user
-    user.send :generate_reset_password_token!
+    user.ensure_reset_password_token!
 
     reset_password_user = User.reset_password_by_token(:reset_password_token => user.reset_password_token, :password => '')
     assert_not reset_password_user.errors.empty?
@@ -141,7 +140,7 @@ class RecoverableTest < ActiveSupport::TestCase
   test 'should reset successfully user password given the new password and confirmation' do
     user = create_user
     old_password = user.password
-    user.send :generate_reset_password_token!
+    user.ensure_reset_password_token!
 
     User.reset_password_by_token(
       :reset_password_token => user.reset_password_token,
@@ -180,7 +179,7 @@ class RecoverableTest < ActiveSupport::TestCase
     swap Devise, :reset_password_within => 1.hour do
       user = create_user
       old_password = user.password
-      user.send :generate_reset_password_token!
+      user.ensure_reset_password_token!
       user.reset_password_sent_at = 2.days.ago
       user.save!
 
@@ -203,4 +202,21 @@ class RecoverableTest < ActiveSupport::TestCase
       :reset_password_token
     ]
   end
+  
+  test 'should generate a new token when a valid one does not exist' do
+    user = create_user
+    assert_nil user.reset_password_token
+    
+    user.ensure_reset_password_token!
+    assert_not_nil user.reset_password_token
+  end
+  
+  test 'should not generate a new token when a valid one exists' do
+    user = create_user
+    user.send :generate_reset_password_token!
+    assert_not_nil user.reset_password_token
+    old = user.reset_password_token
+    user.ensure_reset_password_token!
+    assert_equal user.reset_password_token, old
+  end  
 end

data/test/models/registerable_test.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'test_helper'
 
 class RegisterableTest < ActiveSupport::TestCase

data/test/models/rememberable_test.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'test_helper'
 
 class RememberableTest < ActiveSupport::TestCase
@@ -58,9 +57,10 @@ class RememberableTest < ActiveSupport::TestCase
 
   test 'forget_me should not try to update resource if it has been destroyed' do
     resource = create_resource
-    resource.destroy
     resource.expects(:remember_created_at).never
     resource.expects(:save).never
+
+    resource.destroy
     resource.forget_me!
   end
 
@@ -115,7 +115,7 @@ class RememberableTest < ActiveSupport::TestCase
     end
   end
 
-  test 'remember should not be expired if it was created whitin the limit time' do
+  test 'remember should not be expired if it was created within the limit time' do
     swap Devise, :remember_for => 30.days do
       resource = create_resource
       resource.remember_me!
@@ -167,7 +167,7 @@ class RememberableTest < ActiveSupport::TestCase
     end
   end
 
-  test 'should have the required_fiels array' do
+  test 'should have the required_fields array' do
     assert_same_content Devise::Models::Rememberable.required_fields(User), [
       :remember_created_at
     ]

data/test/models/serializable_test.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'test_helper'
 
 class SerializableTest < ActiveSupport::TestCase
@@ -7,22 +6,23 @@ class SerializableTest < ActiveSupport::TestCase
   end
 
   test 'should not include unsafe keys on XML' do
-    assert_match /email/, @user.to_xml
-    assert_no_match /confirmation-token/, @user.to_xml
+    assert_match(/email/, @user.to_xml)
+    assert_no_match(/confirmation-token/, @user.to_xml)
   end
 
   test 'should not include unsafe keys on XML even if a new except is provided' do
-    assert_no_match /email/, @user.to_xml(:except => :email)
-    assert_no_match /confirmation-token/, @user.to_xml(:except => :email)
+    assert_no_match(/email/, @user.to_xml(:except => :email))
+    assert_no_match(/confirmation-token/, @user.to_xml(:except => :email))
   end
 
   test 'should include unsafe keys on XML if a force_except is provided' do
-    assert_no_match /<email/, @user.to_xml(:force_except => :email)
-    assert_match /confirmation-token/, @user.to_xml(:force_except => :email)
+    assert_no_match(/<email/, @user.to_xml(:force_except => :email))
+    assert_match(/confirmation-token/, @user.to_xml(:force_except => :email))
   end
 
   test 'should not include unsafe keys on JSON' do
-    assert_equal %w(created_at email facebook_token id updated_at username), from_json().keys.sort
+    keys = from_json().keys.select{ |key| !key.include?("id") }
+    assert_equal %w(created_at email facebook_token updated_at username), keys.sort
   end
 
   test 'should not include unsafe keys on JSON even if a new except is provided' do