devise 4.3.0 → 4.4.2

data/test/integration/timeoutable_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class SessionTimeoutTest < Devise::IntegrationTest

data/test/integration/trackable_test.rb

@@ -1,6 +1,13 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class TrackableHooksTest < Devise::IntegrationTest
+  test "trackable should not run model validations" do
+    sign_in_as_user
+
+    refute User.validations_performed
+  end
 
   test "current and last sign in timestamps are updated on each sign in" do
     user = create_user

data/test/mailers/confirmation_instructions_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class ConfirmationInstructionsTest < ActionMailer::TestCase

data/test/mailers/email_changed_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class EmailChangedTest < ActionMailer::TestCase

data/test/mailers/mailer_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class MailerTest < ActionMailer::TestCase

data/test/mailers/reset_password_instructions_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class ResetPasswordInstructionsTest < ActionMailer::TestCase

data/test/mailers/unlock_instructions_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class UnlockInstructionsTest < ActionMailer::TestCase

data/test/mapping_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class FakeRequest < Struct.new(:path_info, :params)

data/test/models/authenticatable_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class AuthenticatableTest < ActiveSupport::TestCase

data/test/models/confirmable_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class ConfirmableTest < ActiveSupport::TestCase
@@ -6,6 +8,17 @@ class ConfirmableTest < ActiveSupport::TestCase
     setup_mailer
   end
 
+  test 'should set callbacks to send the mail' do
+    if DEVISE_ORM == :active_record
+      defined_callbacks = User._commit_callbacks.map(&:filter)
+      assert_includes defined_callbacks, :send_on_create_confirmation_instructions
+      assert_includes defined_callbacks, :send_reconfirmation_instructions
+    elsif DEVISE_ORM == :mongoid
+      assert_includes User._create_callbacks.map(&:filter), :send_on_create_confirmation_instructions
+      assert_includes User._update_callbacks.map(&:filter), :send_reconfirmation_instructions
+    end
+  end
+
   test 'should generate confirmation token after creating a record' do
     assert_nil new_user.confirmation_token
     assert_not_nil create_user.confirmation_token

data/test/models/database_authenticatable_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'test_models'
 require 'digest/sha1'

data/test/models/lockable_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class LockableTest < ActiveSupport::TestCase

data/test/models/omniauthable_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class OmniauthableTest < ActiveSupport::TestCase

data/test/models/recoverable_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class RecoverableTest < ActiveSupport::TestCase

data/test/models/registerable_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class RegisterableTest < ActiveSupport::TestCase

data/test/models/rememberable_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class RememberableTest < ActiveSupport::TestCase

data/test/models/serializable_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class SerializableTest < ActiveSupport::TestCase
@@ -40,6 +42,10 @@ class SerializableTest < ActiveSupport::TestCase
     assert_no_match(/confirmation_token/, @user.inspect)
   end
 
+  test 'should accept frozen options' do
+    assert_key "username", @user.as_json({only: :username}.freeze)["user"]
+  end
+
   def assert_key(key, subject)
     assert subject.key?(key), "Expected #{subject.inspect} to have key #{key.inspect}"
   end

data/test/models/timeoutable_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class TimeoutableTest < ActiveSupport::TestCase

data/test/models/trackable_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class TrackableTest < ActiveSupport::TestCase
@@ -38,4 +40,23 @@ class TrackableTest < ActiveSupport::TestCase
     assert_nil user.last_sign_in_at
     assert_equal 0, user.sign_in_count
   end
+
+  test "update_tracked_fields! should not persist invalid records" do
+    user = UserWithValidations.new
+    request = mock
+    request.stubs(:remote_ip).returns("127.0.0.1")
+
+    assert_not user.update_tracked_fields!(request)
+    assert_not user.persisted?
+  end
+
+  test "update_tracked_fields! should not run model validations" do
+    user = User.new
+    request = mock
+    request.stubs(:remote_ip).returns("127.0.0.1")
+
+    user.expects(:after_validation_callback).never
+
+    assert_not user.update_tracked_fields!(request)
+  end
 end

data/test/models/validatable_test.rb

@@ -1,4 +1,6 @@
 # encoding: UTF-8
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class ValidatableTest < ActiveSupport::TestCase
@@ -31,7 +33,7 @@ class ValidatableTest < ActiveSupport::TestCase
 
     %w{invalid_email_format 123 $$$ () ☃}.each do |email|
       user.email = email
-      assert user.invalid?, 'should be invalid with email ' << email
+      assert user.invalid?, "should be invalid with email #{email}"
       assert_equal 'is invalid', user.errors[:email].join
     end
 
@@ -42,7 +44,7 @@ class ValidatableTest < ActiveSupport::TestCase
   test 'should accept valid emails' do
     %w(a.b.c@example.com test_mail@gmail.com any@any.net email@test.br 123@mail.test 1☃3@mail.test).each do |email|
       user = new_user(email: email)
-      assert user.valid?, 'should be valid with email ' << email
+      assert user.valid?, "should be valid with email #{email}"
       assert_blank user.errors[:email]
     end
   end

data/test/models_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'test_models'
 

data/test/omniauth/config_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class OmniAuthConfigTest < ActiveSupport::TestCase

data/test/omniauth/url_helpers_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class OmniAuthRoutesTest < ActionController::TestCase

data/test/orm/active_record.rb

@@ -1,8 +1,15 @@
+# frozen_string_literal: true
+
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Base.logger = Logger.new(nil)
 ActiveRecord::Base.include_root_in_json = true
 
-ActiveRecord::Migrator.migrate(File.expand_path("../../rails_app/db/migrate/", __FILE__))
+migrate_path = File.expand_path("../../rails_app/db/migrate/", __FILE__)
+if Devise::Test.rails52?
+  ActiveRecord::MigrationContext.new(migrate_path).migrate
+else
+  ActiveRecord::Migrator.migrate(migrate_path)
+end
 
 class ActiveSupport::TestCase
   if Devise::Test.rails5?

data/test/orm/mongoid.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mongoid/version'
 
 Mongoid.configure do |config|
@@ -8,6 +10,6 @@ end
 
 class ActiveSupport::TestCase
   setup do
-    Mongoid.purge!
+    Mongoid.default_session.drop
   end
 end

data/test/parameter_sanitizer_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'devise/parameter_sanitizer'
 

data/test/rails_app/app/active_record/admin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'shared_admin'
 
 class Admin < ActiveRecord::Base

data/test/rails_app/app/active_record/shim.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module Shim
 end

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

@@ -1,7 +1,20 @@
+# frozen_string_literal: true
+
 require 'shared_user'
 
 class User < ActiveRecord::Base
   include Shim
   include SharedUser
   include ActiveModel::Serializers::Xml if Devise::Test.rails5?
+
+  validates :sign_in_count, presence: true
+
+  cattr_accessor :validations_performed
+
+  after_validation :after_validation_callback
+
+  def after_validation_callback
+    # used to check in our test if the validations were called
+    @@validations_performed = true
+  end
 end

data/test/rails_app/app/active_record/user_on_engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'shared_user_without_omniauth'
 
 class UserOnEngine < ActiveRecord::Base

data/test/rails_app/app/active_record/user_on_main_app.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'shared_user_without_omniauth'
 
 class UserOnMainApp < ActiveRecord::Base

data/test/rails_app/app/active_record/user_with_validations.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'shared_user'
+
+class UserWithValidations < ActiveRecord::Base
+  self.table_name = 'users'
+  include Shim
+  include SharedUser
+
+  validates :email, presence: true
+end
+

data/test/rails_app/app/active_record/user_without_email.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "shared_user_without_email"
 
 class UserWithoutEmail < ActiveRecord::Base

data/test/rails_app/app/controllers/admins/sessions_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Admins::SessionsController < Devise::SessionsController
   def new
     flash[:special] = "Welcome to #{controller_path.inspect} controller!"

data/test/rails_app/app/controllers/admins_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AdminsController < ApplicationController
   before_action :authenticate_admin!
 

data/test/rails_app/app/controllers/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Filters added to this controller apply to all controllers in the application.
 # Likewise, all the methods added will be available for all controllers.
 

data/test/rails_app/app/controllers/application_with_fake_engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationWithFakeEngine < ApplicationController
   private
 

data/test/rails_app/app/controllers/custom/registrations_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Custom::RegistrationsController < Devise::RegistrationsController
   def new
     super do |resource|

data/test/rails_app/app/controllers/home_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class HomeController < ApplicationController
   def index
   end

data/test/rails_app/app/controllers/publisher/registrations_controller.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class Publisher::RegistrationsController < ApplicationController
 end

data/test/rails_app/app/controllers/publisher/sessions_controller.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class Publisher::SessionsController < ApplicationController
 end

data/test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   def facebook
     data = request.respond_to?(:get_header) ? request.get_header("omniauth.auth") : request.env["omniauth.auth"]

data/test/rails_app/app/controllers/users_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class UsersController < ApplicationController
   prepend_before_action :current_user, only: :exhibit
   before_action :authenticate_user!, except: [:accept, :exhibit]

data/test/rails_app/app/helpers/application_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Methods added to this helper will be available to all templates in the application.
 module ApplicationHelper
 end

data/test/rails_app/app/mailers/users/from_proc_mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Users::FromProcMailer < Devise::Mailer
   default from: proc { 'custom@example.com' }
 end

data/test/rails_app/app/mailers/users/mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Users::Mailer < Devise::Mailer
   default from: 'custom@example.com'
 end

data/test/rails_app/app/mailers/users/reply_to_mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Users::ReplyToMailer < Devise::Mailer
   default from: 'custom@example.com'
   default reply_to: 'custom_reply_to@example.com'

data/test/rails_app/app/mongoid/admin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'shared_admin'
 
 class Admin

data/test/rails_app/app/mongoid/shim.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Shim
   extend ::ActiveSupport::Concern
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'shared_user'
 
 class User
@@ -36,4 +38,13 @@ class User
   field :failed_attempts, type: Integer, default: 0 # Only if lock strategy is :failed_attempts
   field :unlock_token,    type: String # Only if unlock strategy is :email or :both
   field :locked_at,       type: Time
+
+  cattr_accessor :validations_performed
+
+  after_validation :after_validation_callback
+
+  def after_validation_callback
+    # used to check in our test if the validations were called
+    @@validations_performed = true
+  end
 end

data/test/rails_app/app/mongoid/user_on_engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'shared_user_without_omniauth'
 
 class UserOnEngine

data/test/rails_app/app/mongoid/user_on_main_app.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'shared_user_without_omniauth'
 
 class UserOnMainApp

data/test/rails_app/app/mongoid/user_with_validations.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "shared_user"
+
+class UserWithValidations
+  include Mongoid::Document
+  include Shim
+  include SharedUser
+
+  field :username, type: String
+  field :facebook_token, type: String
+
+  ## Database authenticatable
+  field :email, type: String, default: ""
+  field :encrypted_password, type: String, default: ""
+
+  ## Recoverable
+  field :reset_password_token, type: String
+  field :reset_password_sent_at, type: Time
+
+  ## Rememberable
+  field :remember_created_at, type: Time
+
+  ## Trackable
+  field :sign_in_count, type: Integer, default: 0
+  field :current_sign_in_at, type: Time
+  field :last_sign_in_at, type: Time
+  field :current_sign_in_ip, type: String
+  field :last_sign_in_ip, type: String
+
+  ## Lockable
+  field :failed_attempts, type: Integer, default: 0 # Only if lock strategy is :failed_attempts
+  field :unlock_token, type: String # Only if unlock strategy is :email or :both
+  field :locked_at, type: Time
+
+  validates :email, presence: true
+end

data/test/rails_app/app/mongoid/user_without_email.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "shared_user_without_email"
 
 class UserWithoutEmail

data/test/rails_app/config/application.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('../boot', __FILE__)
 
 require "action_controller/railtie"
@@ -31,8 +33,10 @@ module RailsApp
     # config.assets.enabled = false
 
     config.action_mailer.default_url_options = { host: "localhost", port: 3000 }
-
-    if DEVISE_ORM == :active_record && (Rails::VERSION::MAJOR >= 4 && Rails::VERSION::MINOR >= 2)
+    rails_version = Gem::Version.new(Rails.version)
+    if DEVISE_ORM == :active_record &&
+       rails_version >= Gem::Version.new('4.2.0') &&
+       rails_version < Gem::Version.new('5.1.0')
       config.active_record.raise_in_transactional_callbacks = true
     end
 

data/test/rails_app/config/boot.rb

@@ -1,10 +1,17 @@
+# frozen_string_literal: true
+
 unless defined?(DEVISE_ORM)
   DEVISE_ORM = (ENV["DEVISE_ORM"] || :active_record).to_sym
 end
 
 module Devise
   module Test
-    # Detection for minor differences between Rails 4 and 5, and 5.1 in tests.
+    # Detection for minor differences between Rails 4 and 5, 5.1, and 5.2 in tests.
+    
+    def self.rails52?
+      Rails.version.start_with? '5.2'
+    end
+
     def self.rails51?
       Rails.version.start_with? '5.1'
     end

data/test/rails_app/config/environment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Load the rails application.
 require File.expand_path('../application', __FILE__)
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RailsApp::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RailsApp::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RailsApp::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "omniauth-facebook"
 require "omniauth-openid"
 

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

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 ActiveSupport::Inflector.inflections do |inflect|
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 config = Rails.application.config
 
 config.secret_key_base = 'd588e99efff13a86461fd6ab82327823ad2f8feb5dc217ce652cdd9f0dfc5eb4b5a62a92d24d2574d7d51dfb1ea8dd453ea54e00cf672159a13104a135422a10'

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

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 RailsApp::Application.config.session_store :cookie_store, key: '_rails_app_session'

data/test/rails_app/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
   # Resources for testing
   resources :users, only: [:index] do