devise 4.2.0 → 4.4.3

data/test/routes_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 ExpectedRoutingError = MiniTest::Assertion
@@ -203,7 +205,7 @@ class CustomizedRoutingTest < ActionController::TestCase
 
   test 'map with format false for sessions' do
     expected_params = {controller: 'devise/sessions', action: 'new'}
-    expected_params[:format] = false if Devise.rails5?
+    expected_params[:format] = false if Devise::Test.rails5?
 
     assert_recognizes(expected_params, {path: '/htmlonly_admin/sign_in', method: :get})
     assert_raise ExpectedRoutingError do
@@ -213,7 +215,7 @@ class CustomizedRoutingTest < ActionController::TestCase
 
   test 'map with format false for passwords' do
     expected_params = {controller: 'devise/passwords', action: 'create'}
-    expected_params[:format] = false if Devise.rails5?
+    expected_params[:format] = false if Devise::Test.rails5?
 
     assert_recognizes(expected_params, {path: '/htmlonly_admin/password', method: :post})
     assert_raise ExpectedRoutingError do
@@ -223,7 +225,7 @@ class CustomizedRoutingTest < ActionController::TestCase
 
   test 'map with format false for registrations' do
     expected_params = {controller: 'devise/registrations', action: 'new'}
-    expected_params[:format] = false if Devise.rails5?
+    expected_params[:format] = false if Devise::Test.rails5?
 
     assert_recognizes(expected_params, {path: '/htmlonly_admin/sign_up', method: :get})
     assert_raise ExpectedRoutingError do
@@ -233,7 +235,7 @@ class CustomizedRoutingTest < ActionController::TestCase
 
   test 'map with format false for confirmations' do
     expected_params = {controller: 'devise/confirmations', action: 'show'}
-    expected_params[:format] = false if Devise.rails5?
+    expected_params[:format] = false if Devise::Test.rails5?
 
     assert_recognizes(expected_params, {path: '/htmlonly_users/confirmation', method: :get})
     assert_raise ExpectedRoutingError do
@@ -243,7 +245,7 @@ class CustomizedRoutingTest < ActionController::TestCase
 
   test 'map with format false for unlocks' do
     expected_params = {controller: 'devise/unlocks', action: 'show'}
-    expected_params[:format] = false if Devise.rails5?
+    expected_params[:format] = false if Devise::Test.rails5?
 
     assert_recognizes(expected_params, {path: '/htmlonly_users/unlock', method: :get})
     assert_raise ExpectedRoutingError do

data/test/secret_key_finder_test.rb

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class Rails52Credentials
+  def credentials
+    OpenStruct.new(secret_key_base: 'credentials')
+  end
+end
+
+class Rails52Secrets
+  def credentials
+    OpenStruct.new(secret_key_base: nil)
+  end
+
+  def secrets
+    OpenStruct.new(secret_key_base: 'secrets')
+  end
+end
+
+class Rails52Config
+  def credentials
+    OpenStruct.new(secret_key_base: nil)
+  end
+
+  def secrets
+    OpenStruct.new(secret_key_base: nil)
+  end
+
+  def config
+    OpenStruct.new(secret_key_base: 'config')
+  end
+end
+
+class Rails41Secrets
+  def secrets
+    OpenStruct.new(secret_key_base: 'secrets')
+  end
+
+  def config
+    OpenStruct.new(secret_key_base: nil)
+  end
+end
+
+class Rails41Config
+  def secrets
+    OpenStruct.new(secret_key_base: nil)
+  end
+
+  def config
+    OpenStruct.new(secret_key_base: 'config')
+  end
+end
+
+class Rails40Config
+  def config
+    OpenStruct.new(secret_key_base: 'config')
+  end
+end
+
+class SecretKeyFinderTest < ActiveSupport::TestCase
+  test "rails 5.2 uses credentials when they're available" do
+    secret_key_finder = Devise::SecretKeyFinder.new(Rails52Credentials.new)
+
+    assert_equal 'credentials', secret_key_finder.find
+  end
+
+  test "rails 5.2 uses secrets when credentials are empty" do
+    secret_key_finder = Devise::SecretKeyFinder.new(Rails52Secrets.new)
+
+    assert_equal 'secrets', secret_key_finder.find
+  end
+
+  test "rails 5.2 uses config when secrets are empty" do
+    secret_key_finder = Devise::SecretKeyFinder.new(Rails52Config.new)
+
+    assert_equal 'config', secret_key_finder.find
+  end
+
+  test "rails 4.1 uses secrets" do
+    secret_key_finder = Devise::SecretKeyFinder.new(Rails41Secrets.new)
+
+    assert_equal 'secrets', secret_key_finder.find
+  end
+
+  test "rails 4.1 uses config when secrets are empty" do
+    secret_key_finder = Devise::SecretKeyFinder.new(Rails41Config.new)
+
+    assert_equal 'config', secret_key_finder.find
+  end
+
+  test "rails 4.0 uses config" do
+    secret_key_finder = Devise::SecretKeyFinder.new(Rails40Config.new)
+
+    assert_equal 'config', secret_key_finder.find
+  end
+end

data/test/support/action_controller/record_identifier.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Since webrat uses ActionController::RecordIdentifier class that was moved to
 # ActionView namespace in Rails 4.1+
 

data/test/support/assertions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/test_case'
 
 class ActiveSupport::TestCase

data/test/support/helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/test_case'
 
 class ActiveSupport::TestCase
@@ -50,6 +52,10 @@ class ActiveSupport::TestCase
     UserWithoutEmail.create!(valid_attributes(attributes))
   end
 
+  def create_user_with_validations(attributes={})
+    UserWithValidations.create!(valid_attributes(attributes))
+  end
+
   # Execute the block setting the given values and restoring old values after
   # the block is executed.
   def swap(object, new_values)

data/test/support/http_method_compatibility.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Devise
   class IntegrationTest < ActionDispatch::IntegrationTest
     # %w( get post patch put head delete xml_http_request

data/test/support/integration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'action_dispatch/testing/integration'
 
 class ActionDispatch::IntegrationTest
@@ -17,6 +19,7 @@ class ActionDispatch::IntegrationTest
       user.update_attribute(:confirmation_sent_at, options[:confirmation_sent_at]) if options[:confirmation_sent_at]
       user.confirm unless options[:confirm] == false
       user.lock_access! if options[:locked] == true
+      User.validations_performed = false
       user
     end
   end

data/test/support/webrat/integrations/rails.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'webrat/core/elements/form'
 require 'action_dispatch/testing/integration'
 

data/test/test/controller_helpers_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class TestControllerHelpersTest < Devise::ControllerTestCase
@@ -98,6 +100,11 @@ class TestControllerHelpersTest < Devise::ControllerTestCase
     assert_equal response.body, "<html><body>You are being <a href=\"http://test.host/users/sign_in\">redirected</a>.</body></html>"
   end
 
+  test "returns the content type of a failure app" do
+    get :index, params: { format: :xml }
+    assert response.content_type.include?('application/xml')
+  end
+
   test "defined Warden after_authentication callback should not be called when sign_in is called" do
     begin
       Warden::Manager.after_authentication do |user, auth, opts|
@@ -163,7 +170,15 @@ class TestControllerHelpersTest < Devise::ControllerTestCase
 
   test "creates a new warden proxy if the request object has changed" do
     old_warden_proxy = warden
-    @request = Devise.rails5? ? ActionController::TestRequest.create : ActionController::TestRequest.new
+
+    @request = if Devise::Test.rails51? || Devise::Test.rails52?
+      ActionController::TestRequest.create(Class.new) # needs a "controller class"
+    elsif Devise::Test.rails5?
+      ActionController::TestRequest.create
+    else
+      ActionController::TestRequest.new
+    end
+
     new_warden_proxy = warden
 
     assert_not_equal old_warden_proxy, new_warden_proxy

data/test/test/integration_helpers_test.rb

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

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ENV["RAILS_ENV"] = "test"
 DEVISE_ORM = (ENV["DEVISE_ORM"] || :active_record).to_sym
 

data/test/test_models.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Configurable < User
   devise :database_authenticatable, :confirmable, :rememberable, :timeoutable, :lockable,
          stretches: 15, pepper: 'abcdef', allow_unconfirmed_access_for: 5.days,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.4.3
 platform: ruby
 authors:
 - José Valim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2018-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: warden
@@ -62,7 +62,7 @@ dependencies:
         version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,7 +72,7 @@ dependencies:
         version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: responders
   requirement: !ruby/object:Gem::Requirement
@@ -101,6 +101,7 @@ files:
 - CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
+- ISSUE_TEMPLATE.md
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -115,6 +116,7 @@ files:
 - app/mailers/devise/mailer.rb
 - app/views/devise/confirmations/new.html.erb
 - app/views/devise/mailer/confirmation_instructions.html.erb
+- app/views/devise/mailer/email_changed.html.erb
 - app/views/devise/mailer/password_change.html.erb
 - app/views/devise/mailer/reset_password_instructions.html.erb
 - app/views/devise/mailer/unlock_instructions.html.erb
@@ -133,6 +135,10 @@ files:
 - gemfiles/Gemfile.rails-4.1-stable.lock
 - gemfiles/Gemfile.rails-4.2-stable
 - gemfiles/Gemfile.rails-4.2-stable.lock
