Merge branch 'master' into glitch-soc/merge-upstream

2019-03-20 17:32:39 +01:00
parent 803c350ef5 80f0910e21
commit cbf1d711ba
11 changed files with 50 additions and 12 deletions
--- a/spec/controllers/activitypub/inboxes_controller_spec.rb
+++ b/spec/controllers/activitypub/inboxes_controller_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe ActivityPub::InboxesController, type: :controller do
          Fabricate(:account)
        end

-        post :create
+        post :create, body: '{}'
        expect(response).to have_http_status(202)
      end
    end
@@ -21,7 +21,7 @@ RSpec.describe ActivityPub::InboxesController, type: :controller do
          false
        end

-        post :create
+        post :create, body: '{}'
        expect(response).to have_http_status(401)
      end
    end