Merge branch 'master' into zj-auto-devops-table

6 files changed, 137 insertions, 88 deletions

diff --git a/spec/services/ci/create_pipeline_service_spec.rb b/spec/services/ci/create_pipeline_service_spec.rb
index dce313fa12f..4775ba4c2d8 100644
--- a/spec/services/ci/create_pipeline_service_spec.rb
+++ b/spec/services/ci/create_pipeline_service_spec.rb
@@ -391,12 +391,15 @@ describe Ci::CreatePipelineService do
       end
 
       context 'when user is master' do
+        let(:pipeline) { execute_service }
+
         before do
           project.add_master(user)
         end
 
-        it 'creates a pipeline' do
-          expect(execute_service).to be_persisted
+        it 'creates a protected pipeline' do
+          expect(pipeline).to be_persisted
+          expect(pipeline).to be_protected
           expect(Ci::Pipeline.count).to eq(1)
         end
       end
@@ -468,10 +471,11 @@ describe Ci::CreatePipelineService do
         let(:user) {}
         let(:trigger) { create(:ci_trigger, owner: nil) }
         let(:trigger_request) { create(:ci_trigger_request, trigger: trigger) }
+        let(:pipeline) { execute_service(trigger_request: trigger_request) }
 
-        it 'creates a pipeline' do
-          expect(execute_service(trigger_request: trigger_request))
-            .to be_persisted
+        it 'creates an unprotected pipeline' do
+          expect(pipeline).to be_persisted
+          expect(pipeline).not_to be_protected
           expect(Ci::Pipeline.count).to eq(1)
         end
       end
diff --git a/spec/services/ci/create_trigger_request_service_spec.rb b/spec/services/ci/create_trigger_request_service_spec.rb
deleted file mode 100644
index 8295813a1ca..00000000000
--- a/spec/services/ci/create_trigger_request_service_spec.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-require 'spec_helper'
-
-describe Ci::CreateTriggerRequestService do
-  let(:service) { described_class }
-  let(:project) { create(:project, :repository) }
-  let(:trigger) { create(:ci_trigger, project: project, owner: owner) }
-  let(:owner) { create(:user) }
-
-  before do
-    stub_ci_pipeline_to_return_yaml_file
-
-    project.add_developer(owner)
-  end
-
-  describe '#execute' do
-    context 'valid params' do
-      subject { service.execute(project, trigger, 'master') }
-
-      context 'without owner' do
-        it { expect(subject.trigger_request).to be_kind_of(Ci::TriggerRequest) }
-        it { expect(subject.trigger_request.builds.first).to be_kind_of(Ci::Build) }
-        it { expect(subject.pipeline).to be_kind_of(Ci::Pipeline) }
-        it { expect(subject.pipeline).to be_trigger }
-      end
-
-      context 'with owner' do
-        it { expect(subject.trigger_request).to be_kind_of(Ci::TriggerRequest) }
-        it { expect(subject.trigger_request.builds.first).to be_kind_of(Ci::Build) }
-        it { expect(subject.trigger_request.builds.first.user).to eq(owner) }
-        it { expect(subject.pipeline).to be_kind_of(Ci::Pipeline) }
-        it { expect(subject.pipeline).to be_trigger }
-        it { expect(subject.pipeline.user).to eq(owner) }
-      end
-    end
-
-    context 'no commit for ref' do
-      subject { service.execute(project, trigger, 'other-branch') }
-
-      it { expect(subject.pipeline).not_to be_persisted }
-    end
-
-    context 'no builds created' do
-      subject { service.execute(project, trigger, 'master') }
-
-      before do
-        stub_ci_pipeline_yaml_file('script: { only: [develop], script: hello World }')
-      end
-
-      it { expect(subject.pipeline).not_to be_persisted }
-    end
-  end
-end
diff --git a/spec/services/ci/register_job_service_spec.rb b/spec/services/ci/register_job_service_spec.rb
index 8eb0d2d10a4..5ac30111ec9 100644
--- a/spec/services/ci/register_job_service_spec.rb
+++ b/spec/services/ci/register_job_service_spec.rb
@@ -4,7 +4,7 @@ module Ci
   describe RegisterJobService do
     let!(:project) { FactoryGirl.create :project, shared_runners_enabled: false }
     let!(:pipeline) { FactoryGirl.create :ci_pipeline, project: project }
-    let!(:pending_build) { FactoryGirl.create :ci_build, pipeline: pipeline }
+    let!(:pending_job) { FactoryGirl.create :ci_build, pipeline: pipeline }
     let!(:shared_runner) { FactoryGirl.create(:ci_runner, is_shared: true) }
     let!(:specific_runner) { FactoryGirl.create(:ci_runner, is_shared: false) }
 
