diff --git a/app/models/domain.rb b/app/models/domain.rb index 31ba838f2..54dfe608e 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -49,7 +49,7 @@ class Domain < ActiveRecord::Base accepts_nested_attributes_for :domain_statuses, allow_destroy: true, reject_if: proc { |attrs| attrs[:value].blank? } - has_many :domain_transfers, dependent: :destroy + has_many :transfers, class_name: 'DomainTransfer', dependent: :destroy has_many :dnskeys, dependent: :destroy @@ -280,7 +280,7 @@ class Domain < ActiveRecord::Base end def pending_transfer - domain_transfers.find_by(status: DomainTransfer::PENDING) + transfers.find_by(status: DomainTransfer::PENDING) end def server_holdable? diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb index 32a8a2198..8c9e8bcc8 100644 --- a/app/models/epp/domain.rb +++ b/app/models/epp/domain.rb @@ -628,7 +628,7 @@ class Epp::Domain < Domain case action when 'query' - return domain_transfers.last if domain_transfers.any? + return transfers.last if transfers.any? when 'request' return pending_transfer if pending_transfer return query_transfer(frame, current_user) @@ -652,7 +652,7 @@ class Epp::Domain < Domain end transaction do - dt = domain_transfers.create!( + dt = transfers.create!( transfer_requested_at: Time.zone.now, old_registrar: registrar, new_registrar: current_user.registrar diff --git a/test/integration/api/domain_transfers_test.rb b/test/integration/api/domain_transfers_test.rb index acae0e2e0..439b67424 100644 --- a/test/integration/api/domain_transfers_test.rb +++ b/test/integration/api/domain_transfers_test.rb @@ -16,14 +16,14 @@ class APIDomainTransfersTest < ActionDispatch::IntegrationTest end def test_creates_new_domain_transfer - assert_difference -> { @domain.domain_transfers.size } do + assert_difference -> { @domain.transfers.size } do post '/repp/v1/domain_transfers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key } end end def test_approves_automatically_if_auto_approval_is_enabled post '/repp/v1/domain_transfers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key } - assert @domain.domain_transfers(true).last.approved? + assert @domain.transfers.last.approved? end def test_changes_registrar diff --git a/test/integration/epp/domain/transfer/query_test.rb b/test/integration/epp/domain/transfer/query_test.rb index f12cb381f..1412dd9b3 100644 --- a/test/integration/epp/domain/transfer/query_test.rb +++ b/test/integration/epp/domain/transfer/query_test.rb @@ -34,7 +34,7 @@ class EppDomainTransferQueryTest < ActionDispatch::IntegrationTest end def test_no_domain_transfer - domains(:shop).domain_transfers.delete_all + domains(:shop).transfers.delete_all post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } assert_equal '2303', Nokogiri::XML(response.body).at_css('result')[:code] end diff --git a/test/integration/epp/domain/transfer/request_test.rb b/test/integration/epp/domain/transfer/request_test.rb index cc9fb5475..6c28dd67f 100644 --- a/test/integration/epp/domain/transfer/request_test.rb +++ b/test/integration/epp/domain/transfer/request_test.rb @@ -13,7 +13,7 @@ class EppDomainTransferRequestTest < ActionDispatch::IntegrationTest end def test_creates_new_domain_transfer - assert_difference -> { @domain.domain_transfers.size } do + assert_difference -> { @domain.transfers.size } do post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } end end