Merge remote-tracking branch 'parent/main' into upstream-20240524

This commit is contained in:
KMY 2024-05-24 08:33:49 +09:00
commit c546939a40
213 changed files with 2260 additions and 986 deletions

View file

@ -145,4 +145,22 @@ RSpec.describe AdminMailer do
.and(have_header('X-Priority', '1'))
end
end
describe '.auto_close_registrations' do
let(:recipient) { Fabricate(:account, username: 'Bob') }
let(:mail) { described_class.with(recipient: recipient).auto_close_registrations }
before do
recipient.user.update(locale: :en)
end
it 'renders the email' do
expect(mail)
.to be_present
.and(deliver_to(recipient.user_email))
.and(deliver_from('notifications@localhost'))
.and(have_subject('Registrations for cb6e6126.ngrok.io have been automatically switched to requiring approval'))
.and(have_body_text('have been automatically switched'))
end
end
end

View file

@ -37,4 +37,9 @@ class AdminMailerPreview < ActionMailer::Preview
def new_critical_software_updates
AdminMailer.with(recipient: Account.first).new_critical_software_updates
end
# Preview this email at http://localhost:3000/rails/mailers/admin_mailer/auto_close_registrations
def auto_close_registrations
AdminMailer.with(recipient: Account.first).auto_close_registrations
end
end