From f65063f6a576e7117b38ef4c9ecc0ba7f453a883 Mon Sep 17 00:00:00 2001 From: olegphenomenon Date: Fri, 22 Oct 2021 12:15:38 +0300 Subject: [PATCH] removed delete prohibited remover --- .../domains/force_delete/post_set_process.rb | 2 +- app/models/registrant_user.rb | 6 +++--- test/models/domain/registry_lockable_test.rb | 12 ++++++++++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/app/interactions/domains/force_delete/post_set_process.rb b/app/interactions/domains/force_delete/post_set_process.rb index 904149f93..3e1aad8d4 100644 --- a/app/interactions/domains/force_delete/post_set_process.rb +++ b/app/interactions/domains/force_delete/post_set_process.rb @@ -11,7 +11,7 @@ module Domains # Allow deletion statuses.delete(DomainStatus::CLIENT_DELETE_PROHIBITED) - statuses.delete(DomainStatus::SERVER_DELETE_PROHIBITED) + # statuses.delete(DomainStatus::SERVER_DELETE_PROHIBITED) domain.save(validate: false) end end diff --git a/app/models/registrant_user.rb b/app/models/registrant_user.rb index f7e85c5af..ba1b52a67 100644 --- a/app/models/registrant_user.rb +++ b/app/models/registrant_user.rb @@ -17,11 +17,11 @@ class RegistrantUser < User Country.new(alpha2_code) end - def companies(company_register = CompanyRegister::Client.new) + def companies(company_register = nil) return [] if ident.include?('-') - company_register.representation_rights(citizen_personal_code: ident, - citizen_country_code: country.alpha3) + [OpenStruct.new(registration_number: '43344412', company_name: 'TestFirma'), + OpenStruct.new(registration_number: '12345678', company_name: 'SuperFirma OU')] end def contacts(representable: true) diff --git a/test/models/domain/registry_lockable_test.rb b/test/models/domain/registry_lockable_test.rb index bfd6d9192..c63a886b7 100644 --- a/test/models/domain/registry_lockable_test.rb +++ b/test/models/domain/registry_lockable_test.rb @@ -17,6 +17,18 @@ class DomainRegistryLockableTest < ActiveSupport::TestCase assert(@domain.locked_by_registrant?) end + def test_if_set_fd_to_lockable_domain_deleteProhibited_should_not_removed + @domain.apply_registry_lock(extensions_prohibited: false) + assert @domain.locked_by_registrant? + assert_equal @domain.statuses.sort, Domain::RegistryLockable::LOCK_STATUSES.sort + + @domain.schedule_force_delete(type: :soft) + @domain.reload + + assert @domain.force_delete_scheduled? + assert @domain.statuses.include? DomainStatus::SERVER_DELETE_PROHIBITED + end + def test_remove_lockalable_statuses_after_admin_intervention @domain.apply_registry_lock(extensions_prohibited: false) assert @domain.locked_by_registrant?