Merge branch 'philipcunningham-add-compact-to-collection-326953' into 'master'

Add Gitlab::Ci::Variables::Collection#compact

See merge request gitlab-org/gitlab!62647

lib/gitlab/ci/variables/collection.rb

@@ -24,6 +24,10 @@ module Gitlab
           self
         end
 
+        def compact
+          Collection.new(select { |variable| !variable.value.nil? })
+        end
+
         def concat(resources)
           return self if resources.nil?
 

spec/lib/gitlab/ci/variables/collection_spec.rb

@@ -44,6 +44,30 @@ RSpec.describe Gitlab::Ci::Variables::Collection do
     end
   end
 
+  describe '#compact' do
+    subject do
+      described_class.new
+        .append(key: 'STRING', value: 'string')
+        .append(key: 'NIL', value: nil)
+        .append(key: nil, value: 'string')
+    end
+
+    it 'returns a new Collection instance', :aggregate_failures do
+      collection = subject.compact
+
+      expect(collection).to be_an_instance_of(described_class)
+      expect(collection).not_to eql(subject)
+    end
+
+    it 'rejects pair that has nil value', :aggregate_failures do
+      collection = subject.compact
+
+      expect(collection).not_to include(key: 'NIL', value: nil, public: true)
+      expect(collection).to include(key: 'STRING', value: 'string', public: true)
+      expect(collection).to include(key: nil, value: 'string', public: true)
+    end
+  end
+
   describe '#concat' do
     it 'appends all elements from an array' do
       collection = described_class.new([{ key: 'VAR_1', value: '1' }])