summaryrefslogtreecommitdiff
path: root/spec/models/merge_request_spec.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/models/merge_request_spec.rb')
-rw-r--r--spec/models/merge_request_spec.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index ce043f77e83..c95b1c59bcb 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -1436,6 +1436,8 @@ describe MergeRequest, models: true do
status: status)
merge_request.update(head_pipeline: pipeline)
+
+ pipeline
end
let(:project) { create(:project, :public, :repository, only_allow_merge_if_pipeline_succeeds: true) }
@@ -1521,7 +1523,7 @@ describe MergeRequest, models: true do
context 'with running pipeline' do
before do
- merge_request.update(head_pipeline: create_pipeline(:running))
+ create_pipeline(:running)
end
it 'is mergeable' do