about summary refs log tree commit diff
path: root/spec/controllers
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-08-14 04:16:43 +0200
committerGitHub <noreply@github.com>2017-08-14 04:16:43 +0200
commit6df8bd277b52b3ac025597ec08ee9e342a8eb32c (patch)
tree965a65c8d6c99f4fa153a27fae5c8e6e1fceeb42 /spec/controllers
parent4e75f0d88932511ad154773f4c77a485367ed36c (diff)
Set correct content-type for ActivityPub JSON (#4592)
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/accounts_controller_spec.rb4
-rw-r--r--spec/controllers/activitypub/outboxes_controller_spec.rb4
2 files changed, 8 insertions, 0 deletions
diff --git a/spec/controllers/accounts_controller_spec.rb b/spec/controllers/accounts_controller_spec.rb
index d61c8c9bd..2c0df0ef3 100644
--- a/spec/controllers/accounts_controller_spec.rb
+++ b/spec/controllers/accounts_controller_spec.rb
@@ -48,6 +48,10 @@ RSpec.describe AccountsController, type: :controller do
       it 'returns http success with Activity Streams 2.0' do
         expect(response).to have_http_status(:success)
       end
+
+      it 'returns application/activity+json' do
+        expect(response.content_type).to eq 'application/activity+json'
+      end
     end
 
     context 'html' do
diff --git a/spec/controllers/activitypub/outboxes_controller_spec.rb b/spec/controllers/activitypub/outboxes_controller_spec.rb
index f98e4a8c3..a25998021 100644
--- a/spec/controllers/activitypub/outboxes_controller_spec.rb
+++ b/spec/controllers/activitypub/outboxes_controller_spec.rb
@@ -15,5 +15,9 @@ RSpec.describe ActivityPub::OutboxesController, type: :controller do
     it 'returns http success' do
       expect(response).to have_http_status(:success)
     end
+
+    it 'returns application/activity+json' do
+      expect(response.content_type).to eq 'application/activity+json'
+    end
   end
 end