devise 4.3.0 → 4.4.0

data/test/generators/controllers_generator_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class ControllersGeneratorTest < Rails::Generators::TestCase

data/test/generators/devise_generator_test.rb

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

data/test/generators/install_generator_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class InstallGeneratorTest < Rails::Generators::TestCase

data/test/generators/mongoid_generator_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 if DEVISE_ORM == :mongoid

data/test/generators/views_generator_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class ViewsGeneratorTest < Rails::Generators::TestCase

data/test/helpers/devise_helper_test.rb

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

data/test/integration/authenticatable_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class AuthenticationSanityTest < Devise::IntegrationTest
@@ -369,7 +371,7 @@ class AuthenticationWithScopedViewsTest < Devise::IntegrationTest
     end
   end
 
-  test 'renders the scoped view if turned on in an specific controller' do
+  test 'renders the scoped view if turned on in a specific controller' do
     begin
       Devise::SessionsController.scoped_views = true
       assert_raise Webrat::NotFoundError do
@@ -543,6 +545,18 @@ class AuthenticationOthersTest < Devise::IntegrationTest
       refute warden.authenticated?(:user)
     end
   end
+
+  test 'not signed in should return notification payload with 401 status' do
+    begin
+      subscriber = ActiveSupport::Notifications.subscribe /process_action.action_controller/ do |_name, _start, _finish, _id, payload|
+        assert_equal 401, payload[:status]
+      end
+
+      get admins_path
+    ensure
+      ActiveSupport::Notifications.unsubscribe(subscriber)
+    end
+  end
 end
 
 class AuthenticationKeysTest < Devise::IntegrationTest

data/test/integration/confirmable_test.rb

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

data/test/integration/database_authenticatable_test.rb

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

data/test/integration/http_authenticatable_test.rb

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

data/test/integration/lockable_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class LockTest < Devise::IntegrationTest
@@ -172,7 +174,7 @@ class LockTest < Devise::IntegrationTest
     assert_equal response.body, {}.to_json
   end
 
-  test "in paranoid mode, when trying to unlock an user that exists it should not say that it exists if it is locked" do
+  test "in paranoid mode, when trying to unlock a user that exists it should not say that it exists if it is locked" do
     swap Devise, paranoid: true do
       user = create_user(locked: true)
 
@@ -187,7 +189,7 @@ class LockTest < Devise::IntegrationTest
     end
   end
 
-  test "in paranoid mode, when trying to unlock an user that exists it should not say that it exists if it is not locked" do
+  test "in paranoid mode, when trying to unlock a user that exists it should not say that it exists if it is not locked" do
     swap Devise, paranoid: true do
       user = create_user(locked: false)
 
@@ -202,7 +204,7 @@ class LockTest < Devise::IntegrationTest
     end
   end
 
-  test "in paranoid mode, when trying to unlock an user that does not exists it should not say that it does not exists" do
+  test "in paranoid mode, when trying to unlock a user that does not exists it should not say that it does not exists" do
     swap Devise, paranoid: true do
       visit new_user_session_path
       click_link "Didn't receive unlock instructions?"

data/test/integration/mounted_engine_test.rb

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

data/test/integration/omniauthable_test.rb

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

data/test/integration/recoverable_test.rb

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

data/test/integration/registerable_test.rb

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

data/test/integration/rememberable_test.rb

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

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,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class TrackableHooksTest < Devise::IntegrationTest

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

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,13 @@ class TrackableTest < ActiveSupport::TestCase
     assert_nil user.last_sign_in_at
     assert_equal 0, user.sign_in_count
   end
+
+  test 'update_tracked_fields should run model validations' 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
 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,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Base.logger = Logger.new(nil)
 ActiveRecord::Base.include_root_in_json = true

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,11 @@
+# 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
 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
+