Default to json type for webfinger requests (#1583)

2 files changed, 35 insertions, 2 deletions

diff --git a/spec/controllers/xrd_controller_spec.rb b/spec/controllers/xrd_controller_spec.rb
index b56c68f5c..33b17f152 100644
--- a/spec/controllers/xrd_controller_spec.rb
+++ b/spec/controllers/xrd_controller_spec.rb
@@ -14,12 +14,12 @@ RSpec.describe XrdController, type: :controller do
     let(:alice) { Fabricate(:account, username: 'alice') }
 
     it 'returns http success when account can be found' do
-      get :webfinger, params: { resource: alice.to_webfinger_s }
+      get :webfinger, params: { resource: alice.to_webfinger_s }, format: :json
       expect(response).to have_http_status(:success)
     end
 
     it 'returns http not found when account cannot be found' do
-      get :webfinger, params: { resource: 'acct:not@existing.com' }
+      get :webfinger, params: { resource: 'acct:not@existing.com' }, format: :json
       expect(response).to have_http_status(:not_found)
     end
   end
diff --git a/spec/requests/webfinger_request_spec.rb b/spec/requests/webfinger_request_spec.rb
new file mode 100644
index 000000000..b5690d22f
--- /dev/null
+++ b/spec/requests/webfinger_request_spec.rb
@@ -0,0 +1,33 @@
+require "rails_helper"
+
+describe "The webfinger route" do
+  let(:alice) { Fabricate(:account, username: 'alice') }
+
+  describe "requested without accepts headers" do
+    it "returns a json response" do
+      get webfinger_url, params: { resource: alice.to_webfinger_s }
+
+      expect(response).to have_http_status(:success)
+      expect(response.content_type).to eq "application/jrd+json"
+    end
+  end
+
+  describe "requested with html in accepts headers" do
+    it "returns a json response" do
+      headers = { 'HTTP_ACCEPT' => 'text/html' }
+      get webfinger_url, params: { resource: alice.to_webfinger_s }, headers: headers
+
+      expect(response).to have_http_status(:success)
+      expect(response.content_type).to eq "application/jrd+json"
+    end
+  end
+
+  describe "requested with xml format" do
+    it "returns an xml response" do
+      get webfinger_url(resource: alice.to_webfinger_s, format: :xml)
+
+      expect(response).to have_http_status(:success)
+      expect(response.content_type).to eq "application/xrd+xml"
+    end
+  end
+end