Merge branch 'refactor-pipeline-factories' into 'master'

Remove unnecessary ci_pipeline factories

See merge request gitlab-org/gitlab!19973

ee/spec/controllers/projects/security/dashboard_controller_spec.rb

@@ -20,7 +20,7 @@ describe Projects::Security::DashboardController do
   end
 
   describe 'GET #show' do
-    let(:pipeline) { create(:ci_pipeline_without_jobs, sha: project.commit.id, project: project, user: user) }
+    let(:pipeline) { create(:ci_pipeline, sha: project.commit.id, project: project, user: user) }
 
     render_views
 

ee/spec/features/merge_request/user_sees_deployment_widget_spec.rb

@@ -10,7 +10,7 @@ describe 'Merge request > User sees deployment widget', :js do
     let(:role) { :developer }
     let(:ref) { merge_request.target_branch }
     let(:sha) { project.commit(ref).id }
-    let(:pipeline) { create(:ci_pipeline_without_jobs, sha: sha, project: project, ref: ref) }
+    let(:pipeline) { create(:ci_pipeline, sha: sha, project: project, ref: ref) }
     let!(:manual) { }
 
     before do

ee/spec/lib/ee/gitlab/ci/pipeline/quota/size_spec.rb

@@ -14,22 +14,22 @@ describe EE::Gitlab::Ci::Pipeline::Quota::Size do
   subject { described_class.new(namespace, pipeline) }
 
   shared_context 'pipeline size limit exceeded' do
-    let(:pipeline) do
-      config = { rspec: { script: 'rspec' },
-                 spinach: { script: 'spinach' } }
-
-      build(:ci_pipeline, project: project, config: config)
-    end
-
     before do
+      config = YAML.dump({
+        rspec: { script: 'rspec' },
+        spinach: { script: 'spinach' }
+      })
+      stub_ci_pipeline_yaml_file(config)
       plan_limits.update!(ci_pipeline_size: 1)
     end
   end
 
   shared_context 'pipeline size limit not exceeded' do
-    let(:pipeline) { build(:ci_pipeline_with_one_job, project: project) }
-
     before do
+      config = YAML.dump({
+        rspec: { script: 'rspec' }
+      })
+      stub_ci_pipeline_yaml_file(config)
       plan_limits.update!(ci_pipeline_size: 2)
     end
   end

ee/spec/lib/gitlab/ci/pipeline/chain/limit/size_spec.rb

@@ -7,10 +7,7 @@ describe ::Gitlab::Ci::Pipeline::Chain::Limit::Size do
   set(:project) { create(:project, :repository, namespace: namespace) }
   set(:user) { create(:user) }
 
