Skip to content

Commit

Permalink
Fix account URI in UpdatePollSerializer (mastodon#11194)
Browse files Browse the repository at this point in the history
* Fix account URI in UpdatePollSerializer

Fixes mastodon#11185

* Add specs
  • Loading branch information
ClearlyClaire authored and Gargron committed Jun 27, 2019
1 parent 836c47e commit 7b42579
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 1 deletion.
2 changes: 1 addition & 1 deletion app/serializers/activitypub/update_poll_serializer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def type
end

def actor
ActivityPub::TagManager.instance.uri_for(object)
ActivityPub::TagManager.instance.uri_for(object.account)
end

def to
Expand Down
27 changes: 27 additions & 0 deletions spec/serializers/activitypub/update_poll_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# frozen_string_literal: true

require 'rails_helper'

describe ActivityPub::UpdatePollSerializer do
let(:account) { Fabricate(:account) }
let(:poll) { Fabricate(:poll, account: account) }
let!(:status) { Fabricate(:status, account: account, poll: poll) }

before(:each) do
@serialization = ActiveModelSerializers::SerializableResource.new(status, serializer: ActivityPub::UpdatePollSerializer, adapter: ActivityPub::Adapter)
end

subject { JSON.parse(@serialization.to_json) }

it 'has a Update type' do
expect(subject['type']).to eql('Update')
end

it 'has an object with Question type' do
expect(subject['object']['type']).to eql('Question')
end

it 'has the correct actor URI set' do
expect(subject['actor']).to eql(ActivityPub::TagManager.instance.uri_for(account))
end
end
22 changes: 22 additions & 0 deletions spec/workers/activitypub/distribute_poll_update_worker_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
require 'rails_helper'

describe ActivityPub::DistributePollUpdateWorker do
subject { described_class.new }

let(:account) { Fabricate(:account) }
let(:follower) { Fabricate(:account, protocol: :activitypub, inbox_url: 'http://example.com') }
let(:poll) { Fabricate(:poll, account: account) }
let!(:status) { Fabricate(:status, account: account, poll: poll) }

describe '#perform' do
before do
allow(ActivityPub::DeliveryWorker).to receive(:push_bulk)
follower.follow!(account)
end

it 'delivers to followers' do
subject.perform(status.id)
expect(ActivityPub::DeliveryWorker).to have_received(:push_bulk).with(['http://example.com'])
end
end
end

0 comments on commit 7b42579

Please sign in to comment.