diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-03-12 20:54:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-12 20:54:13 +0100 |
commit | 988f5bf0266483659b03f1b0926d0b9ff9e85a8f (patch) | |
tree | 1e0a0011a890729f45c0d364641c266864e78d02 /spec/services | |
parent | 2c8bb1745359a3bf200d37383dc56d5951e2b6bc (diff) | |
parent | 8d4b5ee3ef5e8df3a92e19f2c3f3a4560341eef3 (diff) |
Merge pull request #1716 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/services')
-rw-r--r-- | spec/services/activitypub/fetch_remote_status_service_spec.rb | 48 | ||||
-rw-r--r-- | spec/services/activitypub/process_status_update_service_spec.rb | 20 |
2 files changed, 62 insertions, 6 deletions
diff --git a/spec/services/activitypub/fetch_remote_status_service_spec.rb b/spec/services/activitypub/fetch_remote_status_service_spec.rb index 94574aa7f..68816e554 100644 --- a/spec/services/activitypub/fetch_remote_status_service_spec.rb +++ b/spec/services/activitypub/fetch_remote_status_service_spec.rb @@ -3,9 +3,11 @@ require 'rails_helper' RSpec.describe ActivityPub::FetchRemoteStatusService, type: :service do include ActionView::Helpers::TextHelper - let(:sender) { Fabricate(:account) } - let(:recipient) { Fabricate(:account) } - let(:valid_domain) { Rails.configuration.x.local_domain } + let!(:sender) { Fabricate(:account).tap { |account| account.update(uri: ActivityPub::TagManager.instance.uri_for(account)) } } + let!(:recipient) { Fabricate(:account) } + let!(:valid_domain) { Rails.configuration.x.local_domain } + + let(:existing_status) { nil } let(:note) do { @@ -19,11 +21,13 @@ RSpec.describe ActivityPub::FetchRemoteStatusService, type: :service do subject { described_class.new } + before do + stub_request(:head, 'https://example.com/watch?v=12345').to_return(status: 404, body: '') + end + describe '#call' do before do - sender.update(uri: ActivityPub::TagManager.instance.uri_for(sender)) - - stub_request(:head, 'https://example.com/watch?v=12345').to_return(status: 404, body: '') + existing_status subject.call(object[:id], prefetched_body: Oj.dump(object)) end @@ -186,5 +190,37 @@ RSpec.describe ActivityPub::FetchRemoteStatusService, type: :service do expect(sender.statuses.first).to be_nil end end + + context 'when status already exists' do + let(:existing_status) { Fabricate(:status, account: sender, text: 'Foo', uri: note[:id]) } + + context 'with a Note object' do + let(:object) { note } + + it 'updates status' do + existing_status.reload + expect(existing_status.text).to eq 'Lorem ipsum' + expect(existing_status.edits).to_not be_empty + end + end + + context 'with a Create activity' do + let(:object) do + { + '@context': 'https://www.w3.org/ns/activitystreams', + id: "https://#{valid_domain}/@foo/1234/create", + type: 'Create', + actor: ActivityPub::TagManager.instance.uri_for(sender), + object: note, + } + end + + it 'updates status' do + existing_status.reload + expect(existing_status.text).to eq 'Lorem ipsum' + expect(existing_status.edits).to_not be_empty + end + end + end end end diff --git a/spec/services/activitypub/process_status_update_service_spec.rb b/spec/services/activitypub/process_status_update_service_spec.rb index 40b405217..788c7c9d9 100644 --- a/spec/services/activitypub/process_status_update_service_spec.rb +++ b/spec/services/activitypub/process_status_update_service_spec.rb @@ -46,6 +46,26 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService, type: :service do expect(status.reload.spoiler_text).to eq 'Show more' end + context 'with no changes and originally with no ordered_media_attachment_ids' do + let(:payload) do + { + '@context': 'https://www.w3.org/ns/activitystreams', + id: 'foo', + type: 'Note', + content: 'Hello world', + } + end + + before do + status.update(ordered_media_attachment_ids: nil) + subject.call(status, json) + end + + it 'does not record an update' do + expect(status.reload.edited?).to be false + end + end + context 'originally without tags' do before do subject.call(status, json) |