rails: update settings to 6.1 defaults.
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:
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user