devise_invitable 2.0.14 → 3.0.0

data/lib/generators/active_record/devise_invitable_install_generator.rb

@@ -0,0 +1,22 @@
+require 'rails/generators/active_record'
+
+module ActiveRecord
+  module Generators
+    class DeviseInvitableInstallGenerator < ActiveRecord::Generators::Base
+      source_root File.expand_path('../templates', __FILE__)
+      argument :name, type: :string, default: 'devise_invitation'
+
+      def copy_devise_invitations_migration
+        migration_template 'create_devise_invitations.rb',
+          'db/migrate/create_devise_invitations.rb',
+          migration_version: migration_version
+      end
+
+      def migration_version
+        if Rails::VERSION::MAJOR >= 5
+          "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
+        end
+      end
+    end
+  end
+end

data/lib/generators/active_record/devise_invitable_upgrade_generator.rb

@@ -0,0 +1,28 @@
+require 'rails/generators/active_record'
+
+module ActiveRecord
+  module Generators
+    class DeviseInvitableUpgradeGenerator < ActiveRecord::Generators::Base
+      source_root File.expand_path('../templates', __FILE__)
+
+      class_option :invite_keys, type: :array, default: ['email']
+
+      def copy_upgrade_migration
+        migration_template 'upgrade_devise_invitations.rb',
+          "db/migrate/upgrade_#{table_name}_devise_invitations.rb",
+          migration_version: migration_version,
+          invite_keys: options[:invite_keys]
+      end
+
+      def migration_version
+        if Rails::VERSION::MAJOR >= 5
+          "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
+        end
+      end
+
+      def invite_keys
+        options[:invite_keys]
+      end
+    end
+  end
+end

data/lib/generators/active_record/templates/create_devise_invitations.rb

@@ -0,0 +1,23 @@
+class CreateDeviseInvitations < ActiveRecord::Migration<%= migration_version %>
+  def change
+    create_table :devise_invitations do |t|
+      t.string :invitation_token
+      t.datetime :invitation_created_at
+      t.datetime :invitation_sent_at
+      t.datetime :invitation_accepted_at
+      t.datetime :superseded_at
+      t.string :superseded_reason
+      t.datetime :revoked_at
+      t.datetime :resource_created_at
+      t.json :invite_key, null: false, default: {}
+      t.string :invite_key_digest, null: false
+      t.references :invitable, polymorphic: true
+      t.references :invited_by, polymorphic: true
+      t.timestamps
+    end
+
+    add_index :devise_invitations, :invitation_token, unique: true
+    add_index :devise_invitations, [:invitable_type, :invite_key_digest],
+      name: 'index_devise_invitations_on_type_and_invite_key'
+  end
+end

data/lib/generators/active_record/templates/upgrade_devise_invitations.rb

