Fix ActivityPub follow interaction and add more specs (#4601)

This commit is contained in:
unarist 2017-08-14 23:57:46 +09:00 committed by Eugen Rochko
parent 5b9ae7981e
commit a855956185
5 changed files with 103 additions and 6 deletions

View file

@ -20,6 +20,6 @@ class ActivityPub::Activity::Accept < ActivityPub::Activity
end end
def target_uri def target_uri
@target_uri ||= @object['object'].is_a?(String) ? @object['object'] : @object['object']['id'] @target_uri ||= @object['actor']
end end
end end

View file

@ -20,6 +20,6 @@ class ActivityPub::Activity::Reject < ActivityPub::Activity
end end
def target_uri def target_uri
@target_uri ||= @object['object'].is_a?(String) ? @object['object'] : @object['object']['id'] @target_uri ||= @object['actor']
end end
end end

View file

@ -0,0 +1,38 @@
require 'rails_helper'
RSpec.describe ActivityPub::Activity::Accept do
let(:sender) { Fabricate(:account) }
let(:recipient) { Fabricate(:account) }
let(:json) do
{
'@context': 'https://www.w3.org/ns/activitystreams',
id: 'foo',
type: 'Accept',
actor: ActivityPub::TagManager.instance.uri_for(sender),
object: {
id: 'bar',
type: 'Follow',
actor: ActivityPub::TagManager.instance.uri_for(recipient),
object: ActivityPub::TagManager.instance.uri_for(sender),
},
}.with_indifferent_access
end
describe '#perform' do
subject { described_class.new(json, sender) }
before do
Fabricate(:follow_request, account: recipient, target_account: sender)
subject.perform
end
it 'creates a follow relationship' do
expect(recipient.following?(sender)).to be true
end
it 'removes the follow request' do
expect(recipient.requested?(sender)).to be false
end
end
end

View file

@ -17,6 +17,7 @@ RSpec.describe ActivityPub::Activity::Follow do
describe '#perform' do describe '#perform' do
subject { described_class.new(json, sender) } subject { described_class.new(json, sender) }
context 'unlocked account' do
before do before do
subject.perform subject.perform
end end
@ -24,5 +25,25 @@ RSpec.describe ActivityPub::Activity::Follow do
it 'creates a follow from sender to recipient' do it 'creates a follow from sender to recipient' do
expect(sender.following?(recipient)).to be true expect(sender.following?(recipient)).to be true
end end
it 'does not create a follow request' do
expect(sender.requested?(recipient)).to be false
end
end
context 'locked account' do
before do
recipient.update(locked: true)
subject.perform
end
it 'does not create a follow from sender to recipient' do
expect(sender.following?(recipient)).to be false
end
it 'creates a follow request' do
expect(sender.requested?(recipient)).to be true
end
end
end end
end end

View file

@ -0,0 +1,38 @@
require 'rails_helper'
RSpec.describe ActivityPub::Activity::Reject do
let(:sender) { Fabricate(:account) }
let(:recipient) { Fabricate(:account) }
let(:json) do
{
'@context': 'https://www.w3.org/ns/activitystreams',
id: 'foo',
type: 'Reject',
actor: ActivityPub::TagManager.instance.uri_for(sender),
object: {
id: 'bar',
type: 'Follow',
actor: ActivityPub::TagManager.instance.uri_for(recipient),
object: ActivityPub::TagManager.instance.uri_for(sender),
},
}.with_indifferent_access
end
describe '#perform' do
subject { described_class.new(json, sender) }
before do
Fabricate(:follow_request, account: recipient, target_account: sender)
subject.perform
end
it 'does not create a follow relationship' do
expect(recipient.following?(sender)).to be false
end
it 'removes the follow request' do
expect(recipient.requested?(sender)).to be false
end
end
end