devise_invitable 1.5.3 → 1.6.0

data/test/mailers/invitation_mail_test.rb

@@ -23,8 +23,8 @@ class InvitationMailTest < ActionMailer::TestCase
     assert_not_nil mail
   end
 
-  test 'content type should be set to html' do
-    assert_equal 'text/html; charset=UTF-8', mail.content_type
+  test 'content type should be set to multipart' do
+    assert_match /^multipart\/alternative; boundary="[^"]+"; charset=UTF-8/, mail.content_type
   end
 
   test 'send invitation to the user email' do
@@ -48,22 +48,62 @@ class InvitationMailTest < ActionMailer::TestCase
   end
 
   test 'body should have user info' do
-    assert_match /#{user.email}/, mail.body.decoded
+    assert_match /#{user.email}/, mail.html_part.body.decoded
+    assert_match /#{user.email}/, mail.text_part.body.decoded
   end
 
   test 'body should have link to confirm the account' do
     host = ActionMailer::Base.default_url_options[:host]
-    body = mail.body.decoded
+    body = mail.html_part.body.decoded
     invitation_url_regexp = %r{<a href=\"http://#{host}/users/invitation/accept\?invitation_token=#{Thread.current[:token]}">}
     assert_match invitation_url_regexp, body
+
+    body = mail.text_part.body.decoded
+    invitation_url_regexp = %r{http://#{host}/users/invitation/accept\?invitation_token=#{Thread.current[:token]}}
+    assert_match invitation_url_regexp, body
   end
 
   test 'body should have link to confirm the account on resend' do
     host = ActionMailer::Base.default_url_options[:host]
     user
     @user = User.find(user.id).invite!
-    body = mail.body.decoded
+    body = mail.html_part.body.decoded
     invitation_url_regexp = %r{<a href=\"http://#{host}/users/invitation/accept\?invitation_token=#{Thread.current[:token]}">}
     assert_match invitation_url_regexp, body
+
+    body = mail.text_part.body.decoded
+    invitation_url_regexp = %r{http://#{host}/users/invitation/accept\?invitation_token=#{Thread.current[:token]}}
+    assert_match invitation_url_regexp, body
+  end
+
+  test 'body should have invitation due date when it exists' do
+    User.stubs(:invite_for => 5)
+
+    host = ActionMailer::Base.default_url_options[:host]
+    user
+    body = mail.html_part.body.decoded
+    due_date_regexp = %r{#{I18n.l user.invitation_due_at, format: :'devise.mailer.invitation_instructions.accept_until_format' }}
+    assert_match due_date_regexp, body
+
+    body = mail.text_part.body.decoded
+    due_date_regexp = %r{#{I18n.l user.invitation_due_at, format: :'devise.mailer.invitation_instructions.accept_until_format' }}
+    assert_match due_date_regexp, body
+  end
+
+  test 'options are passed to the delivery method' do
+    class CustomMailer < Devise::Mailer
+      class << self
+        def invitation_instructions(record, name, options = {})
+          fail 'Options not as expected' unless options[:invited_at].is_a?(Time)
+          new(record, name, options)
+        end
+      end
+
+      def initialize(*args); end
+      def deliver; end
+    end
+    Devise.mailer = CustomMailer
+
+    User.invite!({ email: 'valid@email.com' }, nil, { invited_at: Time.now })
   end
 end

data/test/model_tests_helper.rb

@@ -1,5 +1,6 @@
 class ActiveSupport::TestCase
   def setup_mailer
+    Devise.mailer = Devise::Mailer
     ActionMailer::Base.deliveries = []
   end
 

data/test/models/invitable_test.rb

@@ -29,9 +29,9 @@ class InvitableTest < ActiveSupport::TestCase
     user = new_user
     user.invite!
 
-    assert_not_nil user.invitation_token
-    assert_not_nil user.raw_invitation_token
-    assert_not_nil user.invitation_created_at
+    refute_nil user.invitation_token
+    refute_nil user.raw_invitation_token
+    refute_nil user.invitation_created_at
 
     3.times do
       user = User.find(user.id)
@@ -40,7 +40,7 @@ class InvitableTest < ActiveSupport::TestCase
         user.invite!
         user.invitation_token
       }.call
-      assert_not_nil user.raw_invitation_token
+      refute_nil user.raw_invitation_token
     end
   end
 
@@ -49,8 +49,8 @@ class InvitableTest < ActiveSupport::TestCase
     user.skip_invitation = true
     user.invite!
 
-    assert_not_nil user.invitation_token
-    assert_not_nil user.invitation_created_at
+    refute_nil user.invitation_token
+    refute_nil user.invitation_created_at
 
     3.times do
       user = User.find(user.id)
@@ -60,8 +60,8 @@ class InvitableTest < ActiveSupport::TestCase
         user.invite!
         user.invitation_token
       }.call
-      assert_not_nil user.invitation_token
-      assert_not_nil user.raw_invitation_token
+      refute_nil user.invitation_token
+      refute_nil user.raw_invitation_token
     end
   end
 
@@ -88,8 +88,8 @@ class InvitableTest < ActiveSupport::TestCase
     user.update_attributes(:invitation_sent_at => old_invitation_sent_at, :invitation_created_at => old_invitation_created_at)
     3.times do
       user.invite!
-      assert_not_equal old_invitation_sent_at, user.invitation_sent_at
-      assert_not_equal old_invitation_created_at, user.invitation_created_at
+      refute_equal old_invitation_sent_at, user.invitation_sent_at
+      refute_equal old_invitation_created_at, user.invitation_created_at
       user.update_attributes(:invitation_sent_at => old_invitation_sent_at, :invitation_created_at => old_invitation_created_at)
     end
   end
@@ -99,27 +99,51 @@ class InvitableTest < ActiveSupport::TestCase
 
     User.stubs(:invite_for).returns(nil)
     user.invitation_created_at = Time.now.utc
-    assert user.valid_invitation?
+    assert_predicate user, :valid_invitation?
 
     User.stubs(:invite_for).returns(nil)
     user.invitation_created_at = 1.year.ago
-    assert user.valid_invitation?
+    assert_predicate user, :valid_invitation?
 
     User.stubs(:invite_for).returns(0)
     user.invitation_created_at = Time.now.utc
-    assert user.valid_invitation?
+    assert_predicate user, :valid_invitation?
 
     User.stubs(:invite_for).returns(0)
     user.invitation_created_at = 1.day.ago
-    assert user.valid_invitation?
+    assert_predicate user, :valid_invitation?
 
     User.stubs(:invite_for).returns(1.day)
     user.invitation_created_at = Time.now.utc
-    assert user.valid_invitation?
+    assert_predicate user, :valid_invitation?
 
     User.stubs(:invite_for).returns(1.day)
     user.invitation_created_at = 2.days.ago
-    assert !user.valid_invitation?
+    refute_predicate user, :valid_invitation?
+  end
+
+  test 'should return token validity when there is invite_for' do
+    User.stubs(:invite_for).returns(1.day)
+
+    user = User.invite!(:email => "valid@email.com")
+    sent_at = user.invitation_created_at || user.invitation_sent_at
+    valid_until = sent_at + User.invite_for
+
+    assert_equal user.invitation_due_at, valid_until
+  end
+
+  test 'should return nil for invitation due date when invite_for is nil' do
+    User.stubs(:invite_for).returns(nil)
+    user = User.invite!(:email => "valid@email.com")
+
+    assert_equal user.invitation_due_at, nil
+  end
+
+  test 'should return nil for invitation due date when invite_for is 0' do
+    User.stubs(:invite_for).returns(0)
+    user = User.invite!(email: 'valid@email.com')
+
+    assert_equal user.invitation_due_at, nil
   end
 
   test 'should never generate the same invitation token for different users' do
@@ -128,7 +152,7 @@ class InvitableTest < ActiveSupport::TestCase
       user = new_user
       user.invite!
       token = user.invitation_token
-      assert !invitation_tokens.include?(token)
+      refute_includes invitation_tokens, token
       invitation_tokens << token
     end
   end
@@ -136,36 +160,49 @@ class InvitableTest < ActiveSupport::TestCase
   test 'should invite with multiple columns for invite key' do
     User.stubs(:invite_key).returns(:email => Devise.email_regexp, :username => /\A.+\z/)
     user = User.invite!(:email => "valid@email.com", :username => "name")
-    assert user.persisted?
-    assert user.errors.empty?
+    assert_predicate user, :persisted?
+    assert_empty user.errors
   end
 
   test 'should allow non-string columns for invite key' do
     User.stubs(:invite_key).returns(:email => Devise.email_regexp, :profile_id => :present?.to_proc, :active => true)
     user = User.invite!(:email => "valid@email.com", :profile_id => 1, :active => true)
-    assert user.persisted?
-    assert user.errors.empty?
+    assert_predicate user, :persisted?
+    assert_empty user.errors
   end
 
   test 'should not invite with some missing columns when invite key is an array' do
     User.stubs(:invite_key).returns(:email => Devise.email_regexp, :username => /\A.+\z/, :profile_id => :present?.to_proc, :active => true)
     user = User.invite!(:email => "valid@email.com")
-    assert user.new_record?
-    assert user.errors.present?
+    assert_predicate user, :new_record?
+    refute_empty user.errors
     assert user.errors[:username]
     assert user.errors[:profile_id]
     assert user.errors[:active]
-    assert user.errors[:email].empty?
+    assert_empty user.errors[:email]
   end
 
   test 'should return mail object' do
     mail = User.invite_mail!(:email => 'valid@email.com')
-    assert mail.class.name == 'Mail::Message'
+    assert_instance_of Mail::Message, mail
   end
 
   test 'should disallow login when invited' do
     invited_user = User.invite!(:email => "valid@email.com")
-    assert !invited_user.valid_password?('1234')
+    refute invited_user.valid_password?('1234')
+  end
+
+  test 'should not accept invite without password' do
+    user = User.invite!(:email => "valid@email.com")
+    user = User.accept_invitation!(:invitation_token => Thread.current[:token])
+    refute_predicate user, :invitation_accepted?
+  end
+
+  test 'should accept invite without password if enforce is disabled' do
+    Devise.stubs(:require_password_on_accepting => false)
+    user = User.invite!(:email => "valid@email.com")
+    user = User.accept_invitation!(:invitation_token => Thread.current[:token])
+    assert_predicate user, :invitation_accepted?
   end
 
   test 'should set password and password confirmation from params' do
@@ -178,7 +215,7 @@ class InvitableTest < ActiveSupport::TestCase
     user = User.invite!(:email => "valid@email.com")
     old_encrypted_password = user.encrypted_password
     user = User.accept_invitation!(:invitation_token => Thread.current[:token], :password => '123456789', :password_confirmation => '123456789')
-    assert_not_equal old_encrypted_password, user.encrypted_password
+    refute_equal old_encrypted_password, user.encrypted_password
   end
 
   test 'should not override password on invite!' do
@@ -220,7 +257,7 @@ class InvitableTest < ActiveSupport::TestCase
     User.reset_password_by_token(:reset_password_token => token, :password => '123456789', :password_confirmation => '123456789')
     assert_nil user.reload.reset_password_token
     assert_nil user.reload.invitation_token
-    assert !user.invited_to_sign_up?
+    refute_predicate user, :invited_to_sign_up?
   end
 
   test 'should not accept invitation on failing to reset the password' do
@@ -240,7 +277,7 @@ class InvitableTest < ActiveSupport::TestCase
 
   test 'should not set invitation_accepted_at if just resetting password' do
     user = User.create!(:email => "valid@email.com", :password => "123456780")
-    assert !user.invited_to_sign_up?
+    refute_predicate user, :invited_to_sign_up?
     token, user.reset_password_token = Devise.token_generator.generate(User, :reset_password_token)
     user.reset_password_sent_at = Time.now.utc
     user.save
@@ -257,30 +294,30 @@ class InvitableTest < ActiveSupport::TestCase
     assert_difference('ActionMailer::Base.deliveries.size') do
       token = user.invitation_token
       user.invite!
-      assert_not_equal token, user.invitation_token
+      refute_equal token, user.invitation_token
     end
   end
 
   test 'should return a record with invitation token and no errors to send invitation by email' do
     invited_user = User.invite!(:email => "valid@email.com")
-    assert invited_user.errors.blank?
-    assert invited_user.invitation_token.present?
+    assert_empty invited_user.errors
+    assert_predicate invited_user.invitation_token, :present?
     assert_equal 'valid@email.com', invited_user.email
-    assert invited_user.persisted?
+    assert_predicate invited_user, :persisted?
   end
 
   test 'should set all attributes with no errors' do
     invited_user = User.invite!(:email => "valid@email.com", :username => 'first name')
-    assert invited_user.errors.blank?
+    assert_empty invited_user.errors
     assert_equal 'first name', invited_user.username
-    assert invited_user.persisted?
+    assert_predicate invited_user, :persisted?
   end
 
   test 'should not validate other attributes when validate_on_invite is disabled' do
     validate_on_invite = User.validate_on_invite
     User.validate_on_invite = false
     invited_user = User.invite!(:email => "valid@email.com", :username => "a"*50)
-    assert invited_user.errors.empty?
+    assert_empty invited_user.errors
     User.validate_on_invite = validate_on_invite
   end
 
@@ -288,7 +325,7 @@ class InvitableTest < ActiveSupport::TestCase
     validate_on_invite = User.validate_on_invite
     User.validate_on_invite = true
     invited_user = User.invite!(:email => "valid@email.com", :username => "a"*50)
-    assert invited_user.errors[:username].present?
+    refute_empty invited_user.errors[:username]
     User.validate_on_invite = validate_on_invite
   end
 
@@ -296,8 +333,8 @@ class InvitableTest < ActiveSupport::TestCase
     validate_on_invite = User.validate_on_invite
     User.validate_on_invite = true
     invited_user = User.invite!(:email => "valid@email.com", :username => "a"*50)
-    assert invited_user.errors.present?
-    assert invited_user.errors[:password].empty?
+    refute_empty invited_user.errors
+    assert_empty invited_user.errors[:password]
     User.validate_on_invite = validate_on_invite
   end
 
@@ -305,8 +342,8 @@ class InvitableTest < ActiveSupport::TestCase
     validate_on_invite = User.validate_on_invite
     User.validate_on_invite = true
     invited_user = User.invite!(:email => "", :username => "a"*50)
-    assert invited_user.errors[:email].present?
-    assert invited_user.errors[:username].present?
+    refute_empty invited_user.errors[:email]
+    refute_empty invited_user.errors[:username]
     User.validate_on_invite = validate_on_invite
   end
 
@@ -347,7 +384,7 @@ class InvitableTest < ActiveSupport::TestCase
       user = User.invite!(:email => "valid@email.com", :username => "a"*50)
       assert_equal user, existing_user
       assert_equal ['has already been taken'], user.errors[:email]
-      assert user.errors[:username].present?
+      refute_empty user.errors[:username]
     ensure
       User.validate_on_invite = validate_on_invite
     end
@@ -369,7 +406,7 @@ class InvitableTest < ActiveSupport::TestCase
     invited_user = User.invite!(:email => "invalid_email.com", :username => 'first name')
     assert invited_user.new_record?
     assert_equal 'first name', invited_user.username
-    assert invited_user.errors.present?
+    refute_empty invited_user.errors
   end
 
   test 'should find a user to set his password based on invitation_token' do
@@ -433,10 +470,10 @@ class InvitableTest < ActiveSupport::TestCase
       :password_confirmation => 'new_password',
       :username => 'a'*50
     )
-    assert invited_user.errors[:username].present?
+    refute_empty invited_user.errors[:username]
 
     user.reload
-    assert !user.valid_password?('new_password')
+    refute user.valid_password?('new_password')
   end
 
   test 'should check if created by invitation' do
@@ -476,7 +513,7 @@ class InvitableTest < ActiveSupport::TestCase
 
     user.invite!
 
-    assert !user.confirmed?
+    refute_predicate user, :confirmed?
   end
 
   test 'user.has_invitations_left? test' do
@@ -492,7 +529,7 @@ class InvitableTest < ActiveSupport::TestCase
     # With an individual invitation_limit of 0, a user shouldn't be able to send an invitation
     user.invitation_limit = 0
     assert user.save
-    assert !user.has_invitations_left?
+    refute_predicate user, :has_invitations_left?
 
     # With in invitation_limit of 2, a user should be able to send two invitations
     user.invitation_limit = 2
@@ -520,7 +557,7 @@ class InvitableTest < ActiveSupport::TestCase
     assert_no_difference('ActionMailer::Base.deliveries.size') do
       user.invite!
     end
-    assert user.invitation_created_at.present?
+    assert_predicate user, :invitation_created_at
     assert_nil user.invitation_sent_at
   end
 
@@ -531,7 +568,7 @@ class InvitableTest < ActiveSupport::TestCase
         u.skip_invitation = true
       end
     end
-    assert user.invitation_created_at.present?
+    assert_predicate user, :invitation_created_at
     assert_nil user.invitation_sent_at
   end
 
@@ -552,17 +589,17 @@ class InvitableTest < ActiveSupport::TestCase
 
   test 'user.accept_invitation! should trigger callbacks' do
     user = User.invite!(:email => "valid@email.com")
-    assert_callbacks_not_fired user
+    assert_callbacks_not_fired :after_invitation_accepted, user
     user.accept_invitation!
-    assert_callbacks_fired user
+    assert_callbacks_fired :after_invitation_accepted, user
   end
 
   test 'user.accept_invitation! should not trigger callbacks if validation fails' do
     user = User.invite!(:email => "valid@email.com")
-    assert_callbacks_not_fired user
+    assert_callbacks_not_fired :after_invitation_accepted, user
     user.username='a'*50
     user.accept_invitation!
-    assert_callbacks_not_fired user
+    assert_callbacks_not_fired :after_invitation_accepted, user
   end
 
   test 'user.accept_invitation! should confirm user if confirmable' do
@@ -577,19 +614,19 @@ class InvitableTest < ActiveSupport::TestCase
     user.username='a'*50
     user.accept_invitation!
 
-    assert !user.confirmed?
+    refute_predicate user, :confirmed?
   end
 
-  def assert_callbacks_fired(user)
-    assert_callbacks_status user, true
+  def assert_callbacks_fired(callback, user)
+    assert_callbacks_status callback, user, true
   end
 
-  def assert_callbacks_not_fired(user)
-    assert_callbacks_status user, nil
+  def assert_callbacks_not_fired(callback, user)
+    assert_callbacks_status callback, user, nil
   end
 
-  def assert_callbacks_status(user, fired)
-    assert_equal fired, user.callback_works
+  def assert_callbacks_status(callback, user, fired)
+    assert_equal fired, user.send("#{callback}_callback_works".to_sym)
   end
 
   test "user.invite! should downcase the class's case_insensitive_keys" do
@@ -605,6 +642,13 @@ class InvitableTest < ActiveSupport::TestCase
     assert user.active == true
   end
 
+  test "user.invite! should trigger callbacks" do
+    user = User.new(email: "valid@email.com")
+    assert_callbacks_not_fired :after_invitation_created, user
+    user.invite!
+    assert_callbacks_fired :after_invitation_created, user
+  end
+
   test 'should pass validation before accept if field is required in post-invited instance' do
     user = User.invite!(:email => "valid@email.com")
     user.testing_accepted_or_not_invited = true
@@ -630,7 +674,7 @@ class InvitableTest < ActiveSupport::TestCase
   test 'should return instance with errors if invitation_token is nil' do
     User.create(:email => 'admin@test.com', :password => '123456', :password_confirmation => '123456')
     user = User.accept_invitation!
-    assert !user.errors.empty?
+    refute_empty user.errors
   end
 
   test "should count invited, created_by_invite, accepted and not accepted invitations" do
@@ -657,4 +701,18 @@ class InvitableTest < ActiveSupport::TestCase
     retval = user.reset_password!('anewpassword', 'anewpassword')
     assert_equal true, retval
   end
+
+  test 'should set initial password with variety of characters' do
+    PASSWORD_FORMAT = /\A
+        (?=.*\d)           # Must contain a digit
+        (?=.*[a-z])        # Must contain a lower case character
+        (?=.*[A-Z])        # Must contain an upper case character
+        (?=.*[[:^alnum:]]) # Must contain a symbol
+      /x
+    User.stubs(:invite_key).returns(:password => PASSWORD_FORMAT)
+    Devise.stubs(:friendly_token).returns('onlylowercaseletters')
+    user = User.invite!(:email => "valid@email.com")
+    assert user.persisted?
+    assert user.errors.empty?
+  end
 end

data/test/rails_app/app/models/user.rb

@@ -36,10 +36,11 @@ class User < PARENT_MODEL_CLASS
 
   devise :database_authenticatable, :registerable, :validatable, :confirmable, :invitable, :recoverable
 
-  attr_accessor :callback_works, :bio, :token
+  attr_accessor :after_invitation_created_callback_works, :after_invitation_accepted_callback_works, :bio, :token
   validates :username, :length => { :maximum => 20 }
-  
+
   attr_accessor :testing_accepted_or_not_invited
+
   validates :username, :presence => true, :if => :testing_accepted_or_not_invited_validator?
   validates :bio, :presence => true, :if => :invitation_accepted?
 
@@ -47,8 +48,12 @@ class User < PARENT_MODEL_CLASS
     testing_accepted_or_not_invited && accepted_or_not_invited?
   end
 
+  after_invitation_created do |object|
+    object.after_invitation_created_callback_works = true
+  end
+
   after_invitation_accepted do |object|
-    object.callback_works = true
+    object.after_invitation_accepted_callback_works = true
   end
 
   def send_devise_notification(method, raw, *args)

data/test/rails_app/config/application.rb

@@ -7,7 +7,8 @@ require "rails/test_unit/railtie"
 Bundler.require(:default, DEVISE_ORM) if defined?(Bundler)
 
 begin
-  require "#{DEVISE_ORM}/railtie"
+  require "#{DEVISE_ORM}" if DEVISE_ORM == :mongoid
+  require "#{DEVISE_ORM}/railtie" unless DEVISE_ORM == :mongoid && Mongoid::VERSION >= '5.0.0'
 rescue LoadError
 end
 PARENT_MODEL_CLASS = DEVISE_ORM == :active_record ? ActiveRecord::Base : Object
@@ -20,5 +21,8 @@ module RailsApp
   class Application < Rails::Application
     config.filter_parameters << :password
     config.action_mailer.default_url_options = { :host => "localhost:3000" }
+    if DEVISE_ORM == :active_record && Rails.version.start_with?('5')
+      config.active_record.maintain_test_schema = false
+    end
   end
 end

data/test/rails_app/config/database.yml

@@ -11,7 +11,8 @@ development:
 # Do not set this db to the same as development or production.
 test:
   adapter: sqlite3
-  database: ":memory:"
+  #database: ":memory:"
+  database: db/test.sqlite3
   pool: 5
   timeout: 5000
 

data/test/rails_app/config/environments/test.rb

@@ -30,4 +30,6 @@ RailsApp::Application.configure do
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  config.active_support.test_order = :sorted
 end

data/test/rails_app/config/locales/en.yml

@@ -3,6 +3,9 @@
 
 en:
   hello: "Hello world"
+  time:
+    formats:
+      short: "%b %d"
   devise:
     free_invitations:
       send_instructions: 'An invitation email has been sent to %{email}.'

data/test/rails_app/db/migrate/20100401102949_create_tables.rb

@@ -29,7 +29,7 @@ class CreateTables < ActiveRecord::Migration
       t.string   :invited_by_type
       t.integer :invitations_count, :default => 0
 
-      t.timestamps
+      t.timestamps :null => false
     end
     add_index :users, :invitation_token, :unique => true
     add_index :users, :invitations_count

data/test/test_helper.rb

@@ -4,9 +4,8 @@ DEVISE_ORM = (ENV["DEVISE_ORM"] || :active_record).to_sym
 $:.unshift File.dirname(__FILE__)
 puts "\n==> Devise.orm = #{DEVISE_ORM.inspect}"
 require "rails_app/config/environment"
-include Devise::TestHelpers
-require "orm/#{DEVISE_ORM}"
 require 'rails/test_help'
+require "orm/#{DEVISE_ORM}"
 require 'capybara/rails'
 require 'mocha/setup'
 
@@ -15,10 +14,11 @@ ActionMailer::Base.perform_deliveries = true
 ActionMailer::Base.default_url_options[:host] = 'test.com'
 
 ActiveSupport::Deprecation.silenced = true
+$VERBOSE = false
 
 class ActionDispatch::IntegrationTest
   include Capybara::DSL
 end
-class ActionController::TestCase 
-  include Devise::TestHelpers 
+class ActionController::TestCase
+  include Devise::TestHelpers
 end