diff options
Diffstat (limited to 'spec/services/auto_merge/merge_when_pipeline_succeeds_service_spec.rb')
-rw-r--r-- | spec/services/auto_merge/merge_when_pipeline_succeeds_service_spec.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/services/auto_merge/merge_when_pipeline_succeeds_service_spec.rb b/spec/services/auto_merge/merge_when_pipeline_succeeds_service_spec.rb index 6f28f892f00..73d185283b6 100644 --- a/spec/services/auto_merge/merge_when_pipeline_succeeds_service_spec.rb +++ b/spec/services/auto_merge/merge_when_pipeline_succeeds_service_spec.rb @@ -217,18 +217,20 @@ RSpec.describe AutoMerge::MergeWhenPipelineSucceedsService do let(:ref) { mr_merge_if_green_enabled.source_branch } let(:sha) { project.commit(ref).id } + let(:build_stage) { create(:ci_stage, name: 'build', pipeline: pipeline) } + let(:pipeline) do create(:ci_empty_pipeline, ref: ref, sha: sha, project: project) end let!(:build) do create(:ci_build, :created, pipeline: pipeline, ref: ref, - name: 'build', stage: 'build') + name: 'build', ci_stage: build_stage ) end let!(:test) do create(:ci_build, :created, pipeline: pipeline, ref: ref, - name: 'test', stage: 'test') + name: 'test') end before do |