Merge branch 'increase-event-retention-prune-old-events-worker' into 'master'

Prune events older than 2 years instead of 12 months

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

1 files changed, 13 insertions, 7 deletions

diff --git a/spec/workers/prune_old_events_worker_spec.rb b/spec/workers/prune_old_events_worker_spec.rb
index ea974355050..b999a6fd5b6 100644
--- a/spec/workers/prune_old_events_worker_spec.rb
+++ b/spec/workers/prune_old_events_worker_spec.rb
@@ -4,23 +4,29 @@ describe PruneOldEventsWorker do
   describe '#perform' do
     let(:user) { create(:user) }
 
-    let!(:expired_event) { create(:event, :closed, author: user, created_at: 13.months.ago) }
-    let!(:not_expired_event) { create(:event, :closed, author: user,  created_at: 1.day.ago) }
-    let!(:exactly_12_months_event) { create(:event, :closed, author: user, created_at: 12.months.ago) }
+    let!(:expired_event) { create(:event, :closed, author: user, created_at: 25.months.ago) }
+    let!(:not_expired_1_day_event) { create(:event, :closed, author: user,  created_at: 1.day.ago) }
+    let!(:not_expired_13_month_event) { create(:event, :closed, author: user,  created_at: 13.months.ago) }
+    let!(:not_expired_2_years_event) { create(:event, :closed, author: user, created_at: 2.years.ago) }
 
-    it 'prunes events older than 12 months' do
+    it 'prunes events older than 2 years' do
       expect { subject.perform }.to change { Event.count }.by(-1)
       expect(Event.find_by(id: expired_event.id)).to be_nil
     end
 
     it 'leaves fresh events' do
       subject.perform
-      expect(not_expired_event.reload).to be_present
+      expect(not_expired_1_day_event.reload).to be_present
     end
 
-    it 'leaves events from exactly 12 months ago' do
+    it 'leaves events from 13 months ago' do
       subject.perform
-      expect(exactly_12_months_event).to be_present
+      expect(not_expired_13_month_event.reload).to be_present
+    end
+
+    it 'leaves events from 2 years ago' do
+      subject.perform
+      expect(not_expired_2_years_event).to be_present
     end
   end
 end