-  let(:pipeline) do
-    build(:ci_pipeline_with_one_job, project: project,
-                                     ref: 'master')
-  end
+  let(:pipeline) { build(:ci_pipeline, project: project) }
 
   let(:command) do
     double('command', project: project,
@@ -26,13 +23,10 @@ describe ::Gitlab::Ci::Pipeline::Chain::Limit::Size do
       gold_plan = create(:gold_plan)
       create(:plan_limits, plan: gold_plan, ci_pipeline_size: 1)
       create(:gitlab_subscription, namespace: namespace, hosted_plan: gold_plan)
-    end
-
-    let(:pipeline) do
-      config = { rspec: { script: 'rspec' },
-                 spinach: { script: 'spinach' } }
-
-      create(:ci_pipeline, project: project, config: config)
+      stub_ci_pipeline_yaml_file(YAML.dump({
+        rspec: { script: 'rspec' },
+        spinach: { script: 'spinach' }
+      }))
     end
 
     context 'when saving incomplete pipelines' do

ee/spec/lib/gitlab/ci/pipeline/chain/remove_unwanted_chat_jobs_spec.rb

-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe ::Gitlab::Ci::Pipeline::Chain::RemoveUnwantedChatJobs do
-  let(:project) { create(:project, :repository) }
-
-  let(:pipeline) do
-    build(:ci_pipeline_with_one_job, project: project, ref: 'master')
-  end
-
-  let(:command) do
-    double(:command, project: project, chat_data: { command: 'echo' })
-  end
-
-  describe '#perform!' do
-    it 'removes unwanted jobs for chat pipelines' do
-      allow(pipeline).to receive(:chat?).and_return(true)
-
-      pipeline.config_processor.jobs[:echo] = double(:job)
-
-      described_class.new(pipeline, command).perform!
-
-      expect(pipeline.config_processor.jobs.keys).to eq([:echo])
-    end
-  end
-
-  it 'does not remove any jobs for non-chat pipelines' do
-    described_class.new(pipeline, command).perform!
-
-    expect(pipeline.config_processor.jobs.keys).to eq([:rspec])
-  end
-end

ee/spec/models/ci/pipeline_spec.rb

@@ -23,9 +23,9 @@ describe Ci::Pipeline do
   end
 
   describe '#with_vulnerabilities scope' do
-    let!(:pipeline_1) { create(:ci_pipeline_without_jobs, project: project) }
-    let!(:pipeline_2) { create(:ci_pipeline_without_jobs, project: project) }
-    let!(:pipeline_3) { create(:ci_pipeline_without_jobs, project: project) }
+    let!(:pipeline_1) { create(:ci_pipeline, project: project) }
+    let!(:pipeline_2) { create(:ci_pipeline, project: project) }
+    let!(:pipeline_3) { create(:ci_pipeline, project: project) }
 
     before do
       create(:vulnerabilities_occurrence, pipelines: [pipeline_1], project: pipeline.project)

ee/spec/models/merge_request_spec.rb

@@ -597,7 +597,7 @@ describe MergeRequest do
 
   describe '#mergeable_with_quick_action?' do
     def create_pipeline(status)
-      pipeline = create(:ci_pipeline_with_one_job,
+      pipeline = create(:ci_pipeline,
         project: project,
         ref:     merge_request.source_branch,
         sha:     merge_request.diff_head_sha,

ee/spec/models/project_spec.rb

@@ -1378,9 +1378,9 @@ describe Project do
 
   describe '#latest_pipeline_with_security_reports' do
     let(:project) { create(:project) }
-    let!(:pipeline_1) { create(:ci_pipeline_without_jobs, project: project) }
-    let!(:pipeline_2) { create(:ci_pipeline_without_jobs, project: project) }
-    let!(:pipeline_3) { create(:ci_pipeline_without_jobs, project: project) }
+    let!(:pipeline_1) { create(:ci_pipeline, project: project) }
+    let!(:pipeline_2) { create(:ci_pipeline, project: project) }
+    let!(:pipeline_3) { create(:ci_pipeline, project: project) }
 
     subject { project.latest_pipeline_with_security_reports }
 

ee/spec/requests/api/vulnerability_findings_spec.rb

@@ -18,7 +18,7 @@ describe API::VulnerabilityFindings do
     end
 
     let(:pipeline) { create(:ci_empty_pipeline, status: :created, project: project) }
-    let(:pipeline_without_vulnerabilities) { create(:ci_pipeline_without_jobs, status: :created, project: project) }
+    let(:pipeline_without_vulnerabilities) { create(:ci_pipeline, status: :created, project: project) }
 
     let(:build_ds) { create(:ci_build, :success, name: 'ds_job', pipeline: pipeline, project: project) }
     let(:build_sast) { create(:ci_build, :success, name: 'sast_job', pipeline: pipeline, project: project) }

ee/spec/services/system_note_service_spec.rb

@@ -440,7 +440,7 @@ describe SystemNoteService do
   describe '.add_to_merge_train_when_pipeline_succeeds' do
     subject { described_class.add_to_merge_train_when_pipeline_succeeds(noteable, project, author, pipeline.sha) }
 
-    let(:pipeline) { build(:ci_pipeline_without_jobs) }
+    let(:pipeline) { build(:ci_pipeline) }
 
     let(:noteable) do
       create(:merge_request, source_project: project, target_project: project)

spec/controllers/projects/pipelines_controller_spec.rb

@@ -149,7 +149,7 @@ describe Projects::PipelinesController do
   end
 
   describe 'GET show.json' do
-    let(:pipeline) { create(:ci_pipeline_with_one_job, project: project) }
+    let(:pipeline) { create(:ci_pipeline, project: project) }
 
     it 'returns the pipeline' do
       get_pipeline_json

spec/factories/ci/pipelines.rb

 # frozen_string_literal: true
 
 FactoryBot.define do
+  # TODO: we can remove this factory in favour of :ci_pipeline
   factory :ci_empty_pipeline, class: Ci::Pipeline do
     source { :push }
     ref { 'master' }
@@ -10,20 +11,6 @@ FactoryBot.define do
 
     project
 
-    factory :ci_pipeline_without_jobs do
-      after(:build) do |pipeline|
-        pipeline.instance_variable_set(:@ci_yaml_file, YAML.dump({}))
-      end
-    end
-
-    factory :ci_pipeline_with_one_job do
-      after(:build) do |pipeline|
-        allow(pipeline).to receive(:ci_yaml_file) do
-          pipeline.instance_variable_set(:@ci_yaml_file, YAML.dump({ rspec: { script: "ls" } }))
-        end
-      end
-    end
-
     # Persist merge request head_pipeline_id
     # on pipeline factories to avoid circular references
     transient { head_pipeline_of { nil } }
@@ -34,24 +21,8 @@ FactoryBot.define do
     end
 
     factory :ci_pipeline do
-      transient { config { nil } }
-
-      after(:build) do |pipeline, evaluator|
-        if evaluator.config
-          pipeline.instance_variable_set(:@ci_yaml_file, YAML.dump(evaluator.config))
-
-          # Populates pipeline with errors
-          pipeline.config_processor if evaluator.config
-        else
-          pipeline.instance_variable_set(:@ci_yaml_file, File.read(Rails.root.join('spec/support/gitlab_stubs/gitlab_ci.yml')))
-        end
-      end
-
       trait :invalid do
-        config do
-          { rspec: nil }
-        end
-
+        yaml_errors { 'invalid YAML' }
         failure_reason { :config_error }
       end
 

spec/factories/commit_statuses.rb

@@ -7,7 +7,7 @@ FactoryBot.define do
     stage_idx { 0 }
     status { 'success' }
     description { 'commit status'}
-    pipeline factory: :ci_pipeline_with_one_job
+    pipeline factory: :ci_pipeline
     started_at { 'Tue, 26 Jan 2016 08:21:42 +0100'}
     finished_at { 'Tue, 26 Jan 2016 08:23:42 +0100'}
 

spec/features/merge_request/user_sees_deployment_widget_spec.rb

@@ -11,7 +11,7 @@ describe 'Merge request > User sees deployment widget', :js do
     let(:role) { :developer }
     let(:ref) { merge_request.target_branch }
     let(:sha) { project.commit(ref).id }
-    let(:pipeline) { create(:ci_pipeline_without_jobs, sha: sha, project: project, ref: ref) }
+    let(:pipeline) { create(:ci_pipeline, sha: sha, project: project, ref: ref) }
     let!(:manual) { }
 
     before do
@@ -33,7 +33,7 @@ describe 'Merge request > User sees deployment widget', :js do
       end
 
       context 'when a user created a new merge request with the same SHA' do
-        let(:pipeline2) { create(:ci_pipeline_without_jobs, sha: sha, project: project, ref: 'new-patch-1') }
+        let(:pipeline2) { create(:ci_pipeline, sha: sha, project: project, ref: 'new-patch-1') }
         let(:build2) { create(:ci_build, :success, pipeline: pipeline2) }
         let(:environment2) { create(:environment, project: project) }
         let!(:deployment2) { create(:deployment, environment: environment2, sha: sha, ref: 'new-patch-1', deployable: build2) }

spec/features/merge_request/user_sees_merge_widget_spec.rb

@@ -44,7 +44,7 @@ describe 'Merge request > User sees merge widget', :js do
   context 'view merge request' do
     let!(:environment) { create(:environment, project: project) }
     let(:sha)          { project.commit(merge_request.source_branch).sha }
-    let(:pipeline)     { create(:ci_pipeline_without_jobs, status: 'success', sha: sha, project: project, ref: merge_request.source_branch) }
+    let(:pipeline)     { create(:ci_pipeline, status: 'success', sha: sha, project: project, ref: merge_request.source_branch) }
     let(:build)        { create(:ci_build, :success, pipeline: pipeline) }
 
     let!(:deployment) do
@@ -745,7 +745,7 @@ describe 'Merge request > User sees merge widget', :js do
 
   context 'when MR has pipeline but user does not have permission' do
     let(:sha) { project.commit(merge_request.source_branch).sha }
-    let!(:pipeline) { create(:ci_pipeline_without_jobs, status: 'success', sha: sha, project: project, ref: merge_request.source_branch) }
+    let!(:pipeline) { create(:ci_pipeline, status: 'success', sha: sha, project: project, ref: merge_request.source_branch) }
 
     before do
       project.update(

spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb

@@ -7,9 +7,7 @@ describe Gitlab::Ci::Pipeline::Chain::Populate do
   set(:user) { create(:user) }
 
   let(:pipeline) do
-    build(:ci_pipeline_with_one_job, project: project,
-                                     ref: 'master',
-                                     user: user)
+    build(:ci_pipeline, project: project, ref: 'master', user: user)
   end
 
   let(:command) do
@@ -22,6 +20,14 @@ describe Gitlab::Ci::Pipeline::Chain::Populate do
 
   let(:step) { described_class.new(pipeline, command) }
 
+  let(:config) do
+    { rspec: { script: 'rspec' } }
+  end
+
+  before do
+    stub_ci_pipeline_yaml_file(YAML.dump(config))
+  end
+
   context 'when pipeline doesn not have seeds block' do
     before do
       step.perform!
@@ -59,10 +65,6 @@ describe Gitlab::Ci::Pipeline::Chain::Populate do
       } }
     end
 
-    let(:pipeline) do
-      build(:ci_pipeline, project: project, config: config)
-    end
-
     before do
       step.perform!
     end
@@ -202,10 +204,6 @@ describe Gitlab::Ci::Pipeline::Chain::Populate do
           prod: { script: 'cap prod', stage: 'deploy', only: ['tags'] } }
       end
 
-      let(:pipeline) do
-        build(:ci_pipeline, ref: 'master', project: project, config: config)
-      end
-
       it_behaves_like 'a correct pipeline'
 
       context 'when variables expression is specified' do

spec/lib/gitlab/ci/pipeline/chain/remove_unwanted_chat_jobs_spec.rb

@@ -6,13 +6,17 @@ describe Gitlab::Ci::Pipeline::Chain::RemoveUnwantedChatJobs do
   let(:project) { create(:project, :repository) }
 
   let(:pipeline) do
-    build(:ci_pipeline_with_one_job, project: project, ref: 'master')
+    build(:ci_pipeline, project: project)
   end
 
   let(:command) do
     double(:command, project: project, chat_data: { command: 'echo' })
   end
 
+  before do
+    stub_ci_pipeline_yaml_file(YAML.dump(rspec: { script: 'rspec' }))
+  end
+
   describe '#perform!' do
     it 'removes unwanted jobs for chat pipelines' do
       allow(pipeline).to receive(:chat?).and_return(true)

spec/lib/gitlab/ci/pipeline/chain/validate/config_spec.rb

@@ -13,11 +13,13 @@ describe Gitlab::Ci::Pipeline::Chain::Validate::Config do
       save_incompleted: true)
   end
 
