Rename Domain#domain_transfers to #transfers

#694
This commit is contained in:
Artur Beljajev 2018-02-19 05:05:35 +02:00
parent 25e34b388d
commit a7ed2f35d7
5 changed files with 8 additions and 8 deletions

View file

@ -49,7 +49,7 @@ class Domain < ActiveRecord::Base
accepts_nested_attributes_for :domain_statuses, allow_destroy: true, accepts_nested_attributes_for :domain_statuses, allow_destroy: true,
reject_if: proc { |attrs| attrs[:value].blank? } 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 has_many :dnskeys, dependent: :destroy
@ -280,7 +280,7 @@ class Domain < ActiveRecord::Base
end end
def pending_transfer def pending_transfer
domain_transfers.find_by(status: DomainTransfer::PENDING) transfers.find_by(status: DomainTransfer::PENDING)
end end
def server_holdable? def server_holdable?

View file

@ -628,7 +628,7 @@ class Epp::Domain < Domain
case action case action
when 'query' when 'query'
return domain_transfers.last if domain_transfers.any? return transfers.last if transfers.any?
when 'request' when 'request'
return pending_transfer if pending_transfer return pending_transfer if pending_transfer
return query_transfer(frame, current_user) return query_transfer(frame, current_user)
@ -652,7 +652,7 @@ class Epp::Domain < Domain
end end
transaction do transaction do
dt = domain_transfers.create!( dt = transfers.create!(
transfer_requested_at: Time.zone.now, transfer_requested_at: Time.zone.now,
old_registrar: registrar, old_registrar: registrar,
new_registrar: current_user.registrar new_registrar: current_user.registrar

View file

@ -16,14 +16,14 @@ class APIDomainTransfersTest < ActionDispatch::IntegrationTest
end end
def test_creates_new_domain_transfer 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 } post '/repp/v1/domain_transfers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key }
end end
end end
def test_approves_automatically_if_auto_approval_is_enabled def test_approves_automatically_if_auto_approval_is_enabled
post '/repp/v1/domain_transfers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key } 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 end
def test_changes_registrar def test_changes_registrar

View file

@ -34,7 +34,7 @@ class EppDomainTransferQueryTest < ActionDispatch::IntegrationTest
end end
def test_no_domain_transfer 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' } post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' }
assert_equal '2303', Nokogiri::XML(response.body).at_css('result')[:code] assert_equal '2303', Nokogiri::XML(response.body).at_css('result')[:code]
end end

View file

@ -13,7 +13,7 @@ class EppDomainTransferRequestTest < ActionDispatch::IntegrationTest
end end
def test_creates_new_domain_transfer 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' } post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' }
end end
end end