From 857af4fde0c2753576facd8d0fd6742cb9c834f1 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Tue, 7 Jul 2015 12:45:30 +0200 Subject: [PATCH] Use Accept entries for getting API version --- lib/travis/api/app/helpers/accept.rb | 2 +- spec/integration/v1/repositories_spec.rb | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/travis/api/app/helpers/accept.rb b/lib/travis/api/app/helpers/accept.rb index 229f544e..5fb41c67 100644 --- a/lib/travis/api/app/helpers/accept.rb +++ b/lib/travis/api/app/helpers/accept.rb @@ -82,7 +82,7 @@ class Travis::Api::App end def accept_version - @accept_version ||= request.accept.join =~ HEADER_FORMAT && "v#{$1}" || DEFAULT_VERSION + @accept_version ||= accept_entries.map(&:version).compact.first || DEFAULT_VERSION end def accept_format diff --git a/spec/integration/v1/repositories_spec.rb b/spec/integration/v1/repositories_spec.rb index a7482a94..54526418 100644 --- a/spec/integration/v1/repositories_spec.rb +++ b/spec/integration/v1/repositories_spec.rb @@ -34,6 +34,11 @@ describe 'v1 repos' do response.should redirect_to('/repositories/svenfuchs/minimal.json') end + it 'GET /svenfuchs/minimal' do + response = get '/svenfuchs/minimal.json', {}, 'HTTP_ACCEPT' => 'application/json; version=2' + response.status.should == 404 + end + it 'GET /svenfuchs/minimal/cc.xml' do response = get '/svenfuchs/minimal/cc.xml' response.should redirect_to('/repositories/svenfuchs/minimal/cc.xml')