Commit b8023b1c authored by James Edwards-Jones's avatar James Edwards-Jones

Fix spec failure for squash in progress error handling

parent ddd47d9e
...@@ -210,6 +210,10 @@ describe MergeRequests::MergeService, services: true do ...@@ -210,6 +210,10 @@ describe MergeRequests::MergeService, services: true do
end end
context 'when squashing' do context 'when squashing' do
before do
merge_request.update!(source_branch: 'master', target_branch: 'feature')
end
it 'logs and saves error if there is an error when squashing' do it 'logs and saves error if there is an error when squashing' do
error_message = 'Failed to squash. Should be done manually' error_message = 'Failed to squash. Should be done manually'
......
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