+  let(:pipeline) do
+    build(:ci_pipeline, project: project)
+  end
+
   let!(:step) { described_class.new(pipeline, command) }
 
-  before do
-    step.perform!
-  end
+  subject { step.perform! }
 
   context 'when pipeline has no YAML configuration' do
     let(:pipeline) do
@@ -25,18 +27,23 @@ describe Gitlab::Ci::Pipeline::Chain::Validate::Config do
     end
 
     it 'appends errors about missing configuration' do
+      subject
+
       expect(pipeline.errors.to_a)
         .to include 'Missing .gitlab-ci.yml file'
     end
 
     it 'breaks the chain' do
+      subject
+
       expect(step.break?).to be true
     end
   end
 
   context 'when YAML configuration contains errors' do
-    let(:pipeline) do
-      build(:ci_pipeline, project: project, config: 'invalid YAML')
+    before do
+      stub_ci_pipeline_yaml_file('invalid YAML')
+      subject
     end
 
     it 'appends errors about YAML errors' do
@@ -56,10 +63,14 @@ describe Gitlab::Ci::Pipeline::Chain::Validate::Config do
       end
 
       it 'fails the pipeline' do
+        subject
+
         expect(pipeline.reload).to be_failed
       end
 
       it 'sets a config error failure reason' do
