BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 98dd958d by Sean McGivern Committed by Alfredo Sumaran
Options

Fix resolve service specs

parent 082be091
Showing with 2 additions and 2 deletions
spec/services/merge_requests/resolve_service_spec.rb
...@@ -60,7 +60,7 @@ describe MergeRequests::ResolveService do ...@@ -60,7 +60,7 @@ describe MergeRequests::ResolveService do
it 'creates a commit with the correct parents' do it 'creates a commit with the correct parents' do
expect(merge_request.source_branch_head.parents.map(&:id)). expect(merge_request.source_branch_head.parents.map(&:id)).
to eq(['1450cd639e0bc6721eb02800169e464f212cde06', to eq(['1450cd639e0bc6721eb02800169e464f212cde06',
'75284c70dd26c87f2a3fb65fd5a1f0b0138d3a6b']) '824be604a34828eb682305f0d963056cfac87b2d'])
end end
end end
...@@ -120,7 +120,7 @@ describe MergeRequests::ResolveService do ...@@ -120,7 +120,7 @@ describe MergeRequests::ResolveService do
it 'creates a commit with the correct parents' do it 'creates a commit with the correct parents' do
expect(merge_request.source_branch_head.parents.map(&:id)). expect(merge_request.source_branch_head.parents.map(&:id)).
to eq(['1450cd639e0bc6721eb02800169e464f212cde06', to eq(['1450cd639e0bc6721eb02800169e464f212cde06',
'75284c70dd26c87f2a3fb65fd5a1f0b0138d3a6b']) '824be604a34828eb682305f0d963056cfac87b2d'])
end end
it 'sets the content to the content given' do it 'sets the content to the content given' do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment