diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /spec/workers/ssh_keys/expired_notification_worker_spec.rb | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) | |
download | gitlab-ce-a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4.tar.gz |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'spec/workers/ssh_keys/expired_notification_worker_spec.rb')
-rw-r--r-- | spec/workers/ssh_keys/expired_notification_worker_spec.rb | 36 |
1 files changed, 25 insertions, 11 deletions
diff --git a/spec/workers/ssh_keys/expired_notification_worker_spec.rb b/spec/workers/ssh_keys/expired_notification_worker_spec.rb index 249ee404870..109d24f03ab 100644 --- a/spec/workers/ssh_keys/expired_notification_worker_spec.rb +++ b/spec/workers/ssh_keys/expired_notification_worker_spec.rb @@ -15,6 +15,20 @@ RSpec.describe SshKeys::ExpiredNotificationWorker, type: :worker do describe '#perform' do let_it_be(:user) { create(:user) } + context 'with a large batch' do + before do + stub_const("SshKeys::ExpiredNotificationWorker::BATCH_SIZE", 5) + end + + let_it_be_with_reload(:keys) { create_list(:key, 20, expires_at: 3.days.ago, user: user) } + + it 'updates all keys regardless of batch size' do + worker.perform + + expect(keys.pluck(:expiry_notification_delivered_at)).not_to include(nil) + end + end + context 'with expiring key today' do let_it_be_with_reload(:expired_today) { create(:key, expires_at: Time.current, user: user) } @@ -35,24 +49,24 @@ RSpec.describe SshKeys::ExpiredNotificationWorker, type: :worker do perform_multiple(worker: worker) end end + end + + context 'when key has expired in the past' do + let_it_be(:expired_past) { create(:key, expires_at: 1.day.ago, user: user) } + + it 'does update notified column' do + expect { worker.perform }.to change { expired_past.reload.expiry_notification_delivered_at } + end - context 'when feature is not enabled' do + context 'when key has already been notified of expiration' do before do - stub_feature_flags(ssh_key_expiration_email_notification: false) + expired_past.update!(expiry_notification_delivered_at: 1.day.ago) end it 'does not update notified column' do - expect { worker.perform }.not_to change { expired_today.reload.expiry_notification_delivered_at } + expect { worker.perform }.not_to change { expired_past.reload.expiry_notification_delivered_at } end end end - - context 'when key has expired in the past' do - let_it_be(:expired_past) { create(:key, expires_at: 1.day.ago, user: user) } - - it 'does not update notified column' do - expect { worker.perform }.not_to change { expired_past.reload.expiry_notification_delivered_at } - end - end end end |