@@ -0,0 +1,72 @@
+require 'digest'
+
+class Upgrade<%= table_name.camelize %>DeviseInvitations < ActiveRecord::Migration<%= migration_version %>
+  OLD_INVITATION_COLUMNS = %i[
+    invitation_token invitation_created_at invitation_sent_at
+    invitation_accepted_at invited_by_id invited_by_type
+  ].freeze
+
+  def up
+    create_devise_invitations_table unless table_exists?(:devise_invitations)
+
+    resource_class = Class.new(ActiveRecord::Base) do
+      self.table_name = '<%= table_name %>'
+      self.inheritance_column = :_type_disabled
+    end
+    invitation_class = Class.new(ActiveRecord::Base) do
+      self.table_name = 'devise_invitations'
+    end
+
+    resource_class.where.not(invitation_created_at: nil).find_each do |resource|
+      invite_key = resource.attributes.slice(<%= invite_keys.map(&:to_s).map(&:inspect).join(', ') %>)
+      digest_components = invite_key.map { |key, value| [key.to_s, value.to_s] }.sort.flatten
+      invitation_class.create!(
+        invitation_token: resource.invitation_token,
+        invitation_created_at: resource.invitation_created_at,
+        invitation_sent_at: resource.invitation_sent_at,
+        invitation_accepted_at: resource.invitation_accepted_at,
+        resource_created_at: resource.invitation_created_at,
+        invite_key: invite_key,
+        invite_key_digest: Digest::SHA256.hexdigest((['<%= class_name %>'] + digest_components).join("\0")),
+        invitable_type: '<%= class_name %>',
+        invitable_id: resource.id,
+        invited_by_type: resource.invited_by_type,
+        invited_by_id: resource.invited_by_id,
+        created_at: resource.invitation_created_at,
+        updated_at: resource.invitation_accepted_at || resource.invitation_sent_at || resource.invitation_created_at
+      )
+    end
+
+    OLD_INVITATION_COLUMNS.each do |column|
+      remove_column :<%= table_name %>, column if column_exists?(:<%= table_name %>, column)
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration,
+      'Multiple invitation records cannot be losslessly moved back onto <%= table_name %>'
+  end
+
+  private
+
+    def create_devise_invitations_table
+      create_table :devise_invitations do |t|
+        t.string :invitation_token
+        t.datetime :invitation_created_at
+        t.datetime :invitation_sent_at
+        t.datetime :invitation_accepted_at
+        t.datetime :superseded_at
+        t.string :superseded_reason
+        t.datetime :revoked_at
+        t.datetime :resource_created_at
+        t.json :invite_key, null: false, default: {}
+        t.string :invite_key_digest, null: false
+        t.references :invitable, polymorphic: true
+        t.references :invited_by, polymorphic: true
+        t.timestamps
+      end
+      add_index :devise_invitations, :invitation_token, unique: true
+      add_index :devise_invitations, [:invitable_type, :invite_key_digest],
+        name: 'index_devise_invitations_on_type_and_invite_key'
+    end
+end

data/lib/generators/devise_invitable/devise_invitable_generator.rb

@@ -3,14 +3,12 @@ module DeviseInvitable
     class DeviseInvitableGenerator < Rails::Generators::NamedBase
       namespace 'devise_invitable'
 
-      desc 'Add :invitable directive in the given model. Also generate migration for ActiveRecord'
+      desc 'Add the :invitable directive to the given model.'
 
       def inject_devise_invitable_content
         path = File.join('app', 'models', "#{file_path}.rb")
         inject_into_file(path, 'invitable, :', after: 'devise :') if File.exist?(path)
       end
-
-      hook_for :orm
     end
   end
-end
+end

data/lib/generators/devise_invitable/install_generator.rb

@@ -2,14 +2,16 @@ module DeviseInvitable
   module Generators
     class InstallGenerator < Rails::Generators::Base
       source_root File.expand_path('../../templates', __FILE__)
-      desc 'Add DeviseInvitable config variables to the Devise initializer and copy DeviseInvitable locale files to your application.'
+      desc 'Install the invitations store, add configuration, and copy the English locale.'
+
+      hook_for :orm, as: :devise_invitable_install
 
       def add_config_options_to_initializer
         devise_initializer_path = 'config/initializers/devise.rb'
         if File.exist?(devise_initializer_path)
           old_content = File.read(devise_initializer_path)
 
