diff options
| author | James Lopez <james@gitlab.com> | 2019-02-20 10:50:34 +0300 |
|---|---|---|
| committer | James Lopez <james@gitlab.com> | 2019-02-20 10:50:34 +0300 |
| commit | 678f55da3e608a1507e451e72540d63f3bacc315 (patch) | |
| tree | 5285f9b2e9cf537ef4a23a52dd618725ec56058d /spec/lib | |
| parent | 8a4cbca2a4e5d42d63ae3999816d4e8a9af228f7 (diff) | |
| parent | a0856cf7b94b76f5305f3dd49f6c2b2cc807ea99 (diff) | |
Merge branch 'sh-upgrade-webmock-ruby-2.6' into 'master'
Upgrade Webmock to 3.5.1
See merge request gitlab-org/gitlab-ce!25318
Diffstat (limited to 'spec/lib')
| -rw-r--r-- | spec/lib/bitbucket_server/client_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/bitbucket_server/client_spec.rb b/spec/lib/bitbucket_server/client_spec.rb index b021e69800a..4f0d57ca8a6 100644 --- a/spec/lib/bitbucket_server/client_spec.rb +++ b/spec/lib/bitbucket_server/client_spec.rb @@ -64,7 +64,7 @@ describe BitbucketServer::Client do let(:url) { "#{base_uri}rest/api/1.0/projects/SOME-PROJECT/repos/my-repo/branches" } it 'requests Bitbucket to create a branch' do - stub_request(:post, url).to_return(status: 204, headers: headers, body: '{}') + stub_request(:post, url).to_return(status: 204, headers: headers, body: nil) subject.create_branch(project, repo_slug, branch, sha) @@ -78,7 +78,7 @@ describe BitbucketServer::Client do let(:url) { "#{base_uri}rest/branch-utils/1.0/projects/SOME-PROJECT/repos/my-repo/branches" } it 'requests Bitbucket to create a branch' do - stub_request(:delete, url).to_return(status: 204, headers: headers, body: '{}') + stub_request(:delete, url).to_return(status: 204, headers: headers, body: nil) subject.delete_branch(project, repo_slug, branch, sha) |