Commit 04c6d102 authored by Matija Čupić's avatar Matija Čupić

Use RequestOptions in GCP Client user_agent_header

parent 50c8bd63
...@@ -84,7 +84,9 @@ module GoogleApi ...@@ -84,7 +84,9 @@ module GoogleApi
end end
def user_agent_header def user_agent_header
{ 'User-Agent': "GitLab/#{Gitlab::VERSION.match('(\d+\.\d+)').captures.first} (GPN:GitLab;)" } options = Google::Apis::RequestOptions.new
options.header = { 'User-Agent': "GitLab/#{Gitlab::VERSION.match('(\d+\.\d+)').captures.first} (GPN:GitLab;)" }
options
end end
end end
end end
......
...@@ -129,9 +129,14 @@ describe GoogleApi::CloudPlatform::Client do ...@@ -129,9 +129,14 @@ describe GoogleApi::CloudPlatform::Client do
describe '#user_agent_header' do describe '#user_agent_header' do
subject { client.instance_eval { user_agent_header } } subject { client.instance_eval { user_agent_header } }
it 'returns the correct major and minor GitLab version ' do it 'returns a RequestOptions object' do
expect(subject).to be_instance_of(Google::Apis::RequestOptions)
end
it 'has the correct GitLab version in User-Agent header' do
stub_const('Gitlab::VERSION', '10.3.0-pre') stub_const('Gitlab::VERSION', '10.3.0-pre')
expect(subject).to eq({ 'User-Agent': 'GitLab/10.3 (GPN:GitLab;)' })
expect(subject.header).to eq({ 'User-Agent': 'GitLab/10.3 (GPN:GitLab;)' })
end end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment