Compare commits

..

5 Commits

2 changed files with 50 additions and 22 deletions

View File

@ -84,7 +84,7 @@ RSpec.describe ActivityPub::Activity::Accept do
expect(DistributionWorker)
.to have_enqueued_sidekiq_job(status.id, { 'update' => true })
expect(ActivityPub::StatusUpdateDistributionWorker)
.to have_enqueued_sidekiq_job(status.id, { 'update_id' => be_a(String) })
.to have_enqueued_sidekiq_job(status.id, { 'updated_at' => be_a(String) })
end
context 'when the quoted status is not from the sender of the Accept' do
@ -153,7 +153,7 @@ RSpec.describe ActivityPub::Activity::Accept do
expect(DistributionWorker)
.to have_enqueued_sidekiq_job(status.id, { 'update' => true })
expect(ActivityPub::StatusUpdateDistributionWorker)
.to have_enqueued_sidekiq_job(status.id, { 'update_id' => be_a(String) })
.to have_enqueued_sidekiq_job(status.id, { 'updated_at' => be_a(String) })
end
context 'when approval_uri is missing' do

View File

@ -9,36 +9,64 @@ RSpec.describe ActivityPub::StatusUpdateDistributionWorker do
let(:follower) { Fabricate(:account, protocol: :activitypub, inbox_url: 'http://example.com', domain: 'example.com') }
describe '#perform' do
before do
follower.follow!(status.account)
status.snapshot!
status.text = 'bar'
status.edited_at = Time.now.utc
status.snapshot!
status.save!
end
context 'with public status' do
context 'with an explicitly edited status' do
before do
status.update(visibility: :public)
follower.follow!(status.account)
status.snapshot!
status.text = 'bar'
status.edited_at = Time.now.utc
status.snapshot!
status.save!
end
it 'delivers to followers' do
expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[match_json_values(type: 'Update'), status.account.id, 'http://example.com', anything]]) do
subject.perform(status.id)
context 'with public status' do
before do
status.update(visibility: :public)
end
it 'delivers to followers' do
expect { subject.perform(status.id) }
.to enqueue_sidekiq_job(ActivityPub::DeliveryWorker).with(match_json_values(type: 'Update'), status.account_id, 'http://example.com', anything)
end
end
context 'with private status' do
before do
status.update(visibility: :private)
end
it 'delivers to followers' do
expect { subject.perform(status.id) }
.to enqueue_sidekiq_job(ActivityPub::DeliveryWorker).with(match_json_values(type: 'Update'), status.account_id, 'http://example.com', anything)
end
end
end
context 'with private status' do
context 'with an implicitly edited status' do
before do
status.update(visibility: :private)
follower.follow!(status.account)
end
it 'delivers to followers' do
expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[match_json_values(type: 'Update'), status.account.id, 'http://example.com', anything]]) do
subject.perform(status.id)
context 'with public status' do
before do
status.update(visibility: :public)
end
it 'delivers to followers' do
expect { subject.perform(status.id, { 'updated_at' => Time.now.utc.iso8601 }) }
.to enqueue_sidekiq_job(ActivityPub::DeliveryWorker).with(match_json_values(type: 'Update'), status.account_id, 'http://example.com', anything)
end
end
context 'with private status' do
before do
status.update(visibility: :private)
end
it 'delivers to followers' do
expect { subject.perform(status.id, { 'updated_at' => Time.now.utc.iso8601 }) }
.to enqueue_sidekiq_job(ActivityPub::DeliveryWorker).with(match_json_values(type: 'Update'), status.account_id, 'http://example.com', anything)
end
end
end