about summary refs log tree commit diff
path: root/spec
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-10-30 17:52:08 +0100
committerThibaut Girka <thib@sitedethib.com>2018-10-30 17:52:08 +0100
commit1c448d647488dc3dd3b72e9fe15efb971612157c (patch)
tree2b31e4ed019a29043aa07d9d95e7f8b64e309bbd /spec
parent7e18e95716052d5566f2e31559cbe4a68268f493 (diff)
parent66019b0ec4aaa584e58e91583425ed7c0d55c28e (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/auth/sessions_controller.rb

Upstream reverted something we partially reverted already.
Reverted the rest to match upstream.
Diffstat (limited to 'spec')
-rw-r--r--spec/services/fetch_atom_service_spec.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/spec/services/fetch_atom_service_spec.rb b/spec/services/fetch_atom_service_spec.rb
index 30e5b0935..0cdcda892 100644
--- a/spec/services/fetch_atom_service_spec.rb
+++ b/spec/services/fetch_atom_service_spec.rb
@@ -60,13 +60,20 @@ RSpec.describe FetchAtomService, type: :service do
         it { is_expected.to eq [url, { :prefetched_body => "" }, :ostatus] }
       end
 
-      context 'content_type is json' do
+      context 'content_type is activity+json' do
         let(:content_type) { 'application/activity+json' }
         let(:body) { json }
 
         it { is_expected.to eq [1, { prefetched_body: body, id: true }, :activitypub] }
       end
 
+      context 'content_type is ld+json with profile' do
+        let(:content_type) { 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"' }
+        let(:body) { json }
+
+        it { is_expected.to eq [1, { prefetched_body: body, id: true }, :activitypub] }
+      end
+
       before do
         WebMock.stub_request(:get, url).to_return(status: 200, body: body, headers: headers)
         WebMock.stub_request(:get, 'http://example.com/foo').to_return(status: 200, body: json, headers: { 'Content-Type' => 'application/activity+json' })