erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity

Merge 7db9e9fa83 into a50c8e951f

Browse source
This commit is contained in:
Matt Jankowski 2024-07-31 14:07:10 +00:00 committed by GitHub
commit eabfb31c75
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 45 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
spec/models/notification_spec.rb
View file

@ -151,62 +151,61 @@ RSpec.describe Notification do
end end
end end
describe '.paginate_groups_by_max_id' do context 'with grouped notifications' do
let(:account) { Fabricate(:account) } let(:account) { Fabricate(:account) }
let!(:notifications) do let!(:group_one_oldest) { Fabricate(:notification, account: account, group_key: 'group-1') }
['group-1', 'group-1', nil, 'group-2', nil, 'group-1', 'group-2', 'group-1'] let!(:group_one_old) { Fabricate(:notification, account: account, group_key: 'group-1') }
.map { |group_key| Fabricate(:notification, account: account, group_key: group_key) } let!(:group_nil_old) { Fabricate(:notification, account: account, group_key: nil) }
end let!(:group_two_old) { Fabricate(:notification, account: account, group_key: 'group-2') }
let!(:group_nil_new) { Fabricate(:notification, account: account, group_key: nil) }
let!(:group_one_new) { Fabricate(:notification, account: account, group_key: 'group-1') }
let!(:group_two_new) { Fabricate(:notification, account: account, group_key: 'group-2') }
let!(:group_one_newest) { Fabricate(:notification, account: account, group_key: 'group-1') }
describe '.paginate_groups_by_max_id' do
context 'without since_id or max_id' do context 'without since_id or max_id' do
it 'returns the most recent notifications, only keeping one notification per group' do it 'returns the most recent notifications, only keeping one notification per group' do
expect(described_class.without_suspended.paginate_groups_by_max_id(4).pluck(:id)) expect(described_class.without_suspended.paginate_groups_by_max_id(4))
.to eq [notifications[7], notifications[6], notifications[4], notifications[2]].pluck(:id) .to eq [group_one_newest, group_two_new, group_nil_new, group_nil_old]
end end
end end
context 'with since_id' do context 'with since_id' do
it 'returns the most recent notifications, only keeping one notification per group' do it 'returns the most recent notifications, only keeping one notification per group' do
expect(described_class.without_suspended.paginate_groups_by_max_id(4, since_id: notifications[4].id).pluck(:id)) expect(described_class.without_suspended.paginate_groups_by_max_id(4, since_id: group_nil_new.id))
.to eq [notifications[7], notifications[6]].pluck(:id) .to eq [group_one_newest, group_two_new]
end end
end end
context 'with max_id' do context 'with max_id' do
it 'returns the most recent notifications after max_id, only keeping one notification per group' do it 'returns the most recent notifications after max_id, only keeping one notification per group' do
expect(described_class.without_suspended.paginate_groups_by_max_id(4, max_id: notifications[7].id).pluck(:id)) expect(described_class.without_suspended.paginate_groups_by_max_id(4, max_id: group_one_newest.id))
.to eq [notifications[6], notifications[5], notifications[4], notifications[2]].pluck(:id) .to eq [group_two_new, group_one_new, group_nil_new, group_nil_old]
end end
end end
end end
describe '.paginate_groups_by_min_id' do describe '.paginate_groups_by_min_id' do
let(:account) { Fabricate(:account) }
let!(:notifications) do
['group-1', 'group-1', nil, 'group-2', nil, 'group-1', 'group-2', 'group-1']
.map { |group_key| Fabricate(:notification, account: account, group_key: group_key) }
end
context 'without min_id or max_id' do context 'without min_id or max_id' do
it 'returns the oldest notifications, only keeping one notification per group' do it 'returns the oldest notifications, only keeping one notification per group' do
expect(described_class.without_suspended.paginate_groups_by_min_id(4).pluck(:id)) expect(described_class.without_suspended.paginate_groups_by_min_id(4))
.to eq [notifications[0], notifications[2], notifications[3], notifications[4]].pluck(:id) .to eq [group_one_oldest, group_nil_old, group_two_old, group_nil_new]
end end
end end
context 'with max_id' do context 'with max_id' do
it 'returns the oldest notifications, stopping at max_id, only keeping one notification per group' do it 'returns the oldest notifications, stopping at max_id, only keeping one notification per group' do
expect(described_class.without_suspended.paginate_groups_by_min_id(4, max_id: notifications[4].id).pluck(:id)) expect(described_class.without_suspended.paginate_groups_by_min_id(4, max_id: group_nil_new.id))
.to eq [notifications[0], notifications[2], notifications[3]].pluck(:id) .to eq [group_one_oldest, group_nil_old, group_two_old]
end end
end end
context 'with min_id' do context 'with min_id' do
it 'returns the most oldest notifications after min_id, only keeping one notification per group' do it 'returns the most oldest notifications after min_id, only keeping one notification per group' do
expect(described_class.without_suspended.paginate_groups_by_min_id(4, min_id: notifications[0].id).pluck(:id)) expect(described_class.without_suspended.paginate_groups_by_min_id(4, min_id: group_one_oldest.id))
.to eq [notifications[1], notifications[2], notifications[3], notifications[4]].pluck(:id) .to eq [group_one_old, group_nil_old, group_two_old, group_nil_new]
end
end end
end end
end end