Merge pull request #1902 from internetee/1900-removing-registry-lock-should-not-remove-statuses-set-prior-to-setting-it

implement domain statuses restore after domain locked, added test

test/models/domain/force_delete_test.rb

@@ -12,6 +12,29 @@ class ForceDeleteTest < ActionMailer::TestCase
     Truemail.configure.default_validation_type = @old_validation_type
   end
 
+  def test_restore_domain_statuses_after_soft_force_delete
+    @domain.update(statuses: [DomainStatus::SERVER_RENEW_PROHIBITED])
+    @domain.schedule_force_delete(type: :soft)
+    
+    assert @domain.force_delete_scheduled?
+
+    assert @domain.force_delete_domain_statuses_history.include? DomainStatus::SERVER_RENEW_PROHIBITED
+
+    @domain.cancel_force_delete
+    assert @domain.statuses.include? DomainStatus::SERVER_RENEW_PROHIBITED
+  end
+
+  def test_clear_force_delete_domain_statuses_history
+    @domain.update(statuses: [DomainStatus::SERVER_RENEW_PROHIBITED])
+    @domain.schedule_force_delete(type: :soft)
+    
+    assert @domain.force_delete_scheduled?
+    assert @domain.force_delete_domain_statuses_history.include? DomainStatus::SERVER_RENEW_PROHIBITED
+    @domain.cancel_force_delete
+
+    assert_nil @domain.force_delete_domain_statuses_history
+  end
+
   def test_schedules_force_delete_fast_track
     assert_not @domain.force_delete_scheduled?
     travel_to Time.zone.parse('2010-07-05')

test/models/domain/registry_lockable_test.rb

@@ -3,7 +3,6 @@ require 'test_helper'
 class DomainRegistryLockableTest < ActiveSupport::TestCase
   def setup
     super
-
     @domain = domains(:airport)
   end
 
@@ -33,6 +32,56 @@ class DomainRegistryLockableTest < ActiveSupport::TestCase
     assert_not(@domain.locked_by_registrant?)
   end
 
+  def test_remove_lockalable_statuses_after_admin_intervention
+    @domain.apply_registry_lock
+    assert @domain.locked_by_registrant?
+    assert_equal @domain.statuses.sort, Domain::RegistryLockable::LOCK_STATUSES.sort
+
+    deleted_status = @domain.statuses - [DomainStatus::SERVER_DELETE_PROHIBITED]
+    @domain.update(statuses: deleted_status)
+    assert_not @domain.locked_by_registrant?
+
+    @domain.apply_registry_lock
+    assert @domain.locked_by_registrant?
+    @domain.remove_registry_lock
+
+    assert_not @domain.statuses.include? DomainStatus::SERVER_UPDATE_PROHIBITED
+    assert_not @domain.statuses.include? DomainStatus::SERVER_TRANSFER_PROHIBITED
+    assert_not @domain.statuses.include? DomainStatus::SERVER_DELETE_PROHIBITED
+  end
+
+  def test_restore_domain_statuses_after_unlock
+    @domain.statuses = [DomainStatus::SERVER_UPDATE_PROHIBITED]
+    @domain.admin_store_statuses_history = [DomainStatus::SERVER_UPDATE_PROHIBITED]
+    @domain.save
+    assert @domain.admin_store_statuses_history.include? DomainStatus::SERVER_UPDATE_PROHIBITED
+
+    @domain.apply_registry_lock
+    assert @domain.locked_by_registrant?
+    assert_equal @domain.statuses.sort, Domain::RegistryLockable::LOCK_STATUSES.sort
+
+    @domain.remove_registry_lock
+    assert @domain.statuses.include? DomainStatus::SERVER_UPDATE_PROHIBITED
+    assert_not @domain.statuses.include? DomainStatus::SERVER_TRANSFER_PROHIBITED
+    assert_not @domain.statuses.include? DomainStatus::SERVER_DELETE_PROHIBITED
+  end
+
+  def test_add_additinal_status_for_locked_domain
+    @domain.apply_registry_lock
+    assert @domain.locked_by_registrant?
+    assert_equal @domain.statuses.sort, Domain::RegistryLockable::LOCK_STATUSES.sort
+
+    @domain.statuses += [DomainStatus::SERVER_RENEW_PROHIBITED]
+    @domain.admin_store_statuses_history = [DomainStatus::SERVER_RENEW_PROHIBITED]
+    @domain.save
+
+    @domain.remove_registry_lock
+    assert @domain.statuses.include? DomainStatus::SERVER_RENEW_PROHIBITED
+    assert_not @domain.statuses.include? DomainStatus::SERVER_UPDATE_PROHIBITED
+    assert_not @domain.statuses.include? DomainStatus::SERVER_TRANSFER_PROHIBITED
+    assert_not @domain.statuses.include? DomainStatus::SERVER_DELETE_PROHIBITED
+  end
+
   def test_registry_lock_on_lockable_domain
     refute(@domain.locked_by_registrant?)
     @domain.apply_registry_lock

test/models/domain_test.rb

@@ -27,6 +27,16 @@ class DomainTest < ActiveSupport::TestCase
     assert domains(:invalid).invalid?
   end
 
+  def test_valid_domain_statuses_history
+    @domain.force_delete_domain_statuses_history = [DomainStatus::SERVER_UPDATE_PROHIBITED, DomainStatus::SERVER_TRANSFER_PROHIBITED]
+    @domain.admin_store_statuses_history = [DomainStatus::SERVER_UPDATE_PROHIBITED]
+    assert @domain.valid?
+    
+    assert @domain.json_statuses_history['force_delete_domain_statuses_history'].include? 'serverUpdateProhibited'
+    assert @domain.json_statuses_history['force_delete_domain_statuses_history'].include? 'serverTransferProhibited'
+    assert_equal @domain.json_statuses_history['admin_store_statuses_history'], ['serverUpdateProhibited']
+  end
+
   # https://www.internet.ee/domeenid/ee-domeenireeglid#domeeninimede-registreerimine
   def test_validates_name_format
     assert_equal dns_zones(:one).origin, 'test'