-          if old_content.match(Regexp.new(/^\s# ==> Configuration for :invitable\n/))
+          if old_content.match(/^\s*# ==> Configuration for :invitable\n/)
             false
           else
             inject_into_file(devise_initializer_path, before: "  # ==> Configuration for :confirmable\n") do
@@ -44,14 +46,10 @@ module DeviseInvitable
   # Default: true
   # config.resend_invitation = false
 
-  # The class name of the inviting model. If this is nil,
-  # the #invited_by association is declared to be polymorphic.
-  # Default: nil
-  # config.invited_by_class_name = 'User'
-
-  # The foreign key to the inviting model (if invited_by_class_name is set)
-  # Default: :invited_by_id
-  # config.invited_by_foreign_key = :invited_by_id
+  # Create a placeholder resource as soon as an invitation is sent. When false,
+  # the resource is created only after the invitation is accepted.
+  # Default: false
+  # config.create_resource_on_invitation = true
 
   # The column name used for counter_cache column. If this is nil,
   # the #invited_by association is declared without counter_cache.

data/lib/generators/devise_invitable/upgrade_generator.rb

@@ -0,0 +1,16 @@
+module DeviseInvitable
+  module Generators
+    class UpgradeGenerator < Rails::Generators::NamedBase
+      namespace 'devise_invitable:upgrade'
+
+      class_option :invite_keys,
+        type: :array,
+        default: ['email'],
+        desc: 'Columns used as invite keys in the old resource table'
+
+      desc 'Generate a migration from resource-backed invitations to the invitations table.'
+
+      hook_for :orm, as: :devise_invitable_upgrade
+    end
+  end
+end

data/lib/generators/mongoid/devise_invitable_install_generator.rb

@@ -0,0 +1,7 @@
+module Mongoid
+  module Generators
+    class DeviseInvitableInstallGenerator < Rails::Generators::Base
+      desc 'DeviseInvitable stores its Mongoid field definitions in the gem model.'
+    end
+  end
+end

data/lib/generators/mongoid/devise_invitable_upgrade_generator.rb

@@ -0,0 +1,11 @@
+module Mongoid
+  module Generators
+    class DeviseInvitableUpgradeGenerator < Rails::Generators::NamedBase
+      desc 'Print the Mongoid invitation data migration command.'
+
+      def show_migration_task
+        say "Run: bin/rails devise_invitable:migrate_invitations[#{class_name}]"
+      end
+    end
+  end
+end

data/lib/tasks/devise_invitable_tasks.rake

@@ -0,0 +1,10 @@
+namespace :devise_invitable do
+  desc 'Move legacy invitation fields into devise_invitations (MODEL=User also supported)'
+  task :migrate_invitations, [:model] => :environment do |_task, args|
+    model_name = args[:model] || ENV['MODEL']
+    raise ArgumentError, 'Pass a model name: rake devise_invitable:migrate_invitations[User]' if model_name.blank?
+
+    count = DeviseInvitable::Migrator.call(model_name.constantize)
+    puts "Migrated #{count} invitation#{'s' unless count == 1} for #{model_name}"
+  end
+end

data/test/functional/registrations_controller_test.rb

@@ -25,6 +25,7 @@ class DeviseInvitable::RegistrationsControllerTest < ActionController::TestCase
     sign_out @issuer
 
     @invitee = User.where(email: invitee_email).first
+    invitation = @invitee.current_invitation
     assert_nil @invitee.invitation_accepted_at
     assert_not_nil @invitee.invitation_token
     assert !@invitee.confirmed?
@@ -45,10 +46,11 @@ class DeviseInvitable::RegistrationsControllerTest < ActionController::TestCase
     end
 
     assert @invitee.encrypted_password.present?
-    assert_not_nil @invitee.invitation_accepted_at
+    assert_nil @invitee.invitation_accepted_at
     assert_nil @invitee.invitation_token
-    assert @invitee.invited_by_id.present?
-    assert @invitee.invited_by_type.present?
+    assert_equal 'registered', invitation.reload.superseded_reason
+    assert_equal @issuer, invitation.invited_by
+    refute_predicate @invitee, :invitation_pending?
     assert @invitee.confirmation_token.present?
     assert !@invitee.confirmed?
   end
@@ -79,6 +81,25 @@ class DeviseInvitable::RegistrationsControllerTest < ActionController::TestCase
     assert !@user.confirmed?
   end
 
+  test "registration supersedes invitations when placeholders are disabled" do
+    User.create_resource_on_invitation = false
+    invitee_email = 'deferred@example.org'
+    User.invite!(email: invitee_email)
+    invitation = DeviseInvitable::Invitation.first
+
+    assert_nil User.where(email: invitee_email).first
+
+    post :create, params: { user: { email: invitee_email, password: '1password', bio: '.' } }
+
+    invitee = User.find_by!(email: invitee_email)
+    assert_equal invitee, invitation.reload.invitable
+    assert_equal 'registered', invitation.superseded_reason
+    assert_nil invitation.invitation_accepted_at
+    refute_predicate invitee, :invitation_pending?
+  ensure
+    User.create_resource_on_invitation = true
+  end
+
   test "not invitable resources can register" do
     @request.env['devise.mapping'] = Devise.mappings[:admin]
     invitee_email = 'invitee@example.org'

data/test/generators_test.rb

@@ -6,30 +6,37 @@ require 'generators/devise_invitable/devise_invitable_generator'
 class GeneratorsTest < ActiveSupport::TestCase
   RAILS_APP_PATH = File.expand_path("../rails_app", __FILE__)
 
-  test "rails g should include the 6 generators" do
+  test "rails g should include the generators" do
     @output     = `cd #{RAILS_APP_PATH} && rails g`
-    generators  = %w/devise_invitable devise_invitable:form_for devise_invitable:install devise_invitable:invitation_views devise_invitable:simple_form_for devise_invitable:views/
+    generators  = %w/devise_invitable devise_invitable:form_for devise_invitable:install devise_invitable:invitation_views devise_invitable:simple_form_for devise_invitable:upgrade devise_invitable:views/
 
     generators.each do |generator|
-      @output.include? generator
+      assert_includes @output, generator
     end
   end
 
   test "rails g devise_invitable:install" do
     @output = `cd #{RAILS_APP_PATH} && rails g devise_invitable:install -p`
-    puts @output
-    assert @output.match(%r{(inject|insert|File unchanged! The supplied flag value not found!).*  config/initializers/devise\.rb\n})
     assert @output.match(%r|create.*  config/locales/devise_invitable\.en\.yml\n|)
+    if DEVISE_ORM == :active_record
+      assert_match(%r|create.*db/migrate/\d{14}_create_devise_invitations\.rb|, @output)
+    end
   end
 
   test "rails g devise_invitable Octopussy" do
     @output = `cd #{RAILS_APP_PATH} && rails g devise_invitable Octopussy -p`
     assert @output.match(%r{(inject|insert|File unchanged! The supplied flag value not found!).*  app/models/octopussy\.rb\n})
-    assert @output.match(%r|invoke.*  #{DEVISE_ORM}\n|)
+    assert_no_match(%r|invoke.*  #{DEVISE_ORM}\n|, @output)
+    assert_no_match(%r|db/migrate/\d{14}_devise_invitable_add_to_octopussies\.rb|, @output)
+  end
+
+
+  test "rails g devise_invitable:upgrade User" do
+    @output = `cd #{RAILS_APP_PATH} && rails g devise_invitable:upgrade User -p`
     if DEVISE_ORM == :active_record
-      assert @output.match(%r|create.*  db/migrate/\d{14}_devise_invitable_add_to_octopussies\.rb\n|)
-    elsif DEVISE_ORM == :mongoid
-      assert !@output.match(%r|create.*  db/migrate/\d{14}_devise_invitable_add_to_octopussies\.rb\n|)
+      assert_match(%r|create.*db/migrate/\d{14}_upgrade_users_devise_invitations\.rb|, @output)
+    else
+      assert_match(/devise_invitable:migrate_invitations\[User\]/, @output)
     end
   end
 end

data/test/integration/invitation_test.rb

@@ -152,7 +152,7 @@ class InvitationTest < ActionDispatch::IntegrationTest
 
     visit new_user_password_path
     fill_in 'user_email', with: 'valid@email.com'
-    click_button 'Send me reset password instructions'
+    find('input[type="submit"]').click
 
     visit edit_user_password_path(reset_password_token: Thread.current[:token])
     set_password visit: false, button: 'Change my password'
@@ -209,7 +209,7 @@ class InvitationTest < ActionDispatch::IntegrationTest
     assert_equal 2, user.invitation_limit
   end
 
-  test 'should not decrement invitation limit when trying to invite again a user which is invited' do
+  test 'should decrement invitation limit for each invitation record' do
     User.stubs(:invitation_limit).returns(3)
 
     user = create_full_user
@@ -227,7 +227,7 @@ class InvitationTest < ActionDispatch::IntegrationTest
     assert_equal root_path, current_path
     assert page.has_css?('p#notice', text: 'An invitation email has been sent to user@test.com.')
     user = User.find(user.id)
-    assert_equal 2, user.invitation_limit
+    assert_equal 1, user.invitation_limit
   end
 
   test 'invited_by should be set when user invites someone' do

data/test/mailers/invitation_mail_test.rb

@@ -101,6 +101,7 @@ class InvitationMailTest < ActionMailer::TestCase
 
       def initialize(*args); end
       def deliver; end
+      def deliver_now; end
     end
     Devise.mailer = 'InvitationMailTest::CustomMailer'
 

data/test/models/separate_invitations_test.rb

@@ -0,0 +1,181 @@
+require 'test_helper'
+require 'model_tests_helper'
+
+class SeparateInvitationsTest < ActiveSupport::TestCase
+  setup do
+    @create_resource_on_invitation = User.create_resource_on_invitation
+    DeviseInvitable::Invitation.delete_all
+  end
+
+  teardown do
+    User.create_resource_on_invitation = @create_resource_on_invitation
+  end
+
+  test 'an invitation can be persisted without creating a resource' do
+    User.create_resource_on_invitation = false
+    registered = User.create!(email: 'registered@example.com', password: '123456789')
+
+    invited = User.invite!(email: 'deferred@example.com')
+    invitation = DeviseInvitable::Invitation.first
+
+    assert_predicate invited, :new_record?
+    assert_equal 0, User.where(email: 'deferred@example.com').count
+    assert_equal({ 'email' => 'deferred@example.com' }, invitation.invite_key.to_h.stringify_keys)
+    assert_nil invitation.invitable_id
+    assert_nil invitation.resource_created_at
+    assert_includes User.no_active_invitation, registered
+  end
+
+  test 'accepting one of multiple invitations creates the resource and supersedes the others' do
+    User.create_resource_on_invitation = false
+    first_inviter = User.create!(email: 'first@example.com', password: '123456789')
+    second_inviter = User.create!(email: 'second@example.com', password: '123456789')
+
+    User.invite!({ email: 'multiple@example.com' }, first_inviter)
+    first = DeviseInvitable::Invitation.order(id: :asc).first
+    User.invite!({ email: 'multiple@example.com' }, second_inviter)
+    accepted_token = Thread.current[:token]
+
+    user = User.accept_invitation!(
+      invitation_token: accepted_token,
+      password: '123456789',
+      password_confirmation: '123456789'
+    )
+
+    assert_predicate user, :persisted?
+    refute_predicate user, :invitation_pending?
+    assert DeviseInvitable::Invitation.accepted.where(invitable: user).exists?
+    assert_equal 'accepted_other_invitation', first.reload.superseded_reason
+    assert_equal first_inviter, first.invited_by
+    assert_equal second_inviter, DeviseInvitable::Invitation.accepted.find_by!(invitable: user).invited_by
+    assert_equal user, first.invitable
+  end
+
+  test 'resending stages the new inviter without changing the previous invitation' do
+    User.create_resource_on_invitation = true
+    first_inviter = User.create!(email: 'first@example.com', password: '123456789')
+    second_inviter = User.create!(email: 'second@example.com', password: '123456789')
+
+    User.invite!({ email: 'multiple@example.com' }, first_inviter)
+    first_invitation = DeviseInvitable::Invitation.order(id: :asc).first
+
+    User.invite!({ email: 'multiple@example.com' }, second_inviter) do |invitable|
+      assert_equal second_inviter, invitable.invited_by
+      assert_equal second_inviter, invitable.invited_by_for_next_invitation
+    end
+
+    assert_equal first_inviter, first_invitation.reload.invited_by
+    assert_equal second_inviter, DeviseInvitable::Invitation.order(id: :asc).last.invited_by
+  end
+
+  test 'an inviter exposes its sent invitations' do
+    inviter = Admin.create!(email: 'admin@example.com', password: '123456789')
+
+    User.invite!({ email: 'invited@example.com' }, inviter)
+
+    assert_equal [DeviseInvitable::Invitation.last], inviter.sent_invitations.to_a
+  end
+
+  test 'deleting an inviter preserves sent invitations' do
+    inviter = Admin.create!(email: 'admin@example.com', password: '123456789')
+    User.invite!({ email: 'invited@example.com' }, inviter)
+    invitation = DeviseInvitable::Invitation.last
+
+    inviter.destroy!
+
+    assert_predicate invitation.reload, :persisted?
+    assert_nil invitation.invited_by
+  end
+
+  test 'a placeholder is inactive until an invitation is accepted' do
+    User.create_resource_on_invitation = true
+
+    user = User.invite!(email: 'placeholder@example.com')
+    user.update!(confirmed_at: Time.now.utc)
+
+    assert_predicate user, :invitation_pending?
+    refute_predicate user, :active_for_authentication?
+    assert_nil user.valid_password?('unknown')
+
+    user.password = user.password_confirmation = '123456789'
+    assert user.accept_invitation!
+    refute_predicate user.reload, :invitation_pending?
+    assert_predicate user, :active_for_authentication?
+  end
+
+  test 'resource attributes raise when placeholder creation is disabled' do
+    User.create_resource_on_invitation = false
+
+    error = assert_raises DeviseInvitable::ResourceAttributesRequirePlaceholderError do
+      User.invite!(email: 'attributes@example.com', username: 'invited')
+    end
+
+    assert_includes error.message, 'username'
+    assert_includes error.message, 'create_resource_on_invitation is disabled'
+    assert_equal 0, DeviseInvitable::Invitation.count
+  end
+
+  test 'resource attributes assigned by a block raise when placeholder creation is disabled' do
+    User.create_resource_on_invitation = false
+
+    error = assert_raises DeviseInvitable::ResourceAttributesRequirePlaceholderError do
+      User.invite!(email: 'attributes@example.com') do |invitable|
+        invitable.username = 'invited'
+      end
+    end
+
+    assert_includes error.message, 'username'
+    assert_equal 0, DeviseInvitable::Invitation.count
+  end
+
+  test 'deferred invitations validate their invite keys' do
+    User.create_resource_on_invitation = false
+
+    invited = User.invite!(email: 'not-an-email')
+
+    assert_includes invited.errors.details[:email], error: :invalid
+    assert_equal 0, DeviseInvitable::Invitation.count
+  end
+
+  test 'legacy invitation data migration is idempotent' do
+    skip unless DEVISE_ORM == :mongoid
+
+    user = User.create!(email: 'legacy@example.com', password: '123456789')
+    created_at = 1.day.ago
+    User.collection.find(_id: user.id).update_one(
+      '$set' => {
+        invitation_token: 'legacy-digest',
+        invitation_created_at: created_at,
+        invitation_sent_at: created_at,
+        invited_by_type: 'User'
+      }
+    )
+
+    assert_equal 1, DeviseInvitable::Migrator.call(User)
+    assert_equal 0, DeviseInvitable::Migrator.call(User)
+
+    invitation = DeviseInvitable::Invitation.find_by!(invitation_token: 'legacy-digest')
+    assert_equal user, invitation.invitable
+    assert_equal({ 'email' => 'legacy@example.com' }, invitation.invite_key.to_h.stringify_keys)
+    assert_equal created_at.to_i, invitation.resource_created_at.to_i
+  end
+
+  test 'legacy invitation migration processes multiple resources in a batch' do
+    skip unless DEVISE_ORM == :mongoid
+
+    first = User.create!(email: 'first-legacy@example.com', password: '123456789')
+    second = User.create!(email: 'second-legacy@example.com', password: '123456789')
+    created_at = 1.day.ago
+    User.collection.find(_id: first.id).update_one(
+      '$set' => { invitation_token: 'first-legacy-digest', invitation_created_at: created_at }
+    )
+    User.collection.find(_id: second.id).update_one(
+      '$set' => { invitation_token: 'second-legacy-digest', invitation_created_at: created_at }
+    )
+
+    assert_equal 2, DeviseInvitable::Migrator.call(User)
+    assert_equal 2, DeviseInvitable::Invitation.where(:invitable_id.in => [first.id, second.id]).count
+    refute first.reload.attributes.key?('invitation_created_at')
+    refute second.reload.attributes.key?('invitation_created_at')
+  end
+end

data/test/models_test.rb

@@ -32,10 +32,19 @@ class ModelsTest < ActiveSupport::TestCase
     assert_nil User.invitation_limit
   end
 
+  test 'does not create placeholder resources by default' do
+    assert_equal false, Devise.create_resource_on_invitation
+  end
+
   test 'should have a default value for invite_key' do
     assert !User.invite_key.nil?
   end
 
+  test 'uses the root model class for invitations' do
+    assert_equal User, User.devise_invitable_base_class
+    assert_equal User, Invitable.devise_invitable_base_class
+  end
+
   test 'set a custom value for invite_for' do
     old_invite_for = User.invite_for
     User.invite_for = 5.days
@@ -63,6 +72,31 @@ class ModelsTest < ActiveSupport::TestCase
     User.invitation_limit = old_invitation_limit
   end
 
+  test 'warns when deprecated invited_by settings are configured globally' do
+    DeviseInvitable.deprecator.expects(:warn).with(includes('invited_by_class_name')).once
+    DeviseInvitable.deprecator.expects(:warn).with(includes('invited_by_foreign_key')).once
+
+    Devise.invited_by_class_name = 'Admin'
+    Devise.invited_by_foreign_key = :inviter_id
+  ensure
+    Devise.class_variable_set(:@@invited_by_class_name, nil)
+    Devise.class_variable_set(:@@invited_by_foreign_key, nil)
+  end
+
+  test 'warns when deprecated invited_by settings are configured on a model' do
+    DeviseInvitable.deprecator.expects(:warn).with(includes('invited_by_class_name')).once
+    DeviseInvitable.deprecator.expects(:warn).with(includes('invited_by_foreign_key')).once
+
+    model = Class.new(User) do
+      devise :invitable,
+        invited_by_class_name: 'Admin',
+        invited_by_foreign_key: :inviter_id
+    end
+
+    assert_equal 'Admin', model.invited_by_class_name
+    assert_equal :inviter_id, model.invited_by_foreign_key
+  end
+
   test 'set a default value for validate_on_invite' do
     assert_equal true, Invitable.validate_on_invite
   end

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

@@ -34,7 +34,8 @@ class User < PARENT_MODEL_CLASS
     validates_presence_of :encrypted_password, if: :password_required?
   end
 
-  devise :database_authenticatable, :registerable, :validatable, :confirmable, :invitable, :recoverable
+  devise :database_authenticatable, :registerable, :validatable, :confirmable, :invitable, :recoverable,
+    create_resource_on_invitation: true
 
   attr_accessor :after_invitation_created_callback_works, :after_invitation_accepted_callback_works, :bio, :token
   validates :username, length: { maximum: 20 }

data/test/rails_app/config/initializers/devise.rb

@@ -120,15 +120,6 @@ Devise.setup do |config|
   # Default: true
   # config.resend_invitation = false
 
-  # The class name of the inviting model. If this is nil,
-  # the #invited_by association is declared to be polymorphic.
-  # Default: nil
-  # config.invited_by_class_name = 'User'
-
-  # The foreign key to the inviting model (if invited_by_class_name is set)
-  # Default: :invited_by_id
-  # config.invited_by_foreign_key = :invited_by_id
-
   # The column name used for counter_cache column. If this is nil,
   # the #invited_by association is declared without counter_cache.
   # Default: nil