summaryrefslogtreecommitdiff
path: root/spec/services/projects/container_repository/cleanup_tags_service_spec.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-05 17:33:30 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-05 17:33:30 +0000
commit5049b3cd2362d119d0f6147bb45b449609b07cb4 (patch)
tree69c89f0b19c09d3600ab3772be20209d4d702d36 /spec/services/projects/container_repository/cleanup_tags_service_spec.rb
parentd5cc1255b64367c04f208150dbafa0be7b50dc45 (diff)
downloadgitlab-ce-5049b3cd2362d119d0f6147bb45b449609b07cb4.tar.gz
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'spec/services/projects/container_repository/cleanup_tags_service_spec.rb')
-rw-r--r--spec/services/projects/container_repository/cleanup_tags_service_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/services/projects/container_repository/cleanup_tags_service_spec.rb b/spec/services/projects/container_repository/cleanup_tags_service_spec.rb
index 2c708e75a25..2f2474f2681 100644
--- a/spec/services/projects/container_repository/cleanup_tags_service_spec.rb
+++ b/spec/services/projects/container_repository/cleanup_tags_service_spec.rb
@@ -245,7 +245,7 @@ RSpec.describe Projects::ContainerRepository::CleanupTagsService do
end
it 'succeeds without a user' do
- expect_delete(%w(Bb Ba C))
+ expect_delete(%w(Bb Ba C), container_expiration_policy: true)
is_expected.to include(status: :success, deleted: %w(Bb Ba C))
end
@@ -287,10 +287,10 @@ RSpec.describe Projects::ContainerRepository::CleanupTagsService do
end
end
- def expect_delete(tags)
+ def expect_delete(tags, container_expiration_policy: nil)
expect(Projects::ContainerRepository::DeleteTagsService)
.to receive(:new)
- .with(repository.project, user, tags: tags)
+ .with(repository.project, user, tags: tags, container_expiration_policy: container_expiration_policy)
.and_call_original
expect_any_instance_of(Projects::ContainerRepository::DeleteTagsService)