Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc32

1 files changed, 53 insertions, 24 deletions

diff --git a/spec/lib/gitlab/ci/config/entry/product/variables_spec.rb b/spec/lib/gitlab/ci/config/entry/product/variables_spec.rb
index 230b001d620..407efb438b5 100644
--- a/spec/lib/gitlab/ci/config/entry/product/variables_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/product/variables_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'fast_spec_helper'
+# After Feature one_dimensional_matrix is removed, this can be changed back to fast_spec_helper
+require 'spec_helper'
 require_dependency 'active_model'
 
 RSpec.describe Gitlab::Ci::Config::Entry::Product::Variables do
@@ -45,43 +46,71 @@ RSpec.describe Gitlab::Ci::Config::Entry::Product::Variables do
       end
     end
 
-    context 'when entry value is not correct' do
-      shared_examples 'invalid variables' do |message|
-        describe '#errors' do
-          it 'saves errors' do
-            expect(entry.errors).to include(message)
-          end
+    context 'with one_dimensional_matrix feature flag enabled' do
+      context 'with only one variable' do
+        before do
+          stub_feature_flags(one_dimensional_matrix: true)
         end
+        let(:config) { { VAR: 'test' } }
 
         describe '#valid?' do
-          it 'is not valid' do
-            expect(entry).not_to be_valid
+          it 'is valid' do
+            expect(entry).to be_valid
+          end
+        end
+
+        describe '#errors' do
+          it 'does not append errors' do
+            expect(entry.errors).to be_empty
           end
         end
       end
+    end
 
-      context 'with array' do
-        let(:config) { [:VAR, 'test'] }
+    context 'with one_dimensional_matrix feature flag disabled' do
+      context 'when entry value is not correct' do
+        before do
+          stub_feature_flags(one_dimensional_matrix: false)
+        end
+        shared_examples 'invalid variables' do |message|
+          describe '#errors' do
+            it 'saves errors' do
+              expect(entry.errors).to include(message)
+            end
+          end
 
-        it_behaves_like 'invalid variables', /should be a hash of key value pairs/
-      end
+          describe '#valid?' do
+            it 'is not valid' do
+              expect(entry).not_to be_valid
+            end
+          end
+        end
 
-      context 'with empty array' do
-        let(:config) { { VAR: 'test', VAR2: [] } }
+        context 'with array' do
+          let(:config) { [:VAR, 'test'] }
 
-        it_behaves_like 'invalid variables', /should be a hash of key value pairs/
-      end
+          it_behaves_like 'invalid variables', /should be a hash of key value pairs/
+        end
 
-      context 'with nested array' do
-        let(:config) { { VAR: 'test', VAR2: [1, [2]] } }
+        context 'with empty array' do
+          let(:config) { { VAR: 'test', VAR2: [] } }
 
-        it_behaves_like 'invalid variables', /should be a hash of key value pairs/
-      end
+          it_behaves_like 'invalid variables', /should be a hash of key value pairs/
+        end
 
-      context 'with only one variable' do
-        let(:config) { { VAR: 'test' } }
+        context 'with nested array' do
+          let(:config) { { VAR: 'test', VAR2: [1, [2]] } }
+
+          it_behaves_like 'invalid variables', /should be a hash of key value pairs/
+        end
 
-        it_behaves_like 'invalid variables', /variables config requires at least 2 items/
+        context 'with one_dimensional_matrix feature flag disabled' do
+          context 'with only one variable' do
+            let(:config) { { VAR: 'test' } }
+
+            it_behaves_like 'invalid variables', /variables config requires at least 2 items/
+          end
+        end
       end
     end
   end