2 files changed, 35 insertions, 164 deletions
diff --git a/spec/lib/gitlab/ci/config/entry/product/matrix_spec.rb b/spec/lib/gitlab/ci/config/entry/product/matrix_spec.rb
index 3388ae0af2f..ff44a235ea5 100644
--- a/spec/lib/gitlab/ci/config/entry/product/matrix_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/product/matrix_spec.rb
@@ -46,98 +46,53 @@ RSpec.describe ::Gitlab::Ci::Config::Entry::Product::Matrix do
       end
     end
 
-    context 'with one_dimensional_matrix feature flag enabled' do
-      before do
-        stub_feature_flags(one_dimensional_matrix: true)
-        matrix.compose!
+    context 'when entry config has only one variable with multiple values' do
+      let(:config) do
+        [
+          {
+            'VAR_1' => %w[build test]
+          }
+        ]
       end
 
-      context 'when entry config has only one variable with multiple values' do
-        let(:config) do
-          [
-            {
-              'VAR_1' => %w[build test]
-            }
-          ]
-        end
-
-        describe '#valid?' do
-          it { is_expected.to be_valid }
-        end
+      describe '#valid?' do
+        it { is_expected.to be_valid }
+      end
 
-        describe '#errors' do
-          it 'returns no errors' do
-            expect(matrix.errors)
-              .to be_empty
-          end
+      describe '#errors' do
+        it 'returns no errors' do
+          expect(matrix.errors)
+            .to be_empty
         end
+      end
 
-        describe '#value' do
-          before do
-            matrix.compose!
-          end
-
-          it 'returns the value without raising an error' do
-            expect(matrix.value).to eq([{ 'VAR_1' => %w[build test] }])
-          end
+      describe '#value' do
+        before do
+          matrix.compose!
         end
 
-        context 'when entry config has only one variable with one value' do
-          let(:config) do
-            [
-              {
-                'VAR_1' => %w[test]
-              }
-            ]
-          end
-
-          describe '#valid?' do
-            it { is_expected.to be_valid }
-          end
-
-          describe '#errors' do
-            it 'returns no errors' do
-              expect(matrix.errors)
-                .to be_empty
-            end
-          end
-
-          describe '#value' do
-            before do
-              matrix.compose!
-            end
-
-            it 'returns the value without raising an error' do
-              expect(matrix.value).to eq([{ 'VAR_1' => %w[test] }])
-            end
-          end
+        it 'returns the value without raising an error' do
+          expect(matrix.value).to eq([{ 'VAR_1' => %w[build test] }])
         end
       end
-    end
 
-    context 'with one_dimensional_matrix feature flag disabled' do
-      before do
-        stub_feature_flags(one_dimensional_matrix: false)
-        matrix.compose!
-      end
-
-      context 'when entry config has only one variable with multiple values' do
+      context 'when entry config has only one variable with one value' do
         let(:config) do
           [
             {
-              'VAR_1' => %w[build test]
+              'VAR_1' => %w[test]
             }
           ]
         end
 
         describe '#valid?' do
-          it { is_expected.not_to be_valid }
+          it { is_expected.to be_valid }
         end
 
         describe '#errors' do
-          it 'returns error about too many jobs' do
+          it 'returns no errors' do
             expect(matrix.errors)
-              .to include('variables config requires at least 2 items')
+              .to be_empty
           end
         end
 
@@ -147,38 +102,7 @@ RSpec.describe ::Gitlab::Ci::Config::Entry::Product::Matrix do
           end
 
           it 'returns the value without raising an error' do
-            expect(matrix.value).to eq([{ 'VAR_1' => %w[build test] }])
-          end
-        end
-
-        context 'when entry config has only one variable with one value' do
-          let(:config) do
-            [
-              {
-                'VAR_1' => %w[test]
-              }
-            ]
-          end
-
-          describe '#valid?' do
-            it { is_expected.not_to be_valid }
-          end
-
-          describe '#errors' do
-            it 'returns no errors' do
-              expect(matrix.errors)
-                .to include('variables config requires at least 2 items')
-            end
-          end
-
-          describe '#value' do
-            before do
-              matrix.compose!
-            end
-
-            it 'returns the value without raising an error' do
-              expect(matrix.value).to eq([{ 'VAR_1' => %w[test] }])
-            end
+            expect(matrix.value).to eq([{ 'VAR_1' => %w[test] }])
           end
         end
       end
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 407efb438b5..5e920ce34e0 100644
--- a/spec/lib/gitlab/ci/config/entry/product/variables_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/product/variables_spec.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-# After Feature one_dimensional_matrix is removed, this can be changed back to fast_spec_helper
-require 'spec_helper'
+require 'fast_spec_helper'
 require_dependency 'active_model'
 
 RSpec.describe Gitlab::Ci::Config::Entry::Product::Variables do
@@ -46,70 +45,18 @@ RSpec.describe Gitlab::Ci::Config::Entry::Product::Variables do
       end
     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 valid' do
-            expect(entry).to be_valid
-          end
-        end
+    context 'with only one variable' do
+      let(:config) { { VAR: 'test' } }
 
-        describe '#errors' do
-          it 'does not append errors' do
-            expect(entry.errors).to be_empty
-          end
+      describe '#valid?' do
+        it 'is valid' do
+          expect(entry).to be_valid
         end
       end
-    end
-
-    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
-
-          describe '#valid?' do
-            it 'is not valid' do
-              expect(entry).not_to be_valid
-            end
-          end
-        end
-
-        context 'with array' do
-          let(:config) { [:VAR, 'test'] }
 
-          it_behaves_like 'invalid variables', /should be a hash of key value pairs/
-        end
-
-        context 'with empty array' do
-          let(:config) { { VAR: 'test', VAR2: [] } }
-
-          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]] } }
-
-          it_behaves_like 'invalid variables', /should be a hash of key value pairs/
-        end
-
-        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
+      describe '#errors' do
+        it 'does not append errors' do
+          expect(entry.errors).to be_empty
         end
       end
     end