+        subject
+
         expect(pipeline.reload.config_error?).to eq true
       end
     end
@@ -72,6 +83,8 @@ describe Gitlab::Ci::Pipeline::Chain::Validate::Config do
       end
 
       it 'does not drop pipeline' do
+        subject
+
         expect(pipeline).not_to be_failed
         expect(pipeline).not_to be_persisted
       end
@@ -79,17 +92,15 @@ describe Gitlab::Ci::Pipeline::Chain::Validate::Config do
   end
 
   context 'when pipeline contains configuration validation errors' do
-    let(:config) do
-      {
+    before do
+      stub_ci_pipeline_yaml_file(YAML.dump({
         rspec: {
           before_script: 10,
           script: 'ls -al'
         }
-      }
-    end
+      }))
 
-    let(:pipeline) do
-      build(:ci_pipeline, project: project, config: config)
+      subject
     end
 
     it 'appends configuration validation errors to pipeline errors' do
@@ -103,8 +114,13 @@ describe Gitlab::Ci::Pipeline::Chain::Validate::Config do
   end
 
   context 'when pipeline is correct and complete' do
-    let(:pipeline) do
-      build(:ci_pipeline_with_one_job, project: project)
+    before do
+      stub_ci_pipeline_yaml_file(YAML.dump({
+        rspec: {
+          script: 'rspec'
+        }
+      }))
+      subject
     end
 
     it 'does not invalidate the pipeline' do
