upstream-devise 2.1.0.rc

data/test/mailers/confirmation_instructions_test.rb

@@ -0,0 +1,95 @@
+require 'test_helper'
+
+class ConfirmationInstructionsTest < ActionMailer::TestCase
+
+  def setup
+    setup_mailer
+    Devise.mailer = 'Devise::Mailer'
+    Devise.mailer_sender = 'test@example.com'
+  end
+
+  def teardown
+    Devise.mailer = 'Devise::Mailer'
+    Devise.mailer_sender = 'please-change-me@config-initializers-devise.com'
+  end
+
+  def user
+    @user ||= create_user
+  end
+
+  def mail
+    @mail ||= begin
+      user
+      ActionMailer::Base.deliveries.first
+    end
+  end
+
+  test 'email sent after creating the user' do
+    assert_not_nil mail
+  end
+
+  test 'content type should be set to html' do
+    assert mail.content_type.include?('text/html')
+  end
+
+  test 'send confirmation instructions to the user email' do
+    mail
+    assert_equal [user.email], mail.to
+  end
+
+  test 'setup sender from configuration' do
+    assert_equal ['test@example.com'], mail.from
+  end
+
+  test 'setup sender from custom mailer defaults' do
+    Devise.mailer = 'Users::Mailer'
+    assert_equal ['custom@example.com'], mail.from
+  end
+
+  test 'setup reply to as copy from sender' do
+    assert_equal ['test@example.com'], mail.reply_to
+  end
+
+  test 'setup subject from I18n' 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
+      assert_equal 'User Account Confirmation', mail.subject
+    end
+  end
+
+  test 'body should have user info' do
+    assert_match /#{user.email}/, mail.body.encoded
+  end
+
+  test 'body should have link to confirm the account' do
+    host = ActionMailer::Base.default_url_options[:host]
+    confirmation_url_regexp = %r{<a href=\"http://#{host}/users/confirmation\?confirmation_token=#{user.confirmation_token}">}
+    assert_match confirmation_url_regexp, mail.body.encoded
+  end
+
+  test 'renders a scoped if scoped_views is set to true' do
+    swap Devise, :scoped_views => true do
+      assert_equal user.email, mail.body.decoded
+    end
+  end
+
+  test 'renders a scoped if scoped_views is set in the mailer class' do
+    begin
+      Devise::Mailer.scoped_views = true
+      assert_equal user.email, mail.body.decoded
+    ensure
+      Devise::Mailer.send :remove_instance_variable, :@scoped_views
+    end
+  end
+
+  test 'mailer sender accepts a proc' do
+    swap Devise, :mailer_sender => proc { "another@example.com" } do
+      assert_equal ['another@example.com'], mail.from
+    end
+  end
+end

data/test/mailers/reset_password_instructions_test.rb

