jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rails: update settings to 6.1 defaults.

Browse Source 
Most of the new settings aren't relevant to us. We do have to fix some
tests to work around a Rails bug. `assert_enqueued_email_with` uses the
wrong queue, so we have to specify it explicitly. This is fixed in Rails
HEAD but not yet released.
This commit is contained in:
evazion
2020-12-21 20:32:27 -06:00
parent 906430b983
commit f3880569e1
5 changed files with 5 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/functional/emails_controller_test.rb
View File

@@ -88,7 +88,7 @@ class EmailsControllerTest < ActionDispatch::IntegrationTest
assert_redirected_to(settings_path)
assert_equal("abc@ogres.net", @user.reload.email_address.address)
assert_equal(false, @user.email_address.is_verified)
assert_enqueued_email_with UserMailer, :email_change_confirmation, args: [@user]
assert_enqueued_email_with UserMailer, :email_change_confirmation, args: [@user], queue: "default"
end
should "create a new address" do
@@ -101,7 +101,7 @@ class EmailsControllerTest < ActionDispatch::IntegrationTest
assert_redirected_to(settings_path)
assert_equal("abc@ogres.net", @user.reload.email_address.address)
assert_equal(false, @user.reload.email_address.is_verified)
assert_enqueued_email_with UserMailer, :email_change_confirmation, args: [@user]
assert_enqueued_email_with UserMailer, :email_change_confirmation, args: [@user], queue: "default"
end
end

2
test/functional/password_resets_controller_test.rb
View File

@@ -15,7 +15,7 @@ class PasswordResetsControllerTest < ActionDispatch::IntegrationTest
post password_reset_path, params: { user: { name: @user.name } }
assert_redirected_to new_session_path
assert_enqueued_email_with UserMailer, :password_reset, args: [@user]
assert_enqueued_email_with UserMailer, :password_reset, args: [@user], queue: "default"
end
should "should fail if the user doesn't have a verified email address" do

2
test/functional/users_controller_test.rb
View File

@@ -268,7 +268,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
assert_equal("xxx", User.last.name)
assert_equal(User.last, User.last.authenticate_password("xxxxx1"))
assert_equal("webmaster@danbooru.donmai.us", User.last.email_address.address)
assert_enqueued_email_with UserMailer, :welcome_user, args: [User.last]
assert_enqueued_email_with UserMailer, :welcome_user, args: [User.last], queue: "default"
end
should "not create a user with an invalid email" do