@@ -119,6 +135,7 @@ describe Gitlab::Ci::Pipeline::Chain::Validate::Config do
   context 'when pipeline source is merge request' do
     before do
       stub_ci_pipeline_yaml_file(YAML.dump(config))
+      subject
     end
 
     let(:pipeline) { build_stubbed(:ci_pipeline, project: project) }

spec/lib/gitlab/import_export/fast_hash_serializer_spec.rb

@@ -132,10 +132,6 @@ describe Gitlab::ImportExport::FastHashSerializer do
   end
 
   it 'has no when YML attributes but only the DB column' do
-    allow_any_instance_of(Ci::Pipeline)
-      .to receive(:ci_yaml_file)
-      .and_return(File.read(Rails.root.join('spec/support/gitlab_stubs/gitlab_ci.yml')))
-
     expect_any_instance_of(Gitlab::Ci::YamlProcessor).not_to receive(:build_attributes)
 
     subject

spec/lib/gitlab/import_export/project_tree_saver_spec.rb

@@ -203,7 +203,6 @@ describe Gitlab::ImportExport::ProjectTreeSaver do
       end
 
       it 'has no when YML attributes but only the DB column' do
-        allow_any_instance_of(Ci::Pipeline).to receive(:ci_yaml_file).and_return(File.read(Rails.root.join('spec/support/gitlab_stubs/gitlab_ci.yml')))
         expect_any_instance_of(Gitlab::Ci::YamlProcessor).not_to receive(:build_attributes)
 
         saved_project_json

