about summary refs log tree commit diff
path: root/spec/routing/well_known_routes_spec.rb
diff options
context:
space:
mode:
authorMatt Jankowski <mjankowski@thoughtbot.com>2017-04-17 13:58:03 -0400
committerEugen <eugen@zeonfederated.com>2017-04-17 19:58:03 +0200
commit21a767dcfa2fba35a6bd641d7d7933f8734d41ee (patch)
tree5d1e9e18bf5338a99996d6a54ac9f9fdf50d2652 /spec/routing/well_known_routes_spec.rb
parent3399dd7a666d755288cabf55fbb71b7276f6ffb7 (diff)
Improve handling of HTTP_ACCEPT for webfinger (#2008)
This change includes:

- Improve the spec coverage for incoming request to the webfinger action
- For requests without an accept header (ie, what a browser might look like),
  return a JSON response.
- For requests with an explicit format of xml or json, return that format.
- For requests using an accept header, return that format.

Also adds failing spec showing webfinger does not return xml, which covers the
issue described in: https://github.com/tootsuite/mastodon/issues/1983
Diffstat (limited to 'spec/routing/well_known_routes_spec.rb')
-rw-r--r--spec/routing/well_known_routes_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/routing/well_known_routes_spec.rb b/spec/routing/well_known_routes_spec.rb
index 9540c3de3..2e25605c2 100644
--- a/spec/routing/well_known_routes_spec.rb
+++ b/spec/routing/well_known_routes_spec.rb
@@ -10,6 +10,6 @@ end
 describe 'the webfinger route' do
   it 'routes to correct place with json format' do
     expect(get('/.well-known/webfinger')).
-      to route_to('well_known/webfinger#show', format: 'json')
+      to route_to('well_known/webfinger#show')
   end
 end