Merge pull request #756 from uktrade/develop

Release 13/11
uktrade · Nov 13, 2020 · 7e32582 · 7e32582
2 parents 86552ca + 95e3734
commit 7e32582
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/app/workers/delete_old_subscription_notifications_worker.rb b/app/workers/delete_old_subscription_notifications_worker.rb
@@ -4,6 +4,6 @@ class DeleteOldSubscriptionNotificationsWorker
   sidekiq_options retry: false
 
   def perform
-    SubscriptionNotification.where('created_at > ?', 30.days.ago).destroy_all
+    SubscriptionNotification.where('created_at < ?', 1.month.ago).destroy_all
   end
 end
diff --git a/spec/workers/delete_old_subscription_notifications_worker_spec.rb b/spec/workers/delete_old_subscription_notifications_worker_spec.rb
@@ -2,18 +2,16 @@
 
 RSpec.describe DeleteOldSubscriptionNotificationsWorker do
 
+  subject { DeleteOldSubscriptionNotificationsWorker.new }
+
   it 'deletes subscription notifications older than 30 days' do
-    SubscriptionNotification.destroy_all
+    SubscriptionNotification.delete_all
     create(:subscription_notification)
-    old_notification = create(:subscription_notification)
-    old_notification.update_columns(
-      updated_at: 2.months.ago,
-      created_at: 2.months.ago
-    )
+    travel_to(2.months.ago) { create(:subscription_notification) }
 
-    expect(SubscriptionNotification.count).to eq(2)
-    DeleteOldSubscriptionNotificationsWorker.new.perform
-    expect(SubscriptionNotification.count).to eq(1)
+    expect { subject.perform }
+      .to change { SubscriptionNotification.count }.from(2).to(1)
+    expect(SubscriptionNotification.where('created_at < ?', 1.month.ago))
+      .to be_empty
   end
-
 end