Skip to content

Commit 85cbe96

Browse files
Merge pull request #1255 from travis-ci/bugfix_cycle_12
Bugfix cycle 12
2 parents cfcd61a + bbea94b commit 85cbe96

File tree

2 files changed

+27
-1
lines changed

2 files changed

+27
-1
lines changed

lib/travis/api/v3/router.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ def initialize(routes = Routes)
1616

1717
def call(env)
1818
::Metriks.meter("api.v3.total_requests").mark
19+
metrics = @metrics_processor.create
1920

2021
return service_index(env) if env['PATH_INFO'.freeze] == ?/.freeze
2122

2223
process_txt_extension!(env)
2324

24-
metrics = @metrics_processor.create
2525
access_control = AccessControl.new(env)
2626
env_params = params(env)
2727
factory, params = routes.factory_for(env['REQUEST_METHOD'.freeze], env['PATH_INFO'.freeze])

spec/v3/router_spec.rb

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
describe Travis::API::V3::Router, set_app: true do
2+
describe '#call' do
3+
let(:env) do
4+
{
5+
'PATH_INFO' => '/',
6+
'rack.request.query_hash' => {},
7+
}
8+
end
9+
10+
context 'when user has no perms' do
11+
before { env['HTTP_AUTHORIZATION'] = 'Token 123' }
12+
13+
it 'returns a 403 error' do
14+
expect(subject.call(env).first).to eq(403)
15+
end
16+
end
17+
18+
context 'when user has perms' do
19+
before { env['rack.request.query_hash']['log.token'] = '123' }
20+
21+
it 'returns a 200 response' do
22+
expect(subject.call(env).first).to eq(200)
23+
end
24+
end
25+
end
26+
end

0 commit comments

Comments
 (0)