Skip to content
Snippets Groups Projects
Commit 266ba11e authored by Stan Hu's avatar Stan Hu
Browse files

Fix Profiler to work with Ruby 5.1

Ruby 5.1 now requires keyword arguments to pass along parameters and
headers for ActionDispatch::Integration::RequestHelpers.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/61051
parent 265b7894
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -73,7 +73,7 @@ module Gitlab
 
result = with_custom_logger(logger) do
with_user(user) do
RubyProf.profile { app.public_send(verb, url, post_data, headers) } # rubocop:disable GitlabSecurity/PublicSend
RubyProf.profile { app.public_send(verb, url, params: post_data, headers: headers) } # rubocop:disable GitlabSecurity/PublicSend
end
end
 
Loading
Loading
Loading
Loading
@@ -27,13 +27,13 @@ describe Gitlab::Profiler do
it 'sends a POST request when data is passed' do
post_data = '{"a":1}'
 
expect(app).to receive(:post).with(anything, post_data, anything)
expect(app).to receive(:post).with(anything, params: post_data, headers: anything)
 
described_class.profile('/', post_data: post_data)
end
 
it 'uses the private_token for auth if given' do
expect(app).to receive(:get).with('/', nil, 'Private-Token' => private_token)
expect(app).to receive(:get).with('/', params: nil, headers: { 'Private-Token' => private_token })
expect(app).to receive(:get).with('/api/v4/users')
 
described_class.profile('/', private_token: private_token)
Loading
Loading
@@ -51,7 +51,7 @@ describe Gitlab::Profiler do
user = double(:user)
 
expect(described_class).to receive(:with_user).with(nil).and_call_original
expect(app).to receive(:get).with('/', nil, 'Private-Token' => private_token)
expect(app).to receive(:get).with('/', params: nil, headers: { 'Private-Token' => private_token })
expect(app).to receive(:get).with('/api/v4/users')
 
described_class.profile('/', user: user, private_token: private_token)
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment