Add latest changes from gitlab-org/gitlab@master

3 files changed, 86 insertions, 8 deletions

diff --git a/spec/lib/gitlab/ci/config/entry/job_spec.rb b/spec/lib/gitlab/ci/config/entry/job_spec.rb
index 5b47d3a3922..4a90e765d4b 100644
--- a/spec/lib/gitlab/ci/config/entry/job_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/job_spec.rb
@@ -618,6 +618,29 @@ RSpec.describe Gitlab::Ci::Config::Entry::Job do
         end
       end
     end
+
+    context 'when job is using tags' do
+      context 'when limit is reached' do
+        let(:tags) { Array.new(100) { |i| "tag-#{i}" } }
+        let(:config) { { tags: tags, script: 'test' } }
+
+        it 'returns error', :aggregate_failures do
+          expect(entry).not_to be_valid
+          expect(entry.errors)
+            .to include "tags config must be less than the limit of #{Gitlab::Ci::Config::Entry::Tags::TAGS_LIMIT} tags"
+        end
+      end
+
+      context 'when limit is not reached' do
+        let(:config) { { tags: %w[tag1 tag2], script: 'test' } }
+
+        it 'returns a valid entry', :aggregate_failures do
+          expect(entry).to be_valid
+          expect(entry.errors).to be_empty
+          expect(entry.tags).to eq(%w[tag1 tag2])
+        end
+      end
+    end
   end
 
   describe '#manual_action?' do
diff --git a/spec/lib/gitlab/ci/config/entry/tags_spec.rb b/spec/lib/gitlab/ci/config/entry/tags_spec.rb
new file mode 100644
index 00000000000..79317de373b
--- /dev/null
+++ b/spec/lib/gitlab/ci/config/entry/tags_spec.rb
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::Ci::Config::Entry::Tags do
+  let(:entry) { described_class.new(config) }
+
+  describe 'validation' do
+    context 'when tags config value is correct' do
+      let(:config) { %w[tag1 tag2] }
+
+      describe '#value' do
+        it 'returns tags configuration' do
+          expect(entry.value).to eq config
+        end
+      end
+
+      describe '#valid?' do
+        it 'is valid' do
+          expect(entry).to be_valid
+        end
+      end
+    end
+
+    context 'when entry value is not correct' do
+      describe '#errors' do
+        context 'when tags config is not an array of strings' do
+          let(:config) { [1, 2] }
+
+          it 'reports error' do
+            expect(entry.errors)
+              .to include 'tags config should be an array of strings'
+          end
+        end
+
+        context 'when tags limit is reached' do
+          let(:config) { Array.new(50) {|i| "tag-#{i}" } }
+
+          context 'when ci_build_tags_limit is enabled' do
+            before do
+              stub_feature_flags(ci_build_tags_limit: true)
+            end
+
+            it 'reports error' do
+              expect(entry.errors)
+                .to include "tags config must be less than the limit of #{described_class::TAGS_LIMIT} tags"
+            end
+          end
+
+          context 'when ci_build_tags_limit is disabled' do
+            before do
+              stub_feature_flags(ci_build_tags_limit: false)
+            end
+
+            it 'does not report an error' do
+              expect(entry.errors).to be_empty
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/git/commit_spec.rb b/spec/lib/gitlab/git/commit_spec.rb
index f58bab52cfa..174ed43bd40 100644
--- a/spec/lib/gitlab/git/commit_spec.rb
+++ b/spec/lib/gitlab/git/commit_spec.rb
@@ -370,14 +370,6 @@ RSpec.describe Gitlab::Git::Commit, :seed_helper do
       end
 
       it { is_expected.to contain_exactly(SeedRepo::Commit::ID) }
-
-      context 'between_uses_list_commits FF disabled' do
-        before do
-          stub_feature_flags(between_uses_list_commits: false)
-        end
-
-        it { is_expected.to contain_exactly(SeedRepo::Commit::ID) }
-      end
     end
 
     describe '.shas_with_signatures' do