kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix rubocop offenses

This commit is contained in:
Tomasz Maczukin 2017-02-16 01:20:17 +01:00
parent a4b2e90e64
commit 22c983d7a0
No known key found for this signature in database
GPG Key ID: 7E9EB2E4B0F625CD
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/api/helpers/ci.rb
View File

@ -2,9 +2,8 @@ module API
module Helpers module Helpers
module Ci module Ci
def runner_registration_token_valid? def runner_registration_token_valid?
ActiveSupport::SecurityUtils.variable_size_secure_compare( ActiveSupport::SecurityUtils.variable_size_secure_compare(params[:token],
params[:token], current_application_settings.runners_registration_token)
current_application_settings.runners_registration_token)
end end
def get_runner_version_from_params def get_runner_version_from_params
@ -21,4 +20,4 @@ module API
end end
end end
end end
end end

16
spec/requests/api/ci_spec.rb
View File

@ -54,7 +54,7 @@ describe API::Ci do
context 'when runner description is provided' do context 'when runner description is provided' do
it 'creates runner' do it 'creates runner' do
post api('/runners'), token: registration_token, post api('/runners'), token: registration_token,
description: 'server.hostname' description: 'server.hostname'
expect(response).to have_http_status 201 expect(response).to have_http_status 201
expect(Ci::Runner.first.description).to eq('server.hostname') expect(Ci::Runner.first.description).to eq('server.hostname')
@ -64,7 +64,7 @@ describe API::Ci do
context 'when runner tags are provided' do context 'when runner tags are provided' do
it 'creates runner' do it 'creates runner' do
post api('/runners'), token: registration_token, post api('/runners'), token: registration_token,
tag_list: 'tag1, tag2' tag_list: 'tag1, tag2'
expect(response).to have_http_status 201 expect(response).to have_http_status 201
expect(Ci::Runner.first.tag_list.sort).to eq(%w(tag1 tag2)) expect(Ci::Runner.first.tag_list.sort).to eq(%w(tag1 tag2))
@ -75,8 +75,8 @@ describe API::Ci do
context 'when tags are provided' do context 'when tags are provided' do
it 'creates runner' do it 'creates runner' do
post api('/runners'), token: registration_token, post api('/runners'), token: registration_token,
run_untagged: false, run_untagged: false,
tag_list: ['tag'] tag_list: ['tag']
expect(response).to have_http_status 201 expect(response).to have_http_status 201
expect(Ci::Runner.first.run_untagged).to be false expect(Ci::Runner.first.run_untagged).to be false
@ -87,7 +87,7 @@ describe API::Ci do
context 'when tags are not provided' do context 'when tags are not provided' do
it 'returns 404 error' do it 'returns 404 error' do
post api('/runners'), token: registration_token, post api('/runners'), token: registration_token,
run_untagged: false run_untagged: false
expect(response).to have_http_status 404 expect(response).to have_http_status 404
end end
@ -97,7 +97,7 @@ describe API::Ci do
context 'when option for locking Runner is provided' do context 'when option for locking Runner is provided' do
it 'creates runner' do it 'creates runner' do
post api('/runners'), token: registration_token, post api('/runners'), token: registration_token,
locked: true locked: true
expect(response).to have_http_status 201 expect(response).to have_http_status 201
expect(Ci::Runner.first.locked).to be true expect(Ci::Runner.first.locked).to be true
@ -110,7 +110,7 @@ describe API::Ci do
it %q(updates provided Runner's parameter) do it %q(updates provided Runner's parameter) do
post api('/runners'), token: registration_token, post api('/runners'), token: registration_token,
info: {param => value} info: { param => value }
expect(response).to have_http_status 201 expect(response).to have_http_status 201
expect(Ci::Runner.first.read_attribute(param.to_sym)).to eq(value) expect(Ci::Runner.first.read_attribute(param.to_sym)).to eq(value)
@ -145,4 +145,4 @@ describe API::Ci do
end end
end end
end end
end end