Skip to content

Commit 9d28d4d

Browse files
committed
sessions controller test should set user mapping before each test (DRY)
1 parent acb9c1c commit 9d28d4d

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

test/controllers/users/sessions_controller_test.rb

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ class Users::SessionsControllerTest < ActionController::TestCase
44
include Devise::Test::ControllerHelpers
55
include ApplicationHelper
66

7+
setup :set_mapping
8+
79
test 'should sign in with 2fa backup code' do
8-
@request.env['devise.mapping'] = Devise.mappings[:user]
910
Users::SessionsController.first_factor << users(:enabled_2fa).id
1011

1112
try_verify_2fa_code(users(:enabled_2fa))
@@ -18,7 +19,6 @@ class Users::SessionsControllerTest < ActionController::TestCase
1819
end
1920

2021
test 'should remember users with 2FA if requested' do
21-
@request.env['devise.mapping'] = Devise.mappings[:user]
2222
Users::SessionsController.first_factor << users(:enabled_2fa).id
2323

2424
try_verify_2fa_code(users(:enabled_2fa), remember_me: true)
@@ -30,6 +30,10 @@ class Users::SessionsControllerTest < ActionController::TestCase
3030

3131
private
3232

33+
def set_mapping
34+
@request.env['devise.mapping'] = Devise.mappings[:user]
35+
end
36+
3337
# @param user [User] user to verify code for
3438
# @param opts [Hash] options hash - any additional optional params to merge in
3539
def try_verify_2fa_code(user, **opts)

0 commit comments

Comments
 (0)