From f8ab48178e598a5980305cd236dea9acfb27f9e8 Mon Sep 17 00:00:00 2001 From: Konstantin Haase Date: Thu, 8 Nov 2012 13:26:59 +0100 Subject: [PATCH] also redirect "Accept: */*" to the api --- lib/travis/web/api_redirect.rb | 2 +- spec/api_redirect_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/travis/web/api_redirect.rb b/lib/travis/web/api_redirect.rb index 76fc87e7..e5af7997 100644 --- a/lib/travis/web/api_redirect.rb +++ b/lib/travis/web/api_redirect.rb @@ -31,7 +31,7 @@ class Travis::Web::ApiRedirect < Sinatra::Base end def api_call? - return true if request.accept.empty? + return true if request.accept.empty? or env['HTTP_ACCEPT'] == '*/*' preferred = request.preferred_type(*settings.frontend_types, *settings.api_types) settings.api_types.include? preferred end diff --git a/spec/api_redirect_spec.rb b/spec/api_redirect_spec.rb index 343caa9a..ce72819d 100644 --- a/spec/api_redirect_spec.rb +++ b/spec/api_redirect_spec.rb @@ -16,7 +16,7 @@ describe Travis::Web::ApiRedirect do end it 'does not redirect catch-all with generic Accept header' do - get('/foo/bar', {}, 'HTTP_ACCEPT' => '*/*').should_not be_redirect + get('/foo/bar', {}, 'HTTP_ACCEPT' => '*/*').should be_redirect end it 'redirects catch-all without Accept header' do