diff options
author | Sean McGivern <sean@gitlab.com> | 2019-04-29 07:38:49 +0000 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2019-04-29 07:38:49 +0000 |
commit | e6f548fcd87a9e724c80980098c9137081b96be4 (patch) | |
tree | b4b0a4052af15abb119e55ffa485c8e0e3d68752 /spec/lib | |
parent | 4047e5b8275490288e7ce38ae48e3f7248e5daf8 (diff) | |
parent | 266ba11ed77f00f5fd83070a85c0bc8101203eab (diff) | |
download | gitlab-ce-e6f548fcd87a9e724c80980098c9137081b96be4.tar.gz |
Merge branch 'sh-fix-profiler-ruby-5.1' into 'master'28996-automatic-https-certificate-creation-renewal-for-pages-custom-domains-228996-automatic-https-certificate-creation-renewal-for-pages-custom-domains
Fix Profiler to work with Rails 5.1
Closes #61051
See merge request gitlab-org/gitlab-ce!27774
Diffstat (limited to 'spec/lib')
-rw-r--r-- | spec/lib/gitlab/profiler_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/lib/gitlab/profiler_spec.rb b/spec/lib/gitlab/profiler_spec.rb index 9f2214f7ce7..5af52db7a1f 100644 --- a/spec/lib/gitlab/profiler_spec.rb +++ b/spec/lib/gitlab/profiler_spec.rb @@ -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) @@ -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) |