From 8908b47113485bf32c9c9851139c9b6e902f448e Mon Sep 17 00:00:00 2001 From: amoose Date: Tue, 30 Aug 2016 08:41:45 -0700 Subject: [PATCH] Updates deprecated Devise methods --- app/controllers/devise/two_factor_authentication_controller.rb | 2 +- spec/support/controller_helper.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/devise/two_factor_authentication_controller.rb b/app/controllers/devise/two_factor_authentication_controller.rb index f598d99..3904b53 100644 --- a/app/controllers/devise/two_factor_authentication_controller.rb +++ b/app/controllers/devise/two_factor_authentication_controller.rb @@ -33,7 +33,7 @@ class Devise::TwoFactorAuthenticationController < DeviseController end warden.session(resource_name)[TwoFactorAuthentication::NEED_AUTHENTICATION] = false - sign_in resource_name, resource, :bypass => true + bypass_sign_in(resource, scope: resource_name) set_flash_message :notice, :success resource.update_attribute(:second_factor_attempts_count, 0) diff --git a/spec/support/controller_helper.rb b/spec/support/controller_helper.rb index ea20b83..2ca3a31 100644 --- a/spec/support/controller_helper.rb +++ b/spec/support/controller_helper.rb @@ -7,7 +7,7 @@ module ControllerHelper end RSpec.configure do |config| - config.include Devise::TestHelpers, type: :controller + config.include Devise::Test::ControllerHelpers, type: :controller config.include ControllerHelper, type: :controller config.before(:example, type: :controller) do