+- gemfiles/Gemfile.rails-5.0-stable
+- gemfiles/Gemfile.rails-5.0-stable.lock
+- gemfiles/Gemfile.rails-5.2-rc1
+- gemfiles/Gemfile.rails-5.2-rc1.lock
 - guides/bug_report_templates/integration_test.rb
 - lib/devise.rb
 - lib/devise/controllers/helpers.rb
@@ -177,6 +183,7 @@ files:
 - lib/devise/rails.rb
 - lib/devise/rails/routes.rb
 - lib/devise/rails/warden_compat.rb
+- lib/devise/secret_key_finder.rb
 - lib/devise/strategies/authenticatable.rb
 - lib/devise/strategies/base.rb
 - lib/devise/strategies/database_authenticatable.rb
@@ -206,6 +213,7 @@ files:
 - lib/generators/templates/controllers/unlocks_controller.rb
 - lib/generators/templates/devise.rb
 - lib/generators/templates/markerb/confirmation_instructions.markerb
+- lib/generators/templates/markerb/email_changed.markerb
 - lib/generators/templates/markerb/password_change.markerb
 - lib/generators/templates/markerb/reset_password_instructions.markerb
 - lib/generators/templates/markerb/unlock_instructions.markerb
@@ -249,6 +257,8 @@ files:
 - test/integration/timeoutable_test.rb
 - test/integration/trackable_test.rb
 - test/mailers/confirmation_instructions_test.rb
+- test/mailers/email_changed_test.rb
+- test/mailers/mailer_test.rb
 - test/mailers/reset_password_instructions_test.rb
 - test/mailers/unlock_instructions_test.rb
 - test/mapping_test.rb
@@ -276,6 +286,7 @@ files:
 - test/rails_app/app/active_record/user.rb
 - test/rails_app/app/active_record/user_on_engine.rb
 - test/rails_app/app/active_record/user_on_main_app.rb
+- test/rails_app/app/active_record/user_with_validations.rb
 - test/rails_app/app/active_record/user_without_email.rb
 - test/rails_app/app/controllers/admins/sessions_controller.rb
 - test/rails_app/app/controllers/admins_controller.rb
@@ -296,6 +307,7 @@ files:
 - test/rails_app/app/mongoid/user.rb
 - test/rails_app/app/mongoid/user_on_engine.rb
 - test/rails_app/app/mongoid/user_on_main_app.rb
+- test/rails_app/app/mongoid/user_with_validations.rb
 - test/rails_app/app/mongoid/user_without_email.rb
 - test/rails_app/app/views/admins/index.html.erb
 - test/rails_app/app/views/admins/sessions/new.html.erb
@@ -338,6 +350,7 @@ files:
 - test/rails_app/public/favicon.ico
 - test/rails_test.rb
 - test/routes_test.rb
+- test/secret_key_finder_test.rb
 - test/support/action_controller/record_identifier.rb
 - test/support/assertions.rb
 - test/support/helpers.rb
@@ -370,7 +383,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Flexible authentication solution for Rails with Warden
@@ -408,6 +421,8 @@ test_files:
 - test/integration/timeoutable_test.rb
 - test/integration/trackable_test.rb
 - test/mailers/confirmation_instructions_test.rb
+- test/mailers/email_changed_test.rb
+- test/mailers/mailer_test.rb
 - test/mailers/reset_password_instructions_test.rb
 - test/mailers/unlock_instructions_test.rb
 - test/mapping_test.rb
@@ -435,6 +450,7 @@ test_files:
 - test/rails_app/app/active_record/user.rb
 - test/rails_app/app/active_record/user_on_engine.rb
 - test/rails_app/app/active_record/user_on_main_app.rb
+- test/rails_app/app/active_record/user_with_validations.rb
 - test/rails_app/app/active_record/user_without_email.rb
 - test/rails_app/app/controllers/admins/sessions_controller.rb
 - test/rails_app/app/controllers/admins_controller.rb
@@ -455,6 +471,7 @@ test_files:
 - test/rails_app/app/mongoid/user.rb
 - test/rails_app/app/mongoid/user_on_engine.rb
 - test/rails_app/app/mongoid/user_on_main_app.rb
+- test/rails_app/app/mongoid/user_with_validations.rb
 - test/rails_app/app/mongoid/user_without_email.rb
 - test/rails_app/app/views/admins/index.html.erb
 - test/rails_app/app/views/admins/sessions/new.html.erb
@@ -497,6 +514,7 @@ test_files:
 - test/rails_app/public/favicon.ico
 - test/rails_test.rb
 - test/routes_test.rb
+- test/secret_key_finder_test.rb
 - test/support/action_controller/record_identifier.rb
 - test/support/assertions.rb
 - test/support/helpers.rb