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

Merge branch 'rails5-fix-48104' into 'master' 

Rails5 fix expected: 1 time with arguments: (97, anything, {"squash"=>false}) received: 0 times

Closes #48104

See merge request gitlab-org/gitlab-ce!20004
This commit is contained in:
Rémy Coutable 2018-06-20 10:00:32 +00:00
parent 52b9cead80 9214e273a8
commit a88a9e22c5
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changelogs/unreleased/rails5-fix-48104.yml Normal file
View File

@ -0,0 +1,6 @@
---
title: 'Rails5 fix expected: 1 time with arguments: (97, anything, {"squash"=>false})
received: 0 times'
merge_request: 20004
author: Jasper Maes
type: fixed

7
spec/controllers/projects/merge_requests_controller_spec.rb
View File

@ -337,7 +337,12 @@ describe Projects::MergeRequestsController do
context 'when the sha parameter matches the source SHA' do
def merge_with_sha(params = {})
post :merge, base_params.merge(sha: merge_request.diff_head_sha).merge(params)
post_params = base_params.merge(sha: merge_request.diff_head_sha).merge(params)
if Gitlab.rails5?
post :merge, params: post_params, as: :json
else
post :merge, post_params
end
end
it 'returns :success' do