mirror of
https://github.com/internetee/registry.git
synced 2025-07-25 12:08:27 +02:00
Merge remote-tracking branch 'origin/master' into 1177-bulk-force-delete
This commit is contained in:
commit
6eddbb81ad
12 changed files with 222 additions and 28 deletions
|
@ -8,7 +8,18 @@ class DomainExpireMailerTest < ActionMailer::TestCase
|
|||
email = DomainExpireMailer.expired(domain: domain, registrar: domain.registrar).deliver_now
|
||||
|
||||
assert_emails 1
|
||||
assert_equal 'Domeen shop.test on aegunud / Domain shop.test has expired' \
|
||||
' / Срок действия домена shop.test истек', email.subject
|
||||
assert_equal I18n.t("domain_expire_mailer.expired.subject", domain_name: domain.name),
|
||||
email.subject
|
||||
end
|
||||
end
|
||||
|
||||
def test_delivers_domain_expiration_soft_email
|
||||
domain = domains(:shop)
|
||||
assert_equal 'shop.test', domain.name
|
||||
|
||||
email = DomainExpireMailer.expired_soft(domain: domain, registrar: domain.registrar).deliver_now
|
||||
|
||||
assert_emails 1
|
||||
assert_equal I18n.t("domain_expire_mailer.expired_soft.subject", domain_name: domain.name),
|
||||
email.subject
|
||||
end
|
||||
end
|
||||
|
|
|
@ -4,4 +4,10 @@ class DomainExpireMailerPreview < ActionMailer::Preview
|
|||
DomainExpireMailer.expired(domain: domain,
|
||||
registrar: domain.registrar)
|
||||
end
|
||||
end
|
||||
|
||||
def expired_soft
|
||||
domain = Domain.first
|
||||
DomainExpireMailer.expired_soft(domain: domain,
|
||||
registrar: domain.registrar)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -150,19 +150,36 @@ class NewDomainForceDeleteTest < ActiveSupport::TestCase
|
|||
assert_equal @domain.statuses.size, statuses.size
|
||||
end
|
||||
|
||||
def test_cancelling_force_delete_removes_statuses_that_were_set_on_force_delete
|
||||
statuses = [
|
||||
DomainStatus::FORCE_DELETE,
|
||||
DomainStatus::SERVER_RENEW_PROHIBITED,
|
||||
DomainStatus::SERVER_TRANSFER_PROHIBITED,
|
||||
]
|
||||
@domain.statuses = @domain.statuses + statuses
|
||||
def test_cancelling_force_delete_removes_force_delete_status
|
||||
@domain.schedule_force_delete(type: :fast_track)
|
||||
|
||||
assert @domain.statuses.include?(DomainStatus::FORCE_DELETE)
|
||||
assert @domain.statuses.include?(DomainStatus::SERVER_RENEW_PROHIBITED)
|
||||
assert @domain.statuses.include?(DomainStatus::SERVER_TRANSFER_PROHIBITED)
|
||||
|
||||
@domain.cancel_force_delete
|
||||
@domain.reload
|
||||
|
||||
assert_empty @domain.statuses & statuses
|
||||
assert_not @domain.statuses.include?(DomainStatus::FORCE_DELETE)
|
||||
assert_not @domain.statuses.include?(DomainStatus::SERVER_RENEW_PROHIBITED)
|
||||
assert_not @domain.statuses.include?(DomainStatus::SERVER_TRANSFER_PROHIBITED)
|
||||
end
|
||||
|
||||
def test_cancelling_force_delete_keeps_previous_statuses
|
||||
statuses = [
|
||||
DomainStatus::SERVER_RENEW_PROHIBITED,
|
||||
DomainStatus::SERVER_TRANSFER_PROHIBITED,
|
||||
]
|
||||
|
||||
@domain.statuses = statuses
|
||||
@domain.save!
|
||||
@domain.reload
|
||||
|
||||
@domain.schedule_force_delete(type: :fast_track)
|
||||
@domain.cancel_force_delete
|
||||
@domain.reload
|
||||
|
||||
assert_equal @domain.statuses, statuses
|
||||
end
|
||||
|
||||
def test_hard_force_delete_should_have_outzone_and_purge_date_with_time
|
||||
|
|
|
@ -14,7 +14,7 @@ class RegistrantUserCreationTest < ActiveSupport::TestCase
|
|||
assert_equal('JOHN SMITH', user.username)
|
||||
end
|
||||
|
||||
def test_find_or_create_by_api_data_creates_a_user_after_upcasing_input
|
||||
def test_find_or_create_by_api_data_creates_a_user_with_original_name
|
||||
user_data = {
|
||||
ident: '37710100070',
|
||||
first_name: 'John',
|
||||
|
@ -24,6 +24,25 @@ class RegistrantUserCreationTest < ActiveSupport::TestCase
|
|||
RegistrantUser.find_or_create_by_api_data(user_data)
|
||||
|
||||
user = User.find_by(registrant_ident: 'EE-37710100070')
|
||||
assert_equal('JOHN SMITH', user.username)
|
||||
assert_equal('John Smith', user.username)
|
||||
end
|
||||
|
||||
def test_updates_related_contacts_name_if_differs_from_e_identity
|
||||
contact = contacts(:john)
|
||||
contact.update(ident: '39708290276', ident_country_code: 'EE')
|
||||
|
||||
user_data = {
|
||||
ident: '39708290276',
|
||||
first_name: 'John',
|
||||
last_name: 'Doe'
|
||||
}
|
||||
|
||||
RegistrantUser.find_or_create_by_api_data(user_data)
|
||||
|
||||
user = User.find_by(registrant_ident: 'EE-39708290276')
|
||||
assert_equal('John Doe', user.username)
|
||||
|
||||
contact.reload
|
||||
assert_equal user.username, contact.name
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue