Add latest changes from gitlab-org/gitlab@master

5 files changed, 126 insertions, 44 deletions

diff --git a/spec/lib/gitlab/ci/config/entry/job_spec.rb b/spec/lib/gitlab/ci/config/entry/job_spec.rb
index d3eb5a9663f..9fe18caf689 100644
--- a/spec/lib/gitlab/ci/config/entry/job_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/job_spec.rb
@@ -23,7 +23,7 @@ describe Gitlab::Ci::Config::Entry::Job do
 
       let(:result) do
         %i[before_script script stage type after_script cache
-           image services only except rules variables artifacts
+           image services only except rules needs variables artifacts
            environment coverage retry]
       end
 
@@ -384,21 +384,6 @@ describe Gitlab::Ci::Config::Entry::Job do
       end
 
       context 'when has needs' do
-        context 'that are not a array of strings' do
-          let(:config) do
-            {
-              stage: 'test',
-              script: 'echo',
-              needs: 'build-job'
-            }
-          end
-
-          it 'returns error about invalid type' do
-            expect(entry).not_to be_valid
-            expect(entry.errors).to include 'job needs should be an array of strings'
-          end
-        end
-
         context 'when have dependencies that are not subset of needs' do
           let(:config) do
             {
diff --git a/spec/lib/gitlab/ci/config/entry/need_spec.rb b/spec/lib/gitlab/ci/config/entry/need_spec.rb
new file mode 100644
index 00000000000..d119e604900
--- /dev/null
+++ b/spec/lib/gitlab/ci/config/entry/need_spec.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe ::Gitlab::Ci::Config::Entry::Need do
+  subject(:need) { described_class.new(config) }
+
+  context 'when job is specified' do
+    let(:config) { 'job_name' }
+
+    describe '#valid?' do
+      it { is_expected.to be_valid }
+    end
+
+    describe '#value' do
+      it 'returns job needs configuration' do
+        expect(need.value).to eq(name: 'job_name')
+      end
+    end
+  end
+
+  context 'when need is empty' do
+    let(:config) { '' }
+
+    describe '#valid?' do
+      it { is_expected.not_to be_valid }
+    end
+
+    describe '#errors' do
+      it 'is returns an error about an empty config' do
+        expect(need.errors)
+          .to contain_exactly("job config can't be blank")
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/ci/config/entry/needs_spec.rb b/spec/lib/gitlab/ci/config/entry/needs_spec.rb
new file mode 100644
index 00000000000..f4a76b52d30
--- /dev/null
+++ b/spec/lib/gitlab/ci/config/entry/needs_spec.rb
@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe ::Gitlab::Ci::Config::Entry::Needs do
+  subject(:needs) { described_class.new(config) }
+
+  before do
+    needs.metadata[:allowed_needs] = %i[job]
+  end
+
+  describe 'validations' do
+    before do
+      needs.compose!
+    end
+
+    context 'when entry config value is correct' do
+      let(:config) { ['job_name'] }
+
+      describe '#valid?' do
+        it { is_expected.to be_valid }
+      end
+    end
+
+    context 'when config value has wrong type' do
+      let(:config) { 123 }
+
+      describe '#valid?' do
+        it { is_expected.not_to be_valid }
+      end
+
+      describe '#errors' do
+        it 'returns error about incorrect type' do
+          expect(needs.errors)
+            .to include('needs config can only be a hash or an array')
+        end
+      end
+    end
+
+    context 'when wrong needs type is used' do
+      let(:config) { [123] }
+
+      describe '#valid?' do
+        it { is_expected.not_to be_valid }
+      end
+
+      describe '#errors' do
+        it 'returns error about incorrect type' do
+          expect(needs.errors).to contain_exactly(
+            'need has an unsupported type')
+        end
+      end
+    end
+  end
+
+  describe '.compose!' do
+    context 'when valid job entries composed' do
+      let(:config) { %w[first_job_name second_job_name] }
+
+      before do
+        needs.compose!
+      end
+
+      describe '#value' do
+        it 'returns key value' do
+          expect(needs.value).to eq(
+            job: [
+              { name: 'first_job_name' },
+              { name: 'second_job_name' }
+            ]
+          )
+        end
+      end
+
+      describe '#descendants' do
+        it 'creates valid descendant nodes' do
+          expect(needs.descendants.count).to eq 2
+          expect(needs.descendants)
+            .to all(be_an_instance_of(::Gitlab::Ci::Config::Entry::Need))
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/ci/yaml_processor_spec.rb b/spec/lib/gitlab/ci/yaml_processor_spec.rb
index c7a90d2a254..375075ce8f3 100644
--- a/spec/lib/gitlab/ci/yaml_processor_spec.rb
+++ b/spec/lib/gitlab/ci/yaml_processor_spec.rb
@@ -1253,7 +1253,7 @@ module Gitlab
         end
       end
 
-      describe "Needs" do
+      describe "Job Needs" do
         let(:needs) { }
         let(:dependencies) { }
 
@@ -1293,12 +1293,7 @@ module Gitlab
               stage: "test",
               stage_idx: 2,
               name: "test1",
-              options: {
-                script: ["test"],
-                # This does not make sense, there is a follow-up:
-                # https://gitlab.com/gitlab-org/gitlab-foss/issues/65569
-                bridge_needs: %w[build1 build2]
-              },
+              options: { script: ["test"] },
               needs_attributes: [
                 { name: "build1" },
                 { name: "build2" }
@@ -1310,12 +1305,6 @@ module Gitlab
           end
         end
 
-        context 'needs two builds defined as symbols' do
-          let(:needs) { [:build1, :build2] }
-
-          it { expect { subject }.not_to raise_error }
-        end
-
         context 'undefined need' do
           let(:needs) { ['undefined'] }
 
diff --git a/spec/lib/gitlab/experimentation_spec.rb b/spec/lib/gitlab/experimentation_spec.rb
index cceeb15b05d..9be6ace3be5 100644
--- a/spec/lib/gitlab/experimentation_spec.rb
+++ b/spec/lib/gitlab/experimentation_spec.rb
@@ -73,22 +73,10 @@ describe Gitlab::Experimentation do
       end
 
       describe 'URL parameter to force enable experiment' do
-        context 'is not present' do
-          # Disabled until https://gitlab.com/gitlab-org/gitlab/issues/34942 is solved properly
-          xit 'returns false' do
-            get :index, params: { force_experiment: :test_experiment2 }
+        it 'returns true' do
+          get :index, params: { force_experiment: :test_experiment }
 
-            expect(controller.experiment_enabled?(:test_experiment)).to be_falsey
-          end
-        end
-
-        context 'is present' do
-          # Disabled until https://gitlab.com/gitlab-org/gitlab/issues/34942 is solved properly
-          xit 'returns true' do
-            get :index, params: { force_experiment: :test_experiment }
-
-            expect(controller.experiment_enabled?(:test_experiment)).to be_truthy
-          end
+          expect(controller.experiment_enabled?(:test_experiment)).to be_truthy
         end
       end
     end