mirror of
https://github.com/heartcombo/devise.git
synced 2026-01-08 22:37:57 -05:00
Merge pull request #5599 from etiennebarrie/rails-edge-deprecations
Fix Rails main deprecations
This commit is contained in:
@@ -5,7 +5,9 @@ ActiveRecord::Base.logger = Logger.new(nil)
|
||||
ActiveRecord::Base.include_root_in_json = true
|
||||
|
||||
migrate_path = File.expand_path("../../rails_app/db/migrate/", __FILE__)
|
||||
if Devise::Test.rails6_and_up?
|
||||
if Devise::Test.rails71_and_up?
|
||||
ActiveRecord::MigrationContext.new(migrate_path).migrate
|
||||
elsif Devise::Test.rails6_and_up?
|
||||
ActiveRecord::MigrationContext.new(migrate_path, ActiveRecord::SchemaMigration).migrate
|
||||
elsif Devise::Test.rails52_and_up?
|
||||
ActiveRecord::MigrationContext.new(migrate_path).migrate
|
||||
|
||||
@@ -32,7 +32,11 @@ RailsApp::Application.configure do
|
||||
config.action_controller.perform_caching = false
|
||||
|
||||
# Raise exceptions instead of rendering exception templates.
|
||||
config.action_dispatch.show_exceptions = false
|
||||
if Devise::Test.rails71_and_up?
|
||||
config.action_dispatch.show_exceptions = :none
|
||||
else
|
||||
config.action_dispatch.show_exceptions = false
|
||||
end
|
||||
|
||||
# Disable request forgery protection in test environment.
|
||||
config.action_controller.allow_forgery_protection = false
|
||||
|
||||
Reference in New Issue
Block a user