Revert "Upstream 20240517"

This commit is contained in:
KMY(雪あすか) 2024-05-24 08:15:12 +09:00 committed by GitHub
parent 9c006fd893
commit f6dec44e95
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2347 changed files with 26470 additions and 87494 deletions

View file

@ -61,26 +61,6 @@ RSpec.describe AdminMailer do
end
end
describe '.new_pending_friend_server' do
let(:recipient) { Fabricate(:account, username: 'Barklums') }
let(:friend) { Fabricate(:friend_domain, passive_state: :pending, domain: 'abc.com') }
let(:mail) { described_class.with(recipient: recipient).new_pending_friend_server(friend) }
before do
recipient.user.update(locale: :en)
end
it 'renders the headers' do
expect(mail.subject).to eq('New friend server up for review on cb6e6126.ngrok.io (abc.com)')
expect(mail.to).to eq [recipient.user_email]
expect(mail.from).to eq ['notifications@localhost']
end
it 'renders the body' do
expect(mail.body.encoded).to match 'The new friend server abc.com is waiting for your review. You can approve or reject this application.'
end
end
describe '.new_trends' do
let(:recipient) { Fabricate(:account, username: 'Snurf') }
let(:link) { Fabricate(:preview_card, trendable: true, language: 'en') }