mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-22 04:25:06 +01:00
81584779cb
* Fix #2473 - Use sidekiq scheduler to refresh PuSH subscriptions instead of cron Fix an issue where / in domain would raise exception in TagManager#normalize_domain PuSH subscriptions refresh done in a round-robin way to avoid hammering a single server's hub in sequence. Correct handling of failures/retries through Sidekiq (see also #2613). Optimize Account#with_followers scope. Also, since subscriptions are now delegated to Sidekiq jobs, an uncaught exception will not stop the entire refreshing operation halfway through Fix #2702 - Correct user agent header on outgoing http requests * Add test for SubscribeService * Extract #expiring_accounts into method * Make mastodon:push:refresh no-op * Queues are now defined in sidekiq.yml * Queues are now in sidekiq.yml
81 lines
2.7 KiB
Ruby
81 lines
2.7 KiB
Ruby
require 'rails_helper'
|
|
|
|
RSpec.describe FollowService do
|
|
let(:sender) { Fabricate(:account, username: 'alice') }
|
|
|
|
subject { FollowService.new }
|
|
|
|
context 'local account' do
|
|
describe 'locked account' do
|
|
let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, locked: true, username: 'bob')).account }
|
|
|
|
before do
|
|
subject.call(sender, bob.acct)
|
|
end
|
|
|
|
it 'creates a follow request' do
|
|
expect(FollowRequest.find_by(account: sender, target_account: bob)).to_not be_nil
|
|
end
|
|
end
|
|
|
|
describe 'unlocked account' do
|
|
let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
|
|
|
|
before do
|
|
subject.call(sender, bob.acct)
|
|
end
|
|
|
|
it 'creates a following relation' do
|
|
expect(sender.following?(bob)).to be true
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'remote account' do
|
|
describe 'locked account' do
|
|
let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, locked: true, username: 'bob', domain: 'example.com', salmon_url: 'http://salmon.example.com')).account }
|
|
|
|
before do
|
|
stub_request(:post, "http://salmon.example.com/").to_return(:status => 200, :body => "", :headers => {})
|
|
subject.call(sender, bob.acct)
|
|
end
|
|
|
|
it 'creates a follow request' do
|
|
expect(FollowRequest.find_by(account: sender, target_account: bob)).to_not be_nil
|
|
end
|
|
|
|
it 'sends a follow request salmon slap' do
|
|
expect(a_request(:post, "http://salmon.example.com/").with { |req|
|
|
xml = OStatus2::Salmon.new.unpack(req.body)
|
|
xml.match(TagManager::VERBS[:request_friend])
|
|
}).to have_been_made.once
|
|
end
|
|
end
|
|
|
|
describe 'unlocked account' do
|
|
let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob', domain: 'example.com', salmon_url: 'http://salmon.example.com', hub_url: 'http://hub.example.com')).account }
|
|
|
|
before do
|
|
stub_request(:post, "http://salmon.example.com/").to_return(:status => 200, :body => "", :headers => {})
|
|
stub_request(:post, "http://hub.example.com/").to_return(status: 202)
|
|
subject.call(sender, bob.acct)
|
|
end
|
|
|
|
it 'creates a following relation' do
|
|
expect(sender.following?(bob)).to be true
|
|
end
|
|
|
|
it 'sends a follow salmon slap' do
|
|
expect(a_request(:post, "http://salmon.example.com/").with { |req|
|
|
xml = OStatus2::Salmon.new.unpack(req.body)
|
|
xml.match(TagManager::VERBS[:follow])
|
|
}).to have_been_made.once
|
|
end
|
|
|
|
it 'subscribes to PuSH' do
|
|
expect(a_request(:post, "http://hub.example.com/")).to have_been_made.once
|
|
end
|
|
end
|
|
end
|
|
end
|