Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
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.rb23
1 files changed, 16 insertions, 7 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 79c931990bb..0644efd11bf 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
@@ -11,9 +11,13 @@ RSpec.describe AutoMerge::MergeWhenPipelineSucceedsService, feature_category: :c
let(:pipeline_status) { :running }
before do
- create(:ci_pipeline, pipeline_status, ref: mr_merge_if_green_enabled.source_branch,
- sha: mr_merge_if_green_enabled.diff_head_sha,
- project: mr_merge_if_green_enabled.source_project)
+ create(
+ :ci_pipeline,
+ pipeline_status,
+ ref: mr_merge_if_green_enabled.source_branch,
+ sha: mr_merge_if_green_enabled.diff_head_sha,
+ project: mr_merge_if_green_enabled.source_project
+ )
mr_merge_if_green_enabled.update_head_pipeline
end
@@ -73,13 +77,18 @@ RSpec.describe AutoMerge::MergeWhenPipelineSucceedsService, feature_category: :c
end
let!(:build) do
- create(:ci_build, :created, pipeline: pipeline, ref: ref,
- name: 'build', ci_stage: build_stage)
+ create(
+ :ci_build,
+ :created,
+ pipeline: pipeline,
+ ref: ref,
+ name: 'build',
+ ci_stage: build_stage
+ )
end
let!(:test) do
- create(:ci_build, :created, pipeline: pipeline, ref: ref,
- name: 'test')
+ create(:ci_build, :created, pipeline: pipeline, ref: ref, name: 'test')
end
before do