@@ -0,0 +1,83 @@
+require 'test_helper'
+
+class ResetPasswordInstructionsTest < ActionMailer::TestCase
+
+  def setup
+    setup_mailer
+    Devise.mailer = 'Devise::Mailer'
+    Devise.mailer_sender = 'test@example.com'
+  end
+
+  def teardown
+    Devise.mailer = 'Devise::Mailer'
+    Devise.mailer_sender = 'please-change-me@config-initializers-devise.com'
+  end
+
+  def user
+    @user ||= begin
+      user = create_user
+      user.send_reset_password_instructions
+      user
+    end
+  end
+
+  def mail
+    @mail ||= begin
+      user
+      ActionMailer::Base.deliveries.last
+    end
+  end
+
+  test 'email sent after reseting the user password' do
+    assert_not_nil mail
+  end
+
+  test 'content type should be set to html' do
+    assert mail.content_type.include?('text/html')
+  end
+
+  test 'send confirmation instructions to the user email' do
+    assert_equal [user.email], mail.to
+  end
+
+  test 'setup sender from configuration' do
+    assert_equal ['test@example.com'], mail.from
+  end
+
+  test 'setup sender from custom mailer defaults' do
+    Devise.mailer = 'Users::Mailer'
+    assert_equal ['custom@example.com'], mail.from
+  end
+
+  test 'setup reply to as copy from sender' do
+    assert_equal ['test@example.com'], mail.reply_to
+  end
+
+  test 'setup subject from I18n' 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
+      assert_equal 'User Reset Instructions', mail.subject
+    end
+  end
+
+  test 'body should have user info' do
+    assert_match(/#{user.email}/, mail.body.encoded)
+  end
+
+  test 'body should have link to confirm the account' do
+    host = ActionMailer::Base.default_url_options[:host]
+    reset_url_regexp = %r{<a href=\"http://#{host}/users/password/edit\?reset_password_token=#{user.reset_password_token}">}
+    assert_match reset_url_regexp, mail.body.encoded
+  end
+
+  test 'mailer sender accepts a proc' do
+    swap Devise, :mailer_sender => proc { "another@example.com" } do
+      assert_equal ['another@example.com'], mail.from
+    end
+  end
+end

data/test/mailers/unlock_instructions_test.rb

@@ -0,0 +1,77 @@
+require 'test_helper'
+
+class UnlockInstructionsTest < ActionMailer::TestCase
+
+  def setup
+    setup_mailer
+    Devise.mailer = 'Devise::Mailer'
+    Devise.mailer_sender = 'test@example.com'
+  end
+
+  def teardown
+    Devise.mailer = 'Devise::Mailer'
+    Devise.mailer_sender = 'please-change-me@config-initializers-devise.com'
+  end
+
+  def user
+    @user ||= begin
+      user = create_user
+      user.lock_access!
+      user
+    end
+  end
+
+  def mail
+    @mail ||= begin
+      user
+      ActionMailer::Base.deliveries.last
+    end
+  end
+
+  test 'email sent after locking the user' do
+    assert_not_nil mail
+  end
+
+  test 'content type should be set to html' do
+    assert mail.content_type.include?('text/html')
+  end
+
+  test 'send unlock instructions to the user email' do
+    assert_equal [user.email], mail.to
+  end
+
+  test 'setup sender from configuration' do
+    assert_equal ['test@example.com'], mail.from
+  end
+
+  test 'setup sender from custom mailer defaults' do
+    Devise.mailer = 'Users::Mailer'
+    assert_equal ['custom@example.com'], mail.from
+  end
+
+  test 'setup reply to as copy from sender' do
+    assert_equal ['test@example.com'], mail.reply_to
+  end
+
+  test 'setup subject from I18n' 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
+      assert_equal 'User Unlock Instructions', mail.subject
+    end
+  end
+
+  test 'body should have user info' do
+    assert_match(/#{user.email}/, mail.body.encoded)
+  end
+
+  test 'body should have link to unlock the account' do
+    host = ActionMailer::Base.default_url_options[:host]
+    unlock_url_regexp = %r{<a href=\"http://#{host}/users/unlock\?unlock_token=#{user.unlock_token}">}
+    assert_match unlock_url_regexp, mail.body.encoded
+  end
+end

data/test/mapping_test.rb

@@ -0,0 +1,127 @@
+require 'test_helper'
+
+class FakeRequest < Struct.new(:path_info, :params)
+end
+
+class MappingTest < ActiveSupport::TestCase
+  def fake_request(path, params={})
+    FakeRequest.new(path, params)
+  end
+
+  test 'store options' do
+    mapping = Devise.mappings[:user]
+    assert_equal User,                mapping.to
+    assert_equal User.devise_modules, mapping.modules
+    assert_equal "users",             mapping.scoped_path
+    assert_equal :user,               mapping.singular
+    assert_equal "users",             mapping.path
+    assert_equal "/users",            mapping.fullpath
+  end
+
+  test 'store options with namespace' do
+    mapping = Devise.mappings[:publisher_account]
+    assert_equal Admin,                 mapping.to
+    assert_equal "publisher/accounts",  mapping.scoped_path
+    assert_equal :publisher_account,    mapping.singular
+    assert_equal "accounts",            mapping.path
+    assert_equal "/publisher/accounts", mapping.fullpath
+  end
+
+  test 'allows path to be given' do
+    assert_equal "admin_area", Devise.mappings[:admin].path
+  end
+
+  test 'allows to skip all routes' do
+    assert_equal [], Devise.mappings[:skip_admin].used_routes
+  end
+
+  test 'sign_out_via defaults to :get' do
+    assert_equal :get, Devise.mappings[:user].sign_out_via
+  end
+
+  test 'allows custom sign_out_via to be given' do
+    assert_equal :delete,          Devise.mappings[:sign_out_via_delete].sign_out_via
+    assert_equal :post,            Devise.mappings[:sign_out_via_post].sign_out_via
+    assert_equal [:delete, :post], Devise.mappings[:sign_out_via_delete_or_post].sign_out_via
+  end
+
+  test 'allows custom singular to be given' do
+    assert_equal "accounts", Devise.mappings[:manager].path
+  end
+
+  test 'has strategies depending on the model declaration' do
+    assert_equal [:rememberable, :token_authenticatable, :database_authenticatable], Devise.mappings[:user].strategies
+    assert_equal [:database_authenticatable], Devise.mappings[:admin].strategies
+  end
+
+  test 'has no input strategies depending on the model declaration' do
+    assert_equal [:rememberable, :token_authenticatable], Devise.mappings[:user].no_input_strategies
+    assert_equal [], Devise.mappings[:admin].no_input_strategies
+  end
+
+  test 'find scope for a given object' do
+    assert_equal :user, Devise::Mapping.find_scope!(User)
+    assert_equal :user, Devise::Mapping.find_scope!(:user)
+    assert_equal :user, Devise::Mapping.find_scope!(User.new)
+  end
+
+  test 'find scope works with single table inheritance' do
+    assert_equal :user, Devise::Mapping.find_scope!(Class.new(User))
+    assert_equal :user, Devise::Mapping.find_scope!(Class.new(User).new)
+  end
+
+  test 'find scope raises an error if cannot be found' do
+    assert_raise RuntimeError do
+      Devise::Mapping.find_scope!(String)
+    end
+  end
+
+  test 'return default path names' do
+    mapping = Devise.mappings[:user]
+    assert_equal 'sign_in',      mapping.path_names[:sign_in]
+    assert_equal 'sign_out',     mapping.path_names[:sign_out]
+    assert_equal 'password',     mapping.path_names[:password]
+    assert_equal 'confirmation', mapping.path_names[:confirmation]
+    assert_equal 'sign_up',      mapping.path_names[:sign_up]
+    assert_equal 'unlock',       mapping.path_names[:unlock]
+  end
+
+  test 'allow custom path names to be given' do
+    mapping = Devise.mappings[:manager]
+    assert_equal 'login',        mapping.path_names[:sign_in]
+    assert_equal 'logout',       mapping.path_names[:sign_out]
+    assert_equal 'secret',       mapping.path_names[:password]
+    assert_equal 'verification', mapping.path_names[:confirmation]
+    assert_equal 'register',     mapping.path_names[:sign_up]
+    assert_equal 'unblock',      mapping.path_names[:unlock]
+  end
+
+  test 'magic predicates' do
+    mapping = Devise.mappings[:user]
+    assert mapping.authenticatable?
+    assert mapping.confirmable?
+    assert mapping.recoverable?
+    assert mapping.rememberable?
+    assert mapping.registerable?
+
+    mapping = Devise.mappings[:admin]
+    assert mapping.authenticatable?
+    assert mapping.recoverable?
+    assert mapping.lockable?
+    assert_not mapping.omniauthable?
+  end
+  
+  test 'find mapping by path' do
+    assert_raise RuntimeError do
+      Devise::Mapping.find_by_path!('/accounts/facebook/callback')
+    end
+    
+    assert_nothing_raised do
+      Devise::Mapping.find_by_path!('/:locale/accounts/login')
+    end
+
+    assert_nothing_raised do
+      Devise::Mapping.find_by_path!('/accounts/facebook/callback', :path)
+    end
+  end  
+end

data/test/models/authenticatable_test.rb

@@ -0,0 +1,7 @@
+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
+end

data/test/models/confirmable_test.rb

@@ -0,0 +1,357 @@
+require 'test_helper'
+
+class ConfirmableTest < ActiveSupport::TestCase
+
+  def setup
+    setup_mailer
+  end
+
+  test 'should generate confirmation token after creating a record' do
+    assert_nil new_user.confirmation_token
+    assert_not_nil create_user.confirmation_token
+  end
+
+  test 'should never generate the same confirmation token for different users' do
+    confirmation_tokens = []
+    3.times do
+      token = create_user.confirmation_token
+      assert !confirmation_tokens.include?(token)
+      confirmation_tokens << token
+    end
+  end
+
+  test 'should confirm a user by updating confirmed at' do
+    user = create_user
+    assert_nil user.confirmed_at
+    assert user.confirm!
+    assert_not_nil user.confirmed_at
+  end
+
+  test 'should clear confirmation token while confirming a user' do
+    user = create_user
+    assert_present user.confirmation_token
+    user.confirm!
+    assert_nil user.confirmation_token
+  end
+
+  test 'should verify whether a user is confirmed or not' do
+    assert_not new_user.confirmed?
+    user = create_user
+    assert_not user.confirmed?
+    user.confirm!
+    assert user.confirmed?
+  end
+
+  test 'should not confirm a user already confirmed' do
+    user = create_user
+    assert user.confirm!
+    assert_blank user.errors[:email]
+
+    assert_not user.confirm!
+    assert_equal "was already confirmed, please try signing in", user.errors[:email].join
+  end
+
+  test 'should find and confirm a user automatically' do
+    user = create_user
+    confirmed_user = User.confirm_by_token(user.confirmation_token)
+    assert_equal confirmed_user, user
+    assert user.reload.confirmed?
+  end
+
+  test 'should return a new record with errors when a invalid token is given' do
+    confirmed_user = User.confirm_by_token('invalid_confirmation_token')
+    assert_not confirmed_user.persisted?
+    assert_equal "is invalid", confirmed_user.errors[:confirmation_token].join
+  end
+
+  test 'should return a new record with errors when a blank token is given' do
+    confirmed_user = User.confirm_by_token('')
+    assert_not confirmed_user.persisted?
+    assert_equal "can't be blank", confirmed_user.errors[:confirmation_token].join
+  end
+
+  test 'should generate errors for a user email if user is already confirmed' do
+    user = create_user
+    user.confirmed_at = Time.now
+    user.save
+    confirmed_user = User.confirm_by_token(user.confirmation_token)
+    assert confirmed_user.confirmed?
+    assert_equal "was already confirmed, please try signing in", confirmed_user.errors[:email].join
+  end
+
+  test 'should send confirmation instructions by email' do
+    assert_email_sent "mynewuser@example.com" do
+      create_user :email => "mynewuser@example.com"
+    end
+  end
+
+  test 'should not send confirmation when trying to save an invalid user' do
+    assert_email_not_sent do
+      user = new_user
+      user.stubs(:valid?).returns(false)
+      user.save
+    end
+  end
+
+  test 'should not generate a new token neither send e-mail if skip_confirmation! is invoked' do
+    user = new_user
+    user.skip_confirmation!
+
+    assert_email_not_sent do
+      user.save!
+      assert_nil user.confirmation_token
+      assert_not_nil user.confirmed_at
+    end
+  end
+
+  test 'should find a user to send confirmation instructions' do
+    user = create_user
+    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")
+    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")
+    assert confirmation_user.errors[:email]
+    assert_equal "not found", confirmation_user.errors[:email].join
+  end
+
+  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)
+    end
+  end
+
+  test 'should always have confirmation token when email is sent' do
+    user = new_user
+    user.instance_eval { def confirmation_required?; false end }
+    user.save
+    user.send_confirmation_instructions
+    assert_not_nil user.reload.confirmation_token
+  end
+
+  test 'should not resend email instructions if the user change his email' do
+    user = create_user
+    user.email = 'new_test@example.com'
+    assert_email_not_sent do
+      user.save!
+    end
+  end
+
+  test 'should not reset confirmation status or token when updating email' do
+    user = create_user
+    user.confirm!
+    user.email = 'new_test@example.com'
+    user.save!
+
+    user.reload
+    assert user.confirmed?
+    assert_nil user.confirmation_token
+  end
+
+  test 'should not be able to send instructions if the user is already confirmed' do
+    user = create_user
+    user.confirm!
+    assert_not user.resend_confirmation_token
+    assert user.confirmed?
+    assert_equal 'was already confirmed, please try signing in', user.errors[:email].join
+  end
+
+  test 'confirm time should fallback to devise confirm in default configuration' 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?
+
+      Devise.allow_unconfirmed_access_for = 3.days
+      assert user.active_for_authentication?
+    end
+  end
+
+  test 'should be active when confirmation sent at is not overpast' do
+    swap Devise, :allow_unconfirmed_access_for => 5.days do
+      Devise.allow_unconfirmed_access_for = 5.days
+      user = create_user
+
+      user.confirmation_sent_at = 4.days.ago
+      assert user.active_for_authentication?
+
+      user.confirmation_sent_at = 5.days.ago
+      assert_not user.active_for_authentication?
+    end
+  end
+
+  test 'should be active when already confirmed' do
+    user = create_user
+    assert_not user.confirmed?
+    assert_not user.active_for_authentication?
+
+    user.confirm!
+    assert user.confirmed?
+    assert user.active_for_authentication?
+  end
+
+  test 'should not be active when confirm in is zero' do
+    Devise.allow_unconfirmed_access_for = 0.days
+    user = create_user
+    user.confirmation_sent_at = Date.today
+    assert_not user.active_for_authentication?
+  end
+
+  test 'should not be active without confirmation' do
+    user = create_user
+    user.confirmation_sent_at = nil
+    user.save
+    assert_not user.reload.active_for_authentication?
+  end
+
+  test 'should be active without confirmation when confirmation is not required' do
+    user = create_user
+    user.instance_eval { def confirmation_required?; false end }
+    user.confirmation_sent_at = nil
+    user.save
+    assert user.reload.active_for_authentication?
+  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
+      user = create_user
+      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
+      user = create_user
+      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
+  end
+end
+
+class ReconfirmableTest < ActiveSupport::TestCase
+  test 'should not worry about validations on confirm even with reconfirmable' do
+    admin = create_admin
+    admin.reset_password_token = "a"
+    assert admin.confirm!
+  end
+
+  test 'should generate confirmation token after changing email' do
+    admin = create_admin
+    assert admin.confirm!
+    assert_nil admin.confirmation_token
+    assert admin.update_attributes(:email => 'new_test@example.com')
+    assert_not_nil admin.confirmation_token
+  end
+
+  test 'should not generate confirmation token if skipping reconfirmation after changing email' do
+    admin = create_admin
+    assert admin.confirm!
+    admin.skip_reconfirmation!
+    assert admin.update_attributes(:email => 'new_test@example.com')
+    assert_nil admin.confirmation_token
+  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')
+    token = admin.confirmation_token
+    assert admin.update_attributes(:email => 'new_test@example.com')
+    assert_not_equal token, admin.confirmation_token
+  end
+
+  test 'should send confirmation instructions by email after changing email' do
+    admin = create_admin
+    assert admin.confirm!
+    assert_email_sent "new_test@example.com" do
+      assert admin.update_attributes(:email => 'new_test@example.com')
+    end
+  end
+
+  test 'should not send confirmation by email after changing password' do
+    admin = create_admin
+    assert admin.confirm!
+    assert_email_not_sent do
+      assert admin.update_attributes(:password => 'newpass', :password_confirmation => 'newpass')
+    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.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_not_equal 'new_test@example.com', admin.email
+    assert admin.confirm!
+    assert_equal 'new_test@example.com', admin.email
+  end
+
+  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_not_equal 'new_test@example.com', admin.email
+    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_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")
+    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")
+    assert confirmation_admin.errors[:email]
+    assert_equal "not found", confirmation_admin.errors[:email].join
+  end
+
+  test 'should find admin with email in unconfirmed_emails' do
+    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")
+    assert admin.persisted?
+  end
+
+  test 'required_fields should contain the fields that Devise uses' do
+    assert_same_content Devise::Models::Confirmable.required_fields(User), [
+      :confirmation_sent_at,
+      :confirmation_token,
+      :confirmed_at
+    ]
+  end
+
+  test 'required_fields should also contain unconfirmable when reconfirmable_email is true' do
+    assert_same_content Devise::Models::Confirmable.required_fields(Admin), [
+      :confirmation_sent_at,
+      :confirmation_token,
+      :confirmed_at,
+      :unconfirmed_email
+    ]
+  end
+end