mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-02 13:03:05 -05:00
5e6a09498a
In this commit, we also push note creation into the AccountInteractions concern, where we can: 1. create and persist model objects inside transactions without having to include job queuing inside the transaction 2. commonize the don't-add-a-blank-note check Finally, this commit resolves a invocation-on-nil in REST::RelationshipSerializer.
74 lines
2.1 KiB
Ruby
74 lines
2.1 KiB
Ruby
require 'rails_helper'
|
|
|
|
RSpec.describe BlockService do
|
|
let(:sender) { Fabricate(:account, username: 'alice') }
|
|
|
|
subject { BlockService.new }
|
|
|
|
describe 'local' do
|
|
let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
|
|
|
|
before do
|
|
subject.call(sender, bob)
|
|
end
|
|
|
|
it 'creates a blocking relation' do
|
|
expect(sender.blocking?(bob)).to be true
|
|
end
|
|
|
|
describe 'if a note is present' do
|
|
let(:note) { 'Too many oats' }
|
|
|
|
it 'adds a note to the block' do
|
|
block = subject.call(sender, bob, note: note)
|
|
note = block.note
|
|
|
|
expect(note.text).to eq('Too many oats')
|
|
end
|
|
|
|
it 'does not add blank notes' do
|
|
block = subject.call(sender, bob, note: ' ')
|
|
|
|
expect(block.note).to be nil
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'remote OStatus' do
|
|
let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, 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)
|
|
end
|
|
|
|
it 'creates a blocking relation' do
|
|
expect(sender.blocking?(bob)).to be true
|
|
end
|
|
|
|
it 'sends a block salmon slap' do
|
|
expect(a_request(:post, "http://salmon.example.com/").with { |req|
|
|
xml = OStatus2::Salmon.new.unpack(req.body)
|
|
xml.match(OStatus::TagManager::VERBS[:block])
|
|
}).to have_been_made.once
|
|
end
|
|
end
|
|
|
|
describe 'remote ActivityPub' do
|
|
let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox')).account }
|
|
|
|
before do
|
|
stub_request(:post, 'http://example.com/inbox').to_return(status: 200)
|
|
subject.call(sender, bob)
|
|
end
|
|
|
|
it 'creates a blocking relation' do
|
|
expect(sender.blocking?(bob)).to be true
|
|
end
|
|
|
|
it 'sends a block activity' do
|
|
expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.once
|
|
end
|
|
end
|
|
end
|