Merge branch 'dm-remove-prune-web-hook-logs-worker' into 'master'

Remove RemoveOldWebHookLogsWorker

Closes #52592

See merge request gitlab-org/gitlab-ce!23628

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