Merge remote-tracking branch 'parent/main' into upstream-20240112
This commit is contained in:
commit
e65fb9fb51
333 changed files with 2661 additions and 1461 deletions
|
@ -34,7 +34,7 @@ RSpec.describe ActivityPub::Activity::Create do
|
|||
stub_request(:get, 'http://example.com/invalid-conversation').to_return(status: 404)
|
||||
end
|
||||
|
||||
describe 'processing posts received out of order', :sidekiq_fake do
|
||||
describe 'processing posts received out of order' do
|
||||
let(:follower) { Fabricate(:account, username: 'bob') }
|
||||
|
||||
let(:object_json) do
|
||||
|
@ -1076,7 +1076,7 @@ RSpec.describe ActivityPub::Activity::Create do
|
|||
expect(status.mentions.map(&:account_id)).to contain_exactly(recipient.id, ancestor_account.id, mentioned_account.id, local_mentioned_account.id)
|
||||
end
|
||||
|
||||
it 'forwards to observers' do
|
||||
it 'forwards to observers', :sidekiq_inline do
|
||||
expect(a_request(:post, 'http://or.example.com/actor/inbox')).to have_been_made.once
|
||||
expect(a_request(:post, 'http://example.com/bob/inbox')).to have_been_made.once
|
||||
end
|
||||
|
@ -1119,7 +1119,7 @@ RSpec.describe ActivityPub::Activity::Create do
|
|||
expect(status.mentions.map(&:account_id)).to contain_exactly(recipient.id, ancestor_account.id, mentioned_account.id, local_mentioned_account.id, new_mentioned_account.id, new_local_mentioned_account.id)
|
||||
end
|
||||
|
||||
it 'forwards to observers' do
|
||||
it 'forwards to observers', :sidekiq_inline do
|
||||
expect(a_request(:post, 'http://or.example.com/actor/inbox')).to have_been_made.once
|
||||
expect(a_request(:post, 'http://example.com/bob/inbox')).to have_been_made.once
|
||||
expect(a_request(:post, 'http://example.com/alice/inbox')).to have_been_made.once
|
||||
|
@ -1172,7 +1172,7 @@ RSpec.describe ActivityPub::Activity::Create do
|
|||
expect(status.mentioned_accounts.map(&:uri)).to include 'https://foo.test'
|
||||
end
|
||||
|
||||
it 'forwards to observers' do
|
||||
it 'forwards to observers', :sidekiq_inline do
|
||||
expect(a_request(:post, 'https://foo.test/inbox')).to have_been_made.once
|
||||
end
|
||||
end
|
||||
|
@ -1189,7 +1189,7 @@ RSpec.describe ActivityPub::Activity::Create do
|
|||
expect(status.mentions.map(&:account_id)).to contain_exactly(recipient.id)
|
||||
end
|
||||
|
||||
it 'do not forward to observers' do
|
||||
it 'do not forward to observers', :sidekiq_inline do
|
||||
expect(a_request(:post, 'http://or.example.com/actor/inbox')).to_not have_been_made
|
||||
expect(a_request(:post, 'http://example.com/bob/inbox')).to_not have_been_made
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue