Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 3 deletions

diff --git a/spec/workers/container_expiration_policy_worker_spec.rb b/spec/workers/container_expiration_policy_worker_spec.rb
index ebf80041151..2cfb613865d 100644
--- a/spec/workers/container_expiration_policy_worker_spec.rb
+++ b/spec/workers/container_expiration_policy_worker_spec.rb
@@ -60,12 +60,11 @@ RSpec.describe ContainerExpirationPolicyWorker do
       context 'with container expiration policies' do
         let_it_be(:container_expiration_policy, reload: true) { create(:container_expiration_policy, :runnable) }
         let_it_be(:container_repository) { create(:container_repository, project: container_expiration_policy.project) }
-        let_it_be(:user) { container_expiration_policy.project.owner }
 
         context 'a valid policy' do
           it 'runs the policy' do
             expect(ContainerExpirationPolicyService)
-              .to receive(:new).with(container_expiration_policy.project, user).and_call_original
+              .to receive(:new).with(container_expiration_policy.project, nil).and_call_original
             expect(CleanupContainerRepositoryWorker).to receive(:perform_async).once.and_call_original
 
             expect { subject }.not_to raise_error
@@ -102,7 +101,7 @@ RSpec.describe ContainerExpirationPolicyWorker do
           end
 
           it 'disables the policy and tracks an error' do
-            expect(ContainerExpirationPolicyService).not_to receive(:new).with(container_expiration_policy, user)
+            expect(ContainerExpirationPolicyService).not_to receive(:new).with(container_expiration_policy, nil)
             expect(Gitlab::ErrorTracking).to receive(:log_exception).with(instance_of(described_class::InvalidPolicyError), container_expiration_policy_id: container_expiration_policy.id)
 
             expect { subject }.to change { container_expiration_policy.reload.enabled }.from(true).to(false)