Merge pull request #1124 from internetee/refactor-force-delete

Refactor force delete

test/fixtures/domains.yml

@@ -8,7 +8,7 @@ shop:
   valid_to: <%= Time.zone.parse('2010-07-05').to_s(:db) %>
   outzone_at: <%= Time.zone.parse('2010-07-06').to_s(:db) %>
   delete_at: <%= Time.zone.parse('2010-07-07').to_s(:db) %>
-  force_delete_at: <%= Time.zone.parse('2010-07-08').to_s(:db) %>
+  force_delete_date: 2010-07-08
   period: 1
   period_unit: m
   uuid: 1b3ee442-e8fe-4922-9492-8fcb9dccc69c

test/lib/serializers/registrant_api/domain_test.rb

@@ -73,7 +73,7 @@ class SerializersRegistrantApiDomainTest < ActiveSupport::TestCase
               registrant tech_contacts admin_contacts transfer_code name_dirty name_puny period
               period_unit creator_str updator_str legacy_id legacy_registrar_id legacy_registrant_id
               outzone_at delete_at registrant_verification_asked_at
-              registrant_verification_token pending_json force_delete_at statuses
+              registrant_verification_token pending_json force_delete_date statuses
               locked_by_registrant_at reserved status_notes nameservers]
 
     assert_equal(keys, @json.keys & keys)

test/models/domain/force_delete_test.rb

@@ -3,21 +3,23 @@ require 'test_helper'
 class DomainForceDeleteTest < ActiveSupport::TestCase
   setup do
     @domain = domains(:shop)
+    @original_redemption_grace_period = Setting.redemption_grace_period
   end
 
-  def test_schedule_force_delete
-    @original_redemption_grace_period = Setting.redemption_grace_period
+  teardown do
+    Setting.redemption_grace_period = @original_redemption_grace_period
+  end
+
+  def test_schedules_force_delete
+    assert_not @domain.force_delete_scheduled?
     Setting.redemption_grace_period = 30
-    travel_to Time.zone.parse('2010-07-05 00:00')
+    travel_to Time.zone.parse('2010-07-05')
 
     @domain.schedule_force_delete
     @domain.reload
 
     assert @domain.force_delete_scheduled?
-    assert_equal Time.zone.parse('2010-08-04 03:00'), @domain.force_delete_at
-
-    travel_back
-    Setting.redemption_grace_period = @original_redemption_grace_period
+    assert_equal Date.parse('2010-08-05'), @domain.force_delete_date
   end
 
   def test_scheduling_force_delete_adds_corresponding_statuses
@@ -80,6 +82,17 @@ class DomainForceDeleteTest < ActiveSupport::TestCase
     end
   end
 
+  def test_cancels_force_delete
+    @domain.update_columns(statuses: [DomainStatus::FORCE_DELETE], force_delete_date: '2010-07-05')
+    assert @domain.force_delete_scheduled?
+
+    @domain.cancel_force_delete
+    @domain.reload
+
+    assert_not @domain.force_delete_scheduled?
+    assert_nil @domain.force_delete_date
+  end
+
   def test_cancelling_force_delete_bypasses_validation
     @domain = domains(:invalid)
     @domain.schedule_force_delete

test/models/domain/releasable/auctionable_test.rb

@@ -40,6 +40,15 @@ class DomainReleasableAuctionableTest < ActiveSupport::TestCase
     assert_not @domain.domain_name.at_auction?
   end
 
+  def test_sells_domains_with_scheduled_force_delete_procedure_at_auction
+    @domain.update!(force_delete_date: '2010-07-05')
+    travel_to Time.zone.parse('2010-07-05')
+
+    Domain.release_domains
+
+    assert @domain.domain_name.at_auction?
+  end
+
   def test_deletes_registered_domain
     @domain.update!(delete_at: Time.zone.parse('2010-07-05 07:59'))
     travel_to Time.zone.parse('2010-07-05 08:00')

test/models/domain/releasable/discardable_test.rb

@@ -15,6 +15,16 @@ class DomainReleasableDiscardableTest < ActiveSupport::TestCase
     assert @domain.discarded?
   end
 
+  def test_discards_domains_with_scheduled_force_delete_procedure
+    @domain.update!(force_delete_date: '2010-07-05')
+    travel_to Time.zone.parse('2010-07-05')
+
+    Domain.release_domains
+    @domain.reload
+
+    assert @domain.discarded?
+  end
+
   def test_ignores_domains_with_delete_at_in_the_future_or_now
     @domain.update!(delete_at: Time.zone.parse('2010-07-05 08:00'))
     travel_to Time.zone.parse('2010-07-05 08:00')

test/system/registrant_area/domains/details_test.rb

@@ -7,7 +7,10 @@ class RegistrantAreaDomainDetailsTest < ApplicationSystemTestCase
   end
 
   def test_general_data
+    @domain.update_columns(force_delete_date: '2010-07-08', statuses: [DomainStatus::FORCE_DELETE])
+
     visit registrant_domain_url(@domain)
+
     assert_text 'Name shop.test'
     assert_text "Registered at #{l Time.zone.parse('2010-07-04')}"
     assert_link 'Best Names', href: registrant_registrar_path(@domain.registrar)
@@ -18,7 +21,7 @@ class RegistrantAreaDomainDetailsTest < ApplicationSystemTestCase
     assert_text "Valid to #{l Time.zone.parse('2010-07-05')}"
     assert_text "Outzone at #{l Time.zone.parse('2010-07-06')}"
     assert_text "Delete at #{l Time.zone.parse('2010-07-07')}"
-    assert_text "Force delete at #{l Time.zone.parse('2010-07-08')}"
+    assert_text "Force delete date #{l Date.parse('2010-07-08')}"
   end
 
   def test_registrant