4 files changed, 82 insertions, 62 deletions

diff --git a/spec/services/ci/image_for_build_service_spec.rb b/spec/services/ci/image_for_build_service_spec.rb
deleted file mode 100644
index b3e0a7b9b58..00000000000
--- a/spec/services/ci/image_for_build_service_spec.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-require 'spec_helper'
-
-module Ci
-  describe ImageForBuildService, services: true do
-    let(:service) { ImageForBuildService.new }
-    let(:project) { FactoryGirl.create(:empty_project) }
-    let(:commit_sha) { '01234567890123456789' }
-    let(:pipeline) { project.ensure_pipeline('master', commit_sha) }
-    let(:build) { FactoryGirl.create(:ci_build, pipeline: pipeline) }
-
-    describe '#execute' do
-      before { build }
-
-      context 'branch name' do
-        before { allow(project).to receive(:commit).and_return(OpenStruct.new(sha: commit_sha)) }
-        before { build.run! }
-        let(:image) { service.execute(project, ref: 'master') }
-
-        it { expect(image).to be_kind_of(OpenStruct) }
-        it { expect(image.path.to_s).to include('public/ci/build-running.svg') }
-        it { expect(image.name).to eq('build-running.svg') }
-      end
-
-      context 'unknown branch name' do
-        let(:image) { service.execute(project, ref: 'feature') }
-
-        it { expect(image).to be_kind_of(OpenStruct) }
-        it { expect(image.path.to_s).to include('public/ci/build-unknown.svg') }
-        it { expect(image.name).to eq('build-unknown.svg') }
-      end
-
-      context 'commit sha' do
-        before { build.run! }
-        let(:image) { service.execute(project, sha: build.sha) }
-
-        it { expect(image).to be_kind_of(OpenStruct) }
-        it { expect(image.path.to_s).to include('public/ci/build-running.svg') }
-        it { expect(image.name).to eq('build-running.svg') }
-      end
-
-      context 'unknown commit sha' do
-        let(:image) { service.execute(project, sha: '0000000') }
-
-        it { expect(image).to be_kind_of(OpenStruct) }
-        it { expect(image.path.to_s).to include('public/ci/build-unknown.svg') }
-        it { expect(image.name).to eq('build-unknown.svg') }
-      end
-    end
-  end
-end
diff --git a/spec/services/ci/process_pipeline_service_spec.rb b/spec/services/ci/process_pipeline_service_spec.rb
index b818dfdd50c..de68fb64726 100644
--- a/spec/services/ci/process_pipeline_service_spec.rb
+++ b/spec/services/ci/process_pipeline_service_spec.rb
@@ -341,7 +341,7 @@ describe Ci::ProcessPipelineService, :services do
         expect(builds.pending.count).to eq(1)
         expect(all_builds.count).to eq(4)
 
-        # When pending build succeeds in stage test, we enqueue deploy stage.
+        # When pending merge_when_pipeline_succeeds in stage test, we enqueue deploy stage.
         #
         succeed_pending
         process_pipeline
diff --git a/spec/services/ci/register_build_service_spec.rb b/spec/services/ci/register_build_service_spec.rb
index d9f774a1095..cd7dd53025c 100644
--- a/spec/services/ci/register_build_service_spec.rb
+++ b/spec/services/ci/register_build_service_spec.rb
@@ -170,6 +170,51 @@ module Ci
         end
       end
 
+      context 'when first build is stalled' do
+        before do
+          pending_build.lock_version = 10
+        end
+
+        subject { described_class.new(specific_runner).execute }
+
+        context 'with multiple builds are in queue' do
+          let!(:other_build) { create :ci_build, pipeline: pipeline }
+
+          before do
+            allow_any_instance_of(Ci::RegisterBuildService).to receive(:builds_for_specific_runner)
+              .and_return([pending_build, other_build])
+          end
+
+          it "receives second build from the queue" do
+            expect(subject).to be_valid
+            expect(subject.build).to eq(other_build)
+          end
+        end
+
+        context 'when single build is in queue' do
+          before do
+            allow_any_instance_of(Ci::RegisterBuildService).to receive(:builds_for_specific_runner)
+              .and_return([pending_build])
+          end
+
+          it "does not receive any valid result" do
+            expect(subject).not_to be_valid
+          end
+        end
+
+        context 'when there is no build in queue' do
+          before do
+            allow_any_instance_of(Ci::RegisterBuildService).to receive(:builds_for_specific_runner)
+              .and_return([])
+          end
+
+          it "does not receive builds but result is valid" do
+            expect(subject).to be_valid
+            expect(subject.build).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 d03f7505eac..65af4e13118 100644
--- a/spec/services/ci/retry_build_service_spec.rb
+++ b/spec/services/ci/retry_build_service_spec.rb
@@ -10,22 +10,39 @@ describe Ci::RetryBuildService, :services do
     described_class.new(project, user)
   end
 
+  CLONE_ACCESSORS = described_class::CLONE_ACCESSORS
+
+  REJECT_ACCESSORS =
+    %i[id status user token coverage trace runner artifacts_expire_at
+       artifacts_file artifacts_metadata artifacts_size created_at
+       updated_at started_at finished_at queued_at erased_by
+       erased_at].freeze
+
+  IGNORE_ACCESSORS =
+    %i[type lock_version target_url gl_project_id deploy job_id base_tags
+       commit_id deployments erased_by_id last_deployment project_id
+       runner_id tag_taggings taggings tags trigger_request_id
+       user_id].freeze
+
   shared_examples 'build duplication' do
     let(:build) do
-      create(:ci_build, :failed, :artifacts_expired, :erased, :trace,
-             :queued, :coverage, pipeline: pipeline)
+      create(:ci_build, :failed, :artifacts_expired, :erased,
+             :queued, :coverage, :tags, :allowed_to_fail, :on_tag,
+             :teardown_environment, :triggered, :trace,
+             description: 'some build', pipeline: pipeline)
     end
 
-    describe 'clone attributes' do
-      described_class::CLONE_ATTRIBUTES.each do |attribute|
+    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)).to eq build.send(attribute)
         end
       end
     end
 
-    describe 'reject attributes' do
-      described_class::REJECT_ATTRIBUTES.each do |attribute|
+    describe 'reject acessors' do
+      REJECT_ACCESSORS.each do |attribute|
         it "does not clone #{attribute} build attribute" do
           expect(new_build.send(attribute)).not_to eq build.send(attribute)
         end
@@ -33,12 +50,20 @@ describe Ci::RetryBuildService, :services do
     end
 
     it 'has correct number of known attributes' do
-      attributes =
-        described_class::CLONE_ATTRIBUTES +
-        described_class::IGNORE_ATTRIBUTES +
-        described_class::REJECT_ATTRIBUTES
+      known_accessors = CLONE_ACCESSORS + REJECT_ACCESSORS + IGNORE_ACCESSORS
+
+      # :tag_list is a special case, this accessor does not exist
+      # in reflected associations, comes from `act_as_taggable` and
+      # we use it to copy tags, instead of reusing tags.
+      #
+      current_accessors =
+        Ci::Build.attribute_names.map(&:to_sym) +
+        Ci::Build.reflect_on_all_associations.map(&:name) +
+        [:tag_list]
+
+      current_accessors.uniq!
 
-      expect(build.attributes.size).to eq(attributes.size)
+      expect(known_accessors).to contain_exactly(*current_accessors)
     end
   end