Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 4 deletions

diff --git a/spec/factories/container_repositories.rb b/spec/factories/container_repositories.rb
index b2862e41e65..4cf1537f64b 100644
--- a/spec/factories/container_repositories.rb
+++ b/spec/factories/container_repositories.rb
@@ -16,19 +16,22 @@ FactoryBot.define do
     after(:build) do |repository, evaluator|
       next if evaluator.tags.to_a.none?
 
+      tags = evaluator.tags
+      # convert Array into Hash
+      tags = tags.product(['sha256:4c8e63ca4cb663ce6c688cb06f1c372b088dac5b6d7ad7d49cd620d85cf72a15']).to_h unless tags.is_a?(Hash)
+
       allow(repository.client)
         .to receive(:repository_tags)
         .and_return({
           'name' => repository.path,
-          'tags' => evaluator.tags
+          'tags' => tags.keys
         })
 
-      evaluator.tags.each do |tag|
+      tags.each_pair do |tag, digest|
         allow(repository.client)
           .to receive(:repository_tag_digest)
           .with(repository.path, tag)
-          .and_return('sha256:4c8e63ca4cb663ce6c688cb06f1c3' \
-                      '72b088dac5b6d7ad7d49cd620d85cf72a15')
+          .and_return(digest)
       end
     end
   end