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

2020-05-20 18:22:42 +02:00
parent b7e178d2e4 50524d1327
commit 27b5143dc4
14 changed files with 124 additions and 26 deletions
--- a/spec/controllers/well_known/webfinger_controller_spec.rb
+++ b/spec/controllers/well_known/webfinger_controller_spec.rb
@@ -84,5 +84,15 @@ PEM

      expect(response).to have_http_status(:not_found)
    end
+
+    it 'returns http bad request when not given a resource parameter' do
+      get :show, params: { }, format: :json
+      expect(response).to have_http_status(:bad_request)
+    end
+
+    it 'returns http bad request when given a nonsense parameter' do
+      get :show, params: { resource: 'df/:dfkj' }
+      expect(response).to have_http_status(:bad_request)
+    end
  end
 end