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

Fix resolve service specs

This commit is contained in:
Sean McGivern 2016-09-01 17:44:35 +01:00 committed by Alfredo Sumaran
parent 082be0917c
commit 98dd958df3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spec/services/merge_requests/resolve_service_spec.rb
View File

@ -60,7 +60,7 @@ describe MergeRequests::ResolveService do
it 'creates a commit with the correct parents' do
expect(merge_request.source_branch_head.parents.map(&:id)).
to eq(['1450cd639e0bc6721eb02800169e464f212cde06',
'75284c70dd26c87f2a3fb65fd5a1f0b0138d3a6b'])
'824be604a34828eb682305f0d963056cfac87b2d'])
end
end
@ -120,7 +120,7 @@ describe MergeRequests::ResolveService do
it 'creates a commit with the correct parents' do
expect(merge_request.source_branch_head.parents.map(&:id)).
to eq(['1450cd639e0bc6721eb02800169e464f212cde06',
'75284c70dd26c87f2a3fb65fd5a1f0b0138d3a6b'])
'824be604a34828eb682305f0d963056cfac87b2d'])
end
it 'sets the content to the content given' do