spec/models/ci/pipeline_spec.rb

@@ -980,7 +980,11 @@ describe Ci::Pipeline, :mailer do
 
   describe 'pipeline stages' do
     describe '#stage_seeds' do
-      let(:pipeline) { build(:ci_pipeline, config: config) }
+      before do
+        stub_ci_pipeline_yaml_file(YAML.dump(config))
+      end
+
+      let(:pipeline) { build(:ci_pipeline) }
       let(:config) { { rspec: { script: 'rake' } } }
 
       it 'returns preseeded stage seeds object' do
@@ -1010,7 +1014,7 @@ describe Ci::Pipeline, :mailer do
 
       context 'when refs policy is specified' do
         let(:pipeline) do
-          build(:ci_pipeline, ref: 'feature', tag: true, config: config)
+          build(:ci_pipeline, ref: 'feature', tag: true)
         end
 
         let(:config) do
@@ -1028,7 +1032,7 @@ describe Ci::Pipeline, :mailer do
       end
 
       context 'when source policy is specified' do
-        let(:pipeline) { build(:ci_pipeline, source: :schedule, config: config) }
+        let(:pipeline) { build(:ci_pipeline, source: :schedule) }
 
         let(:config) do
           { production: { stage: 'deploy', script: 'cap prod', only: ['triggers'] },
@@ -1060,7 +1064,7 @@ describe Ci::Pipeline, :mailer do
           context 'when user configured kubernetes from CI/CD > Clusters' do
             let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
             let(:project) { cluster.project }
-            let(:pipeline) { build(:ci_pipeline, project: project, config: config) }
+            let(:pipeline) { build(:ci_pipeline, project: project) }
 
             it 'returns seeds for kubernetes dependent job' do
               seeds = pipeline.stage_seeds
@@ -1098,6 +1102,10 @@ describe Ci::Pipeline, :mailer do
     end
 
     describe '#seeds_size' do
+      before do
+        stub_ci_pipeline_yaml_file(YAML.dump(config))
+      end
+
       context 'when refs policy is specified' do
         let(:config) do
           { production: { stage: 'deploy', script: 'cap prod', only: ['master'] },
@@ -1105,7 +1113,7 @@ describe Ci::Pipeline, :mailer do
         end
 
         let(:pipeline) do
-          build(:ci_pipeline, ref: 'feature', tag: true, config: config)
+          build(:ci_pipeline, ref: 'feature', tag: true)
         end
 
         it 'returns real seeds size' do
@@ -2886,21 +2894,25 @@ describe Ci::Pipeline, :mailer do
   end
 
   describe '#has_yaml_errors?' do
+    before do
+      stub_ci_pipeline_yaml_file(YAML.dump(config))
+    end
+
+    let(:pipeline) { create(:ci_pipeline) }
+
     context 'when pipeline has errors' do
-      let(:pipeline) do
-        create(:ci_pipeline, config: { rspec: nil })
-      end
+      let(:config) { { rspec: nil } }
 
       it 'contains yaml errors' do
+        pipeline.config_processor
+
         expect(pipeline).to have_yaml_errors
         expect(pipeline.yaml_errors).to include('contains unknown keys')
       end
     end
 
     context 'when pipeline has undefined error' do
-      let(:pipeline) do
-        create(:ci_pipeline, config: {})
-      end
+      let(:config) { double(:config) }
 
       it 'contains yaml errors' do
         expect(::Gitlab::Ci::YamlProcessor).to receive(:new)
@@ -2910,14 +2922,16 @@ describe Ci::Pipeline, :mailer do
           .with(be_a(RuntimeError), anything)
           .and_call_original
 
+        pipeline.config_processor
+
         expect(pipeline).to have_yaml_errors
         expect(pipeline.yaml_errors).to include('Undefined error')
       end
     end
 
     context 'when pipeline does not have errors' do
-      let(:pipeline) do
-        create(:ci_pipeline, config: { rspec: { script: 'rake test' } })
+      let(:config) do
+        { rspec: { script: 'rake test' } }
       end
 
       it 'does not contain yaml errors' do

spec/models/merge_request_spec.rb

@@ -2807,7 +2807,7 @@ describe MergeRequest do
 
   describe '#mergeable_with_quick_action?' do
     def create_pipeline(status)
-      pipeline = create(:ci_pipeline_with_one_job,
+      pipeline = create(:ci_pipeline,
         project: project,
         ref:     merge_request.source_branch,
         sha:     merge_request.diff_head_sha,
@@ -2922,9 +2922,9 @@ describe MergeRequest do
     let(:project) { create(:project, :public, :repository) }
     let(:merge_request) { create(:merge_request, source_project: project) }
 
-    let!(:first_pipeline) { create(:ci_pipeline_without_jobs, pipeline_arguments) }
-    let!(:last_pipeline) { create(:ci_pipeline_without_jobs, pipeline_arguments) }
-    let!(:last_pipeline_with_other_ref) { create(:ci_pipeline_without_jobs, pipeline_arguments.merge(ref: 'other')) }
+    let!(:first_pipeline) { create(:ci_pipeline, pipeline_arguments) }
+    let!(:last_pipeline) { create(:ci_pipeline, pipeline_arguments) }
+    let!(:last_pipeline_with_other_ref) { create(:ci_pipeline, pipeline_arguments.merge(ref: 'other')) }
 
     it 'returns latest pipeline for the target branch' do
       expect(merge_request.base_pipeline).to eq(last_pipeline)

spec/requests/api/merge_requests_spec.rb

@@ -12,7 +12,7 @@ describe API::MergeRequests do
   let(:project)     { create(:project, :public, :repository, creator: user, namespace: user.namespace, only_allow_merge_if_pipeline_succeeds: false) }
   let(:milestone)   { create(:milestone, title: '1.0.0', project: project) }
   let(:milestone1)  { create(:milestone, title: '0.9', project: project) }
-  let!(:merge_request) { create(:merge_request, :simple, milestone: milestone1, author: user, assignees: [user], source_project: project, target_project: project, title: "Test", created_at: base_time) }
+  let!(:merge_request) { create(:merge_request, :simple, milestone: milestone1, author: user, assignees: [user], source_project: project, target_project: project, source_branch: 'markdown', title: "Test", created_at: base_time) }
   let!(:merge_request_closed) { create(:merge_request, state: "closed", milestone: milestone1, author: user, assignees: [user], source_project: project, target_project: project, title: "Closed test", created_at: base_time + 1.second) }
   let!(:merge_request_merged) { create(:merge_request, state: "merged", author: user, assignees: [user], source_project: project, target_project: project, title: "Merged test", created_at: base_time + 2.seconds, merge_commit_sha: '9999999999999999999999999999999999999999') }
   let!(:merge_request_locked) { create(:merge_request, state: "locked", milestone: milestone1, author: user, assignees: [user], source_project: project, target_project: project, title: "Locked test", created_at: base_time + 1.second) }
@@ -1330,7 +1330,7 @@ describe API::MergeRequests do
       context 'accepts remove_source_branch parameter' do
         let(:params) do
           { title: 'Test merge_request',
-            source_branch: 'markdown',
+            source_branch: 'feature_conflict',
             target_branch: 'master',
             author: user }
         end
@@ -1490,7 +1490,7 @@ describe API::MergeRequests do
   end
 
   describe "PUT /projects/:id/merge_requests/:merge_request_iid/merge" do
-    let(:pipeline) { create(:ci_pipeline_without_jobs) }
+    let(:pipeline) { create(:ci_pipeline) }
 
     it "returns merge_request in case of success" do
       put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/merge", user)

spec/requests/api/runner_spec.rb

@@ -314,7 +314,7 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
     let(:root_namespace) { create(:namespace) }
     let(:namespace) { create(:namespace, parent: root_namespace) }
     let(:project) { create(:project, namespace: namespace, shared_runners_enabled: false) }
-    let(:pipeline) { create(:ci_pipeline_without_jobs, project: project, ref: 'master') }
+    let(:pipeline) { create(:ci_pipeline, project: project, ref: 'master') }
     let(:runner) { create(:ci_runner, :project, projects: [project]) }
     let(:job) do
       create(:ci_build, :artifacts, :extended_options,
@@ -612,7 +612,7 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
           end
 
           context 'when job is made for merge request' do
-            let(:pipeline) { create(:ci_pipeline_without_jobs, source: :merge_request_event, project: project, ref: 'feature', merge_request: merge_request) }
+            let(:pipeline) { create(:ci_pipeline, source: :merge_request_event, project: project, ref: 'feature', merge_request: merge_request) }
             let!(:job) { create(:ci_build, pipeline: pipeline, name: 'spinach', ref: 'feature', stage: 'test', stage_idx: 0) }
             let(:merge_request) { create(:merge_request) }
 

spec/serializers/pipeline_details_entity_spec.rb

@@ -115,7 +115,7 @@ describe PipelineDetailsEntity do
 
     context 'when pipeline has YAML errors' do
       let(:pipeline) do
-        create(:ci_pipeline, config: { rspec: { invalid: :value } })
+        create(:ci_pipeline, yaml_errors: 'Some error occurred')
       end
 
       it 'contains information about error' do

spec/services/auto_merge/merge_when_pipeline_succeeds_service_spec.rb

@@ -13,8 +13,7 @@ describe AutoMerge::MergeWhenPipelineSucceedsService do
   end
 
   let(:pipeline) do
-    create(:ci_pipeline_with_one_job, ref: mr_merge_if_green_enabled.source_branch,
-                                      project: project)
+    create(:ci_pipeline, ref: mr_merge_if_green_enabled.source_branch, project: project)
   end
 
   let(:service) do

spec/services/merge_requests/add_todo_when_build_fails_service_spec.rb

@@ -10,9 +10,7 @@ describe MergeRequests::AddTodoWhenBuildFailsService do
   let(:ref) { merge_request.source_branch }
 
   let(:pipeline) do
-    create(:ci_pipeline_with_one_job, ref: ref,
-                                      project: project,
-                                      sha: sha)
+    create(:ci_pipeline, ref: ref, project: project, sha: sha)
   end
 
   let(:service) do

spec/services/merge_requests/update_service_spec.rb

@@ -190,7 +190,7 @@ describe MergeRequests::UpdateService, :mailer do
 
       context 'with finished pipeline' do
         before do
-          create(:ci_pipeline_with_one_job,
+          create(:ci_pipeline,
             project: project,
             ref:     merge_request.source_branch,
             sha:     merge_request.diff_head_sha,
@@ -212,7 +212,7 @@ describe MergeRequests::UpdateService, :mailer do
         before do
           service_mock = double
           create(
-            :ci_pipeline_with_one_job,
+            :ci_pipeline,
             project: project,
             ref: merge_request.source_branch,
             sha: merge_request.diff_head_sha,

spec/services/system_notes/merge_requests_service_spec.rb

@@ -14,7 +14,7 @@ describe ::SystemNotes::MergeRequestsService do
   let(:service) { described_class.new(noteable: noteable, project: project, author: author) }
 
   describe '.merge_when_pipeline_succeeds' do
-    let(:pipeline) { build(:ci_pipeline_without_jobs )}
+    let(:pipeline) { build(:ci_pipeline) }
 
     subject { service.merge_when_pipeline_succeeds(pipeline.sha) }