Skip to content

Commit 1788af1

Browse files
committed
fixed TwoFactorMailer tests not respecting default url options
1 parent 2bbe33c commit 1788af1

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

test/mailers/two_factor_mailer_test.rb

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
require 'test_helper'
22

33
class TwoFactorMailerTest < ActionMailer::TestCase
4+
include Rails.application.routes.url_helpers
5+
46
test 'disable_email should correctly send emails' do
57
com_usr = communities(:sample)
68
std_usr = users(:standard_user)
@@ -12,10 +14,7 @@ class TwoFactorMailerTest < ActionMailer::TestCase
1214
email.deliver_later
1315
end
1416

15-
token_uri = Rails.application
16-
.routes
17-
.url_helpers
18-
.two_factor_disable_link_url(token: '', host: com_usr.host)
17+
token_uri = two_factor_disable_link_url(token: '', host: com_usr.host)
1918

2019
assert email.subject.include?(SiteSetting['NetworkName'])
2120
assert_select_email do
@@ -34,10 +33,7 @@ class TwoFactorMailerTest < ActionMailer::TestCase
3433
email.deliver_later
3534
end
3635

37-
qr_uri = Rails.application
38-
.routes
39-
.url_helpers
40-
.qr_login_url(token: '', host: com_usr.host)
36+
qr_uri = qr_login_url(token: '', host: com_usr.host)
4137

4238
assert email.subject.include?(SiteSetting['NetworkName'])
4339
assert_select_email do
@@ -56,10 +52,7 @@ class TwoFactorMailerTest < ActionMailer::TestCase
5652
email.deliver_later
5753
end
5854

59-
backup_uri = Rails.application
60-
.routes
61-
.url_helpers
62-
.two_factor_status_url(host: com_usr.host)
55+
backup_uri = two_factor_status_url(host: com_usr.host)
6356

6457
assert email.subject.include?(SiteSetting['NetworkName'])
6558
assert_select_email do

test/test_helper.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,4 +251,8 @@ def load_host
251251

252252
class ActionMailer::TestCase
253253
include WebMockStubs
254+
255+
def default_url_options
256+
Rails.application.config.action_mailer.default_url_options
257+
end
254258
end

0 commit comments

Comments
 (0)