gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-26 07:21:51 +00:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

Merge b88f0f152c into 6d62581da1

Browse Source
This commit is contained in:
Claire 2024-11-25 17:05:04 +00:00 committed by GitHub
commit 2b72473408
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/notification.rb
View File

@ -44,7 +44,7 @@ class Notification < ApplicationRecord
filterable: true,
}.freeze,
follow: {
filterable: true,
filterable: false,
}.freeze,
follow_request: {
filterable: true,

8
spec/services/notify_service_spec.rb
View File

@ -8,8 +8,8 @@ RSpec.describe NotifyService do
let(:user) { Fabricate(:user) }
let(:recipient) { user.account }
let(:sender) { Fabricate(:account, domain: 'example.com') }
let(:activity) { Fabricate(:follow, account: sender, target_account: recipient) }
let(:type) { :follow }
let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender)) }
let(:type) { :mention }
it { expect { subject }.to change(Notification, :count).by(1) }
@ -98,7 +98,7 @@ RSpec.describe NotifyService do
describe 'email' do
before do
user.settings.update('notification_emails.follow': enabled)
user.settings.update('notification_emails.mention': enabled)
user.save
end
@ -113,7 +113,7 @@ RSpec.describe NotifyService do
expect(emails.first)
.to have_attributes(
to: contain_exactly(user.email),
subject: eq(I18n.t('notification_mailer.follow.subject', name: sender.acct))
subject: eq(I18n.t('notification_mailer.mention.subject', name: sender.acct))
)
end
end