@@ -15,32 +15,32 @@ module Ci
     describe '#execute' do
       context 'runner follow tag list' do
         it "picks build with the same tag" do
-          pending_build.tag_list = ["linux"]
-          pending_build.save
+          pending_job.tag_list = ["linux"]
+          pending_job.save
           specific_runner.tag_list = ["linux"]
-          expect(execute(specific_runner)).to eq(pending_build)
+          expect(execute(specific_runner)).to eq(pending_job)
         end
 
         it "does not pick build with different tag" do
-          pending_build.tag_list = ["linux"]
-          pending_build.save
+          pending_job.tag_list = ["linux"]
+          pending_job.save
           specific_runner.tag_list = ["win32"]
           expect(execute(specific_runner)).to be_falsey
         end
 
         it "picks build without tag" do
-          expect(execute(specific_runner)).to eq(pending_build)
+          expect(execute(specific_runner)).to eq(pending_job)
         end
 
         it "does not pick build with tag" do
-          pending_build.tag_list = ["linux"]
-          pending_build.save
+          pending_job.tag_list = ["linux"]
+          pending_job.save
           expect(execute(specific_runner)).to be_falsey
         end
 
         it "pick build without tag" do
           specific_runner.tag_list = ["win32"]
-          expect(execute(specific_runner)).to eq(pending_build)
+          expect(execute(specific_runner)).to eq(pending_job)
         end
       end
 
@@ -76,7 +76,7 @@ module Ci
           let!(:pipeline2) { create :ci_pipeline, project: project2 }
           let!(:project3) { create :project, shared_runners_enabled: true }
           let!(:pipeline3) { create :ci_pipeline, project: project3 }
-          let!(:build1_project1) { pending_build }
+          let!(:build1_project1) { pending_job }
           let!(:build2_project1) { FactoryGirl.create :ci_build, pipeline: pipeline }
           let!(:build3_project1) { FactoryGirl.create :ci_build, pipeline: pipeline }
           let!(:build1_project2) { FactoryGirl.create :ci_build, pipeline: pipeline2 }
@@ -172,7 +172,7 @@ module Ci
 
       context 'when first build is stalled' do
         before do
-          pending_build.lock_version = 10
+          pending_job.lock_version = 10
         end
 
         subject { described_class.new(specific_runner).execute }
@@ -182,7 +182,7 @@ module Ci
 
           before do
             allow_any_instance_of(Ci::RegisterJobService).to receive(:builds_for_specific_runner)
-              .and_return([pending_build, other_build])
+              .and_return([pending_job, other_build])
           end
 
           it "receives second build from the queue" do
@@ -194,7 +194,7 @@ module Ci
         context 'when single build is in queue' do
           before do
             allow_any_instance_of(Ci::RegisterJobService).to receive(:builds_for_specific_runner)
-              .and_return([pending_build])
+              .and_return([pending_job])
           end
 
           it "does not receive any valid result" do
@@ -215,6 +215,70 @@ module Ci
         end
       end
 
+      context 'when access_level of runner is not_protected' do
+        let!(:specific_runner) { create(:ci_runner, :specific) }
+
+        context 'when a job is protected' do
+          let!(:pending_job) { create(:ci_build, :protected, pipeline: pipeline) }
+
+          it 'picks the job' do
+            expect(execute(specific_runner)).to eq(pending_job)
+          end
+        end
+
+        context 'when a job is unprotected' do
+          let!(:pending_job) { create(:ci_build, pipeline: pipeline) }
+
+          it 'picks the job' do
+            expect(execute(specific_runner)).to eq(pending_job)
+          end
+        end
+
+        context 'when protected attribute of a job is nil' do
+          let!(:pending_job) { create(:ci_build, pipeline: pipeline) }
+
+          before do
+            pending_job.update_attribute(:protected, nil)
+          end
+
+          it 'picks the job' do
+            expect(execute(specific_runner)).to eq(pending_job)
+          end
+        end
+      end
+
+      context 'when access_level of runner is ref_protected' do
+        let!(:specific_runner) { create(:ci_runner, :ref_protected, :specific) }
+
+        context 'when a job is protected' do
+          let!(:pending_job) { create(:ci_build, :protected, pipeline: pipeline) }
+
+          it 'picks the job' do
+            expect(execute(specific_runner)).to eq(pending_job)
+          end
+        end
+
+        context 'when a job is unprotected' do
+          let!(:pending_job) { create(:ci_build, pipeline: pipeline) }
+
+          it 'does not pick the job' do
+            expect(execute(specific_runner)).to be_nil
+          end
+        end
+
+        context 'when protected attribute of a job is nil' do
+          let!(:pending_job) { create(:ci_build, pipeline: pipeline) }
+
+          before do
+            pending_job.update_attribute(:protected, nil)
+          end
+
+          it 'does not pick the job' do
+            expect(execute(specific_runner)).to be_nil
+          end
+        end
+      end
+
       def execute(runner)
         described_class.new(runner).execute.build
       end
