1 files changed, 51 insertions, 62 deletions
diff --git a/spec/lib/gitlab/ci/variables/helpers_spec.rb b/spec/lib/gitlab/ci/variables/helpers_spec.rb
index fc1055751bd..fb1e66bd605 100644
--- a/spec/lib/gitlab/ci/variables/helpers_spec.rb
+++ b/spec/lib/gitlab/ci/variables/helpers_spec.rb
@@ -15,21 +15,21 @@ RSpec.describe Gitlab::Ci::Variables::Helpers do
     end
 
     let(:result) do
-      [{ key: 'key1', value: 'value1', public: true },
-       { key: 'key2', value: 'value22', public: true },
-       { key: 'key3', value: 'value3', public: true }]
+      [{ key: 'key1', value: 'value1' },
+       { key: 'key2', value: 'value22' },
+       { key: 'key3', value: 'value3' }]
     end
 
     subject { described_class.merge_variables(current_variables, new_variables) }
 
-    it { is_expected.to eq(result) }
+    it { is_expected.to match_array(result) }
 
     context 'when new variables is a hash' do
       let(:new_variables) do
         { 'key2' => 'value22', 'key3' => 'value3' }
       end
 
-      it { is_expected.to eq(result) }
+      it { is_expected.to match_array(result) }
     end
 
     context 'when new variables is a hash with symbol keys' do
@@ -37,79 +37,68 @@ RSpec.describe Gitlab::Ci::Variables::Helpers do
         { key2: 'value22', key3: 'value3' }
       end
 
-      it { is_expected.to eq(result) }
+      it { is_expected.to match_array(result) }
     end
 
     context 'when new variables is nil' do
       let(:new_variables) {}
       let(:result) do
-        [{ key: 'key1', value: 'value1', public: true },
-         { key: 'key2', value: 'value2', public: true }]
+        [{ key: 'key1', value: 'value1' },
+         { key: 'key2', value: 'value2' }]
       end
 
-      it { is_expected.to eq(result) }
+      it { is_expected.to match_array(result) }
     end
   end
 
-  describe '.transform_to_yaml_variables' do
-    let(:variables) do
-      { 'key1' => 'value1', 'key2' => 'value2' }
-    end
-
-    let(:result) do
-      [{ key: 'key1', value: 'value1', public: true },
-       { key: 'key2', value: 'value2', public: true }]
-    end
-
-    subject { described_class.transform_to_yaml_variables(variables) }
-
-    it { is_expected.to eq(result) }
+  describe '.transform_to_array' do
+    subject { described_class.transform_to_array(variables) }
 
-    context 'when variables is nil' do
-      let(:variables) {}
-
-      it { is_expected.to eq([]) }
-    end
-  end
+    context 'when values are strings' do
+      let(:variables) do
+        { 'key1' => 'value1', 'key2' => 'value2' }
+      end
 
-  describe '.transform_from_yaml_variables' do
-    let(:variables) do
-      [{ key: 'key1', value: 'value1', public: true },
-       { key: 'key2', value: 'value2', public: true }]
-    end
+      let(:result) do
+        [{ key: 'key1', value: 'value1' },
+         { key: 'key2', value: 'value2' }]
+      end
 
-    let(:result) do
-      { 'key1' => 'value1', 'key2' => 'value2' }
+      it { is_expected.to match_array(result) }
     end
 
-    subject { described_class.transform_from_yaml_variables(variables) }
-
-    it { is_expected.to eq(result) }
-
     context 'when variables is nil' do
       let(:variables) {}
 
-      it { is_expected.to eq({}) }
+      it { is_expected.to match_array([]) }
     end
 
-    context 'when variables is a hash' do
+    context 'when values are hashes' do
       let(:variables) do
-        { key1: 'value1', 'key2' => 'value2' }
+        { 'key1' => { value: 'value1', description: 'var 1' }, 'key2' => { value: 'value2' } }
       end
 
-      it { is_expected.to eq(result) }
-    end
-
-    context 'when variables contain integers and symbols' do
-      let(:variables) do
-        { key1: 1, key2: :value2 }
+      let(:result) do
+        [{ key: 'key1', value: 'value1', description: 'var 1' },
+         { key: 'key2', value: 'value2' }]
       end
 
-      let(:result1) do
-        { 'key1' => '1', 'key2' => 'value2' }
-      end
+      it { is_expected.to match_array(result) }
+
+      context 'when a value data has `key` as a key' do
+        let(:variables) do
+          { 'key1' => { value: 'value1', key: 'new_key1' }, 'key2' => { value: 'value2' } }
+        end
+
+        let(:result) do
+          [{ key: 'key1', value: 'value1' },
+           { key: 'key2', value: 'value2' }]
+        end
 
-      it { is_expected.to eq(result1) }
+        it 'ignores the key set with "key"' do
+          is_expected.to match_array(result)
+        end
+      end
     end
   end
 
@@ -127,35 +116,35 @@ RSpec.describe Gitlab::Ci::Variables::Helpers do
     let(:inheritance) { true }
 
     let(:result) do
-      [{ key: 'key1', value: 'value1', public: true },
-       { key: 'key2', value: 'value22', public: true },
-       { key: 'key3', value: 'value3', public: true }]
+      [{ key: 'key1', value: 'value1' },
+       { key: 'key2', value: 'value22' },
+       { key: 'key3', value: 'value3' }]
     end
 
     subject { described_class.inherit_yaml_variables(from: from, to: to, inheritance: inheritance) }
 
-    it { is_expected.to eq(result) }
+    it { is_expected.to match_array(result) }
 
     context 'when inheritance is false' do
       let(:inheritance) { false }
 
       let(:result) do
-        [{ key: 'key2', value: 'value22', public: true },
-         { key: 'key3', value: 'value3', public: true }]
+        [{ key: 'key2', value: 'value22' },
+         { key: 'key3', value: 'value3' }]
       end
 
-      it { is_expected.to eq(result) }
+      it { is_expected.to match_array(result) }
     end
 
     context 'when inheritance is array' do
       let(:inheritance) { ['key2'] }
 
       let(:result) do
-        [{ key: 'key2', value: 'value22', public: true },
-         { key: 'key3', value: 'value3', public: true }]
+        [{ key: 'key2', value: 'value22' },
+         { key: 'key3', value: 'value3' }]
       end
 
-      it { is_expected.to eq(result) }
+      it { is_expected.to match_array(result) }
     end
   end
 end