1 files changed, 31 insertions, 16 deletions

diff --git a/spec/lib/gitlab/ci/build/cache_spec.rb b/spec/lib/gitlab/ci/build/cache_spec.rb
index a8fa14b4b4c..68d6a7978d7 100644
--- a/spec/lib/gitlab/ci/build/cache_spec.rb
+++ b/spec/lib/gitlab/ci/build/cache_spec.rb
@@ -3,16 +3,21 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::Ci::Build::Cache do
+  let(:cache_config) { [] }
+  let(:pipeline) { double(::Ci::Pipeline) }
+  let(:cache_seed_a) { double(Gitlab::Ci::Pipeline::Seed::Build::Cache) }
+  let(:cache_seed_b) { double(Gitlab::Ci::Pipeline::Seed::Build::Cache) }
+
+  subject(:cache) { described_class.new(cache_config, pipeline) }
+
   describe '.initialize' do
     context 'when the cache is an array' do
+      let(:cache_config) { [{ key: 'key-a' }, { key: 'key-b' }] }
+
       it 'instantiates an array of cache seeds' do
-        cache_config = [{ key: 'key-a' }, { key: 'key-b' }]
-        pipeline = double(::Ci::Pipeline)
-        cache_seed_a = double(Gitlab::Ci::Pipeline::Seed::Build::Cache)
-        cache_seed_b = double(Gitlab::Ci::Pipeline::Seed::Build::Cache)
         allow(Gitlab::Ci::Pipeline::Seed::Build::Cache).to receive(:new).and_return(cache_seed_a, cache_seed_b)
 
-        cache = described_class.new(cache_config, pipeline)
+        cache
 
         expect(Gitlab::Ci::Pipeline::Seed::Build::Cache).to have_received(:new).with(pipeline, { key: 'key-a' }, 0)
         expect(Gitlab::Ci::Pipeline::Seed::Build::Cache).to have_received(:new).with(pipeline, { key: 'key-b' }, 1)
@@ -21,16 +26,31 @@ RSpec.describe Gitlab::Ci::Build::Cache do
     end
 
     context 'when the cache is a hash' do
+      let(:cache_config) { { key: 'key-a' } }
+
       it 'instantiates a cache seed' do
-        cache_config = { key: 'key-a' }
-        pipeline = double(::Ci::Pipeline)
-        cache_seed = double(Gitlab::Ci::Pipeline::Seed::Build::Cache)
-        allow(Gitlab::Ci::Pipeline::Seed::Build::Cache).to receive(:new).and_return(cache_seed)
+        allow(Gitlab::Ci::Pipeline::Seed::Build::Cache).to receive(:new).and_return(cache_seed_a)
 
-        cache = described_class.new(cache_config, pipeline)
+        cache
 
         expect(Gitlab::Ci::Pipeline::Seed::Build::Cache).to have_received(:new).with(pipeline, cache_config, 0)
-        expect(cache.instance_variable_get(:@cache)).to eq([cache_seed])
+        expect(cache.instance_variable_get(:@cache)).to eq([cache_seed_a])
+      end
+    end
+
+    context 'when the cache is an array with files inside hashes' do
+      let(:cache_config) { [{ key: { files: ['file1.json'] } }, { key: { files: ['file1.json', 'file2.json'] } }] }
+
+      it 'instantiates a cache seed' do
+        allow(Gitlab::Ci::Pipeline::Seed::Build::Cache).to receive(:new).and_return(cache_seed_a, cache_seed_b)
+
+        cache
+
+        expect(Gitlab::Ci::Pipeline::Seed::Build::Cache).to have_received(:new)
+          .with(pipeline, cache_config.first, '0_file1')
+        expect(Gitlab::Ci::Pipeline::Seed::Build::Cache).to have_received(:new)
+          .with(pipeline, cache_config.second, '1_file1_file2')
+        expect(cache.instance_variable_get(:@cache)).to match_array([cache_seed_a, cache_seed_b])
       end
     end
   end
@@ -38,10 +58,6 @@ RSpec.describe Gitlab::Ci::Build::Cache do
   describe '#cache_attributes' do
     context 'when there are no caches' do
       it 'returns an empty hash' do
-        cache_config = []
-        pipeline = double(::Ci::Pipeline)
-        cache = described_class.new(cache_config, pipeline)
-
         attributes = cache.cache_attributes
 
         expect(attributes).to eq({})
@@ -51,7 +67,6 @@ RSpec.describe Gitlab::Ci::Build::Cache do
     context 'when there are caches' do
       it 'returns the structured attributes for the caches' do
         cache_config = [{ key: 'key-a' }, { key: 'key-b' }]
-        pipeline = double(::Ci::Pipeline)
         cache = described_class.new(cache_config, pipeline)
 
         attributes = cache.cache_attributes