diff --git a/spec/services/ci/retry_build_service_spec.rb b/spec/services/ci/retry_build_service_spec.rb
index cec667071cc..f5ed9ff608f 100644
--- a/spec/services/ci/retry_build_service_spec.rb
+++ b/spec/services/ci/retry_build_service_spec.rb
@@ -22,7 +22,7 @@ describe Ci::RetryBuildService do
     %i[type lock_version target_url base_tags
        commit_id deployments erased_by_id last_deployment project_id
        runner_id tag_taggings taggings tags trigger_request_id
-       user_id auto_canceled_by_id retried].freeze
+       user_id auto_canceled_by_id retried failure_reason].freeze
 
   shared_examples 'build duplication' do
     let(:stage) do
@@ -48,7 +48,7 @@ describe Ci::RetryBuildService do
     describe 'clone accessors' do
       CLONE_ACCESSORS.each do |attribute|
         it "clones #{attribute} build attribute" do
-          expect(new_build.send(attribute)).to be_present
+          expect(new_build.send(attribute)).not_to be_nil
           expect(new_build.send(attribute)).to eq build.send(attribute)
         end
       end
diff --git a/spec/services/discussions/update_diff_position_service_spec.rb b/spec/services/discussions/update_diff_position_service_spec.rb
index c239494298b..82b156f5ebe 100644
--- a/spec/services/discussions/update_diff_position_service_spec.rb
+++ b/spec/services/discussions/update_diff_position_service_spec.rb
@@ -150,21 +150,7 @@ describe Discussions::UpdateDiffPositionService do
       )
     end
 
-    context "when the diff line is the same" do
-      let(:line) { 16 }
-
-      it "updates the position" do
-        subject.execute(discussion)
-
-        expect(discussion.original_position).to eq(old_position)
-        expect(discussion.position).not_to eq(old_position)
-        expect(discussion.position.new_line).to eq(22)
-      end
-    end
-
-    context "when the diff line has changed" do
-      let(:line) { 9 }
-
+    shared_examples 'outdated diff note' do
       it "doesn't update the position" do
         subject.execute(discussion)
 
@@ -189,5 +175,51 @@ describe Discussions::UpdateDiffPositionService do
         subject.execute(discussion)
       end
     end
+
+    context "when the diff line is the same" do
+      let(:line) { 16 }
+
+      it "updates the position" do
+        subject.execute(discussion)
+
+        expect(discussion.original_position).to eq(old_position)
+        expect(discussion.position).not_to eq(old_position)
+        expect(discussion.position.new_line).to eq(22)
+      end
+
+      context 'when the resolve_outdated_diff_discussions setting is set' do
+        before do
+          project.update!(resolve_outdated_diff_discussions: true)
+        end
+
+        it 'does not resolve the discussion' do
+          subject.execute(discussion)
+
+          expect(discussion).not_to be_resolved
+          expect(discussion).not_to be_resolved_by_push
+        end
+      end
+    end
+
+    context "when the diff line has changed" do
+      let(:line) { 9 }
+
+      include_examples 'outdated diff note'
+
+      context 'when the resolve_outdated_diff_discussions setting is set' do
+        before do
+          project.update!(resolve_outdated_diff_discussions: true)
+        end
+
+        it 'sets resolves the discussion and sets resolved_by_push' do
+          subject.execute(discussion)
+
+          expect(discussion).to be_resolved
+          expect(discussion).to be_resolved_by_push
+        end
+
+        include_examples 'outdated diff note'
+      end
+    end
   end
 end
diff --git a/spec/services/projects/update_pages_service_spec.rb b/spec/services/projects/update_pages_service_spec.rb
index aa6ad6340f5..031366d1825 100644
--- a/spec/services/projects/update_pages_service_spec.rb
+++ b/spec/services/projects/update_pages_service_spec.rb
@@ -116,6 +116,7 @@ describe Projects::UpdatePagesService do
 
         expect(deploy_status.description)
           .to match(/artifacts for pages are too large/)
+        expect(deploy_status).to be_script_failure
       end
     end