Fix tests failures

7 files changed, 44 insertions, 44 deletions

diff --git a/app/services/ci/create_builds_service.rb b/app/services/ci/create_builds_service.rb
index 41ce6982cbe..64bcdac5c65 100644
--- a/app/services/ci/create_builds_service.rb
+++ b/app/services/ci/create_builds_service.rb
@@ -5,7 +5,7 @@ module Ci
     end
 
     def execute(stage, user, status, trigger_request = nil)
-      builds_attrs = config_processor.builds_for_stage_and_ref(stage, @commit.ref, @commit.tag, trigger_request)
+      builds_attrs = config_processor.builds_for_stage_and_ref(stage, @pipeline.ref, @pipeline.tag, trigger_request)
 
       # check when to create next build
       builds_attrs = builds_attrs.select do |build_attrs|
diff --git a/spec/features/merge_requests/created_from_fork_spec.rb b/spec/features/merge_requests/created_from_fork_spec.rb
index 12d7e52629e..b4d2201c729 100644
--- a/spec/features/merge_requests/created_from_fork_spec.rb
+++ b/spec/features/merge_requests/created_from_fork_spec.rb
@@ -30,8 +30,8 @@ feature 'Merge request created from fork' do
 
     given(:pipeline) do
       create(:ci_pipeline_with_two_job, project: fork_project,
-                                       sha: merge_request.last_commit.id,
-                                       ref: merge_request.source_branch)
+                                        sha: merge_request.last_commit.id,
+                                        ref: merge_request.source_branch)
     end
 
     background { pipeline.create_builds(user) }
diff --git a/spec/features/projects/commit/builds_spec.rb b/spec/features/projects/commit/builds_spec.rb
index 73dd568929a..15c381c0f5a 100644
--- a/spec/features/projects/commit/builds_spec.rb
+++ b/spec/features/projects/commit/builds_spec.rb
@@ -12,8 +12,8 @@ feature 'project commit builds' do
   context 'when no builds triggered yet' do
     background do
       create(:ci_pipeline, project: project,
-                         sha: project.commit.sha,
-                         ref: 'master')
+                           sha: project.commit.sha,
+                           ref: 'master')
     end
 
     scenario 'user views commit builds page' do
diff --git a/spec/lib/gitlab/badge/build_spec.rb b/spec/lib/gitlab/badge/build_spec.rb
index aec5a5bc3b2..2034445a197 100644
--- a/spec/lib/gitlab/badge/build_spec.rb
+++ b/spec/lib/gitlab/badge/build_spec.rb
@@ -110,8 +110,8 @@ describe Gitlab::Badge::Build do
 
   def create_build(project, sha, branch)
     pipeline = create(:ci_pipeline, project: project,
-                                        sha: sha,
-                                        ref: branch)
+                                    sha: sha,
+                                    ref: branch)
 
     create(:ci_build, pipeline: pipeline)
   end
diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb
index 2beb6cc598d..7660ea2659c 100644
--- a/spec/models/build_spec.rb
+++ b/spec/models/build_spec.rb
@@ -219,7 +219,7 @@ describe Ci::Build, models: true do
 
         context 'and trigger variables' do
           let(:trigger) { create(:ci_trigger, project: project) }
-          let(:trigger_request) { create(:ci_trigger_request_with_variables, pipeline: pipeline, trigger: trigger) }
+          let(:trigger_request) { create(:ci_trigger_request_with_variables, commit: pipeline, trigger: trigger) }
           let(:trigger_variables) do
             [
               { key: :TRIGGER_KEY, value: 'TRIGGER_VALUE', public: false }
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 89f66092b15..3431d0435b4 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -401,7 +401,7 @@ describe Project, models: true do
 
   describe :pipeline do
     let(:project) { create :project }
-    let(:pipeline) { create :pipeline, project: project, ref: 'master' }
+    let(:pipeline) { create :ci_pipeline, project: project, ref: 'master' }
 
     subject { project.pipeline(pipeline.sha, 'master') }
 
diff --git a/spec/services/create_commit_builds_service_spec.rb b/spec/services/create_commit_builds_service_spec.rb
index 706319b63ed..77247a1d5a5 100644
--- a/spec/services/create_commit_builds_service_spec.rb
+++ b/spec/services/create_commit_builds_service_spec.rb
@@ -70,11 +70,11 @@ describe CreateCommitBuildsService, services: true do
       stub_ci_pipeline_yaml_file('invalid: file: file')
       commits = [{ message: message }]
       pipeline = service.execute(project, user,
-                               ref: 'refs/tags/0_1',
-                               before: '00000000',
-                               after: '31das312',
-                               commits: commits
-                              )
+                                 ref: 'refs/tags/0_1',
+                                 before: '00000000',
+                                 after: '31das312',
+                                 commits: commits
+                                 )
       expect(pipeline).to be_persisted
       expect(pipeline.builds.any?).to be false
       expect(pipeline.status).to eq('failed')
@@ -91,11 +91,11 @@ describe CreateCommitBuildsService, services: true do
       it "skips builds creation if there is [ci skip] tag in commit message" do
         commits = [{ message: message }]
         pipeline = service.execute(project, user,
-                                 ref: 'refs/tags/0_1',
-                                 before: '00000000',
-                                 after: '31das312',
-                                 commits: commits
-                                )
+                                   ref: 'refs/tags/0_1',
+                                   before: '00000000',
+                                   after: '31das312',
+                                   commits: commits
+                                   )
         expect(pipeline).to be_persisted
         expect(pipeline.builds.any?).to be false
         expect(pipeline.status).to eq("skipped")
@@ -106,11 +106,11 @@ describe CreateCommitBuildsService, services: true do
 
         commits = [{ message: "some message" }]
         pipeline = service.execute(project, user,
-                                 ref: 'refs/tags/0_1',
-                                 before: '00000000',
-                                 after: '31das312',
-                                 commits: commits
-                                )
+                                   ref: 'refs/tags/0_1',
+                                   before: '00000000',
+                                   after: '31das312',
+                                   commits: commits
+                                   )
 
         expect(pipeline).to be_persisted
         expect(pipeline.builds.first.name).to eq("staging")
@@ -120,11 +120,11 @@ describe CreateCommitBuildsService, services: true do
         stub_ci_pipeline_yaml_file('invalid: file: fiile')
         commits = [{ message: message }]
         pipeline = service.execute(project, user,
-                                 ref: 'refs/tags/0_1',
-                                 before: '00000000',
-                                 after: '31das312',
-                                 commits: commits
-                                )
+                                   ref: 'refs/tags/0_1',
+                                   before: '00000000',
+                                   after: '31das312',
+                                   commits: commits
+                                   )
         expect(pipeline).to be_persisted
         expect(pipeline.builds.any?).to be false
         expect(pipeline.status).to eq("skipped")
@@ -137,20 +137,20 @@ describe CreateCommitBuildsService, services: true do
 
       commits = [{ message: "message" }]
       pipeline = service.execute(project, user,
-                               ref: 'refs/heads/master',
-                               before: '00000000',
-                               after: '31das312',
-                               commits: commits
-                              )
+                                 ref: 'refs/heads/master',
+                                 before: '00000000',
+                                 after: '31das312',
+                                 commits: commits
+                                 )
       expect(pipeline).to be_persisted
       expect(pipeline.builds.count(:all)).to eq(2)
 
       pipeline = service.execute(project, user,
-                               ref: 'refs/heads/master',
-                               before: '00000000',
-                               after: '31das312',
-                               commits: commits
-                              )
+                                 ref: 'refs/heads/master',
+                                 before: '00000000',
+                                 after: '31das312',
+                                 commits: commits
+                                 )
       expect(pipeline).to be_persisted
       expect(pipeline.builds.count(:all)).to eq(2)
     end
@@ -161,11 +161,11 @@ describe CreateCommitBuildsService, services: true do
       commits = [{ message: "some message" }]
 
       pipeline = service.execute(project, user,
-                               ref: 'refs/tags/0_1',
-                               before: '00000000',
-                               after: '31das312',
-                               commits: commits
-                              )
+                                 ref: 'refs/tags/0_1',
+                                 before: '00000000',
+                                 after: '31das312',
+                                 commits: commits
+                                 )
 
       expect(pipeline).to be_persisted
       expect(pipeline.status).to eq("failed")