Commit 164942db authored by Rémy Coutable's avatar Rémy Coutable

Fix more specs

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 5614f50d
...@@ -114,7 +114,7 @@ describe MergeRequests::MergeWhenPipelineSucceedsService do ...@@ -114,7 +114,7 @@ describe MergeRequests::MergeWhenPipelineSucceedsService do
context 'when the merge request is not mergeable' do context 'when the merge request is not mergeable' do
let(:mr_conflict) do let(:mr_conflict) do
create(:merge_request, merge_when_build_succeeds: true, merge_user: user, create(:merge_request, merge_when_pipeline_succeeds: true, merge_user: user,
source_branch: 'master', target_branch: 'feature-conflict', source_branch: 'master', target_branch: 'feature-conflict',
source_project: project, target_project: project) source_project: project, target_project: project)
end end
......
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