Merge commit 'e1dbbf6c9db6dbf3f356dae4c59fa05299372370' into glitch-soc/merge-upstream

This commit is contained in:
Claire
2025-03-25 19:59:59 +01:00
32 changed files with 329 additions and 155 deletions

View File

@@ -158,14 +158,13 @@ RSpec.describe 'Notifications' do
expect(response).to have_http_status(200)
expect(response.content_type)
.to start_with('application/json')
expect(response.parsed_body[:notification_groups]).to contain_exactly(
a_hash_including(
type: 'favourite',
sample_account_ids: have_attributes(size: 5),
page_min_id: notification_ids.first.to_s,
page_max_id: notification_ids.last.to_s
)
)
expect(response.parsed_body[:notification_groups].size)
.to eq(1)
expect(response.parsed_body.dig(:notification_groups, 0))
.to include(type: 'favourite')
.and(include(sample_account_ids: have_attributes(size: 5)))
.and(include(page_max_id: notification_ids.last.to_s))
.and(include(page_min_id: notification_ids.first.to_s))
end
end
@@ -180,14 +179,13 @@ RSpec.describe 'Notifications' do
expect(response).to have_http_status(200)
expect(response.content_type)
.to start_with('application/json')
expect(response.parsed_body[:notification_groups]).to contain_exactly(
a_hash_including(
type: 'favourite',
sample_account_ids: have_attributes(size: 5),
page_min_id: notification_ids.first.to_s,
page_max_id: notification_ids.last.to_s
)
)
expect(response.parsed_body[:notification_groups].size)
.to eq(1)
expect(response.parsed_body.dig(:notification_groups, 0))
.to include(type: 'favourite')
.and(include(sample_account_ids: have_attributes(size: 5)))
.and(include(page_max_id: notification_ids.last.to_s))
.and(include(page_min_id: notification_ids.first.to_s))
end
end
end