From 9503850d71c0ec24f1201334715f7b9f05ea8913 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Mon, 26 Oct 2020 14:00:19 +0500 Subject: [PATCH] Remove extra day from soft delete years Closes #1720 --- app/models/concerns/domain/force_delete.rb | 2 +- test/models/domain/force_delete_test.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/concerns/domain/force_delete.rb b/app/models/concerns/domain/force_delete.rb index af3aaa7c7..9b75d1e92 100644 --- a/app/models/concerns/domain/force_delete.rb +++ b/app/models/concerns/domain/force_delete.rb @@ -106,7 +106,7 @@ module Concerns::Domain::ForceDelete # rubocop:disable Metrics/ModuleLength end def soft_delete_dates(years) - self.force_delete_start = valid_to - years.years + 1.day + self.force_delete_start = valid_to - years.years self.force_delete_date = force_delete_start + Setting.expire_warning_period.days + Setting.redemption_grace_period.days end diff --git a/test/models/domain/force_delete_test.rb b/test/models/domain/force_delete_test.rb index ad91ccfec..0969504a4 100644 --- a/test/models/domain/force_delete_test.rb +++ b/test/models/domain/force_delete_test.rb @@ -27,8 +27,8 @@ class NewDomainForceDeleteTest < ActiveSupport::TestCase @domain.reload assert @domain.force_delete_scheduled? - assert_equal Date.parse('2010-09-20'), @domain.force_delete_date.to_date - assert_equal Date.parse('2010-08-06'), @domain.force_delete_start.to_date + assert_equal Date.parse('2010-09-19'), @domain.force_delete_date.to_date + assert_equal Date.parse('2010-08-05'), @domain.force_delete_start.to_date end def test_schedules_force_delete_soft_less_than_year_ahead