diff options
author | Robert Speicher <rspeicher@gmail.com> | 2018-12-07 16:11:44 +0000 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2018-12-07 16:11:44 +0000 |
commit | 498e34c6a4c990ae7d90b2d09cf4e73b9f228e13 (patch) | |
tree | 358831135a05199c18bb8482bef8814f98aa6e5b /spec/workers | |
parent | e17ccef5cadd7b8962a10bb43b1332658a54bd96 (diff) | |
parent | d5094e7c0aa8b41114b77e57f29d4002b8c00278 (diff) | |
download | gitlab-ce-498e34c6a4c990ae7d90b2d09cf4e73b9f228e13.tar.gz |
Merge branch 'dm-remove-prune-web-hook-logs-worker' into 'master'
Remove RemoveOldWebHookLogsWorker
Closes #52592
See merge request gitlab-org/gitlab-ce!23628
Diffstat (limited to 'spec/workers')
-rw-r--r-- | spec/workers/prune_web_hook_logs_worker_spec.rb | 16 | ||||
-rw-r--r-- | spec/workers/remove_old_web_hook_logs_worker_spec.rb | 18 |
2 files changed, 9 insertions, 25 deletions
diff --git a/spec/workers/prune_web_hook_logs_worker_spec.rb b/spec/workers/prune_web_hook_logs_worker_spec.rb index d7d64a1f641..b3ec71d4a00 100644 --- a/spec/workers/prune_web_hook_logs_worker_spec.rb +++ b/spec/workers/prune_web_hook_logs_worker_spec.rb @@ -5,18 +5,20 @@ describe PruneWebHookLogsWorker do before do hook = create(:project_hook) - 5.times do - create(:web_hook_log, web_hook: hook, created_at: 5.months.ago) - end - + create(:web_hook_log, web_hook: hook, created_at: 5.months.ago) + create(:web_hook_log, web_hook: hook, created_at: 4.months.ago) + create(:web_hook_log, web_hook: hook, created_at: 91.days.ago) + create(:web_hook_log, web_hook: hook, created_at: 89.days.ago) + create(:web_hook_log, web_hook: hook, created_at: 2.months.ago) + create(:web_hook_log, web_hook: hook, created_at: 1.month.ago) create(:web_hook_log, web_hook: hook, response_status: '404') end - it 'removes all web hook logs older than one month' do + it 'removes all web hook logs older than 90 days' do described_class.new.perform - expect(WebHookLog.count).to eq(1) - expect(WebHookLog.first.response_status).to eq('404') + expect(WebHookLog.count).to eq(4) + expect(WebHookLog.last.response_status).to eq('404') end end end diff --git a/spec/workers/remove_old_web_hook_logs_worker_spec.rb b/spec/workers/remove_old_web_hook_logs_worker_spec.rb deleted file mode 100644 index 6d26ba5dfa0..00000000000 --- a/spec/workers/remove_old_web_hook_logs_worker_spec.rb +++ /dev/null @@ -1,18 +0,0 @@ -require 'spec_helper' - -describe RemoveOldWebHookLogsWorker do - subject { described_class.new } - - describe '#perform' do - let!(:week_old_record) { create(:web_hook_log, created_at: Time.now - 1.week) } - let!(:three_days_old_record) { create(:web_hook_log, created_at: Time.now - 3.days) } - let!(:one_day_old_record) { create(:web_hook_log, created_at: Time.now - 1.day) } - - it 'removes web hook logs older than 2 days' do - subject.perform - - expect(WebHookLog.all).to include(one_day_old_record) - expect(WebHookLog.all).not_to include(week_old_record, three_days_old_record) - end - end -end |