zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-08 13:44:47 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add BulkUpdatable concern, fix tests

Browse source
This commit is contained in:
Alex Sherman 2021-02-01 17:13:19 +05:00
parent fc3a764896
commit da032dad79
2 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/admin_domain_contact.rb
View file

@ -5,7 +5,7 @@ class AdminDomainContact < DomainContact
admin_contacts = where(contact: current_contact) admin_contacts = where(contact: current_contact)
admin_contacts.each do |admin_contact| admin_contacts.each do |admin_contact|
if admin_contact.domain.discarded? if admin_contact.domain.bulk_update_prohibited?
skipped_domains << admin_contact.domain.name skipped_domains << admin_contact.domain.name
next next
end end

18
test/integration/api/domain_admin_contacts_test.rb
View file

@ -4,7 +4,7 @@ class APIDomainAdminContactsTest < ApplicationIntegrationTest
setup do setup do
@admin_current = domains(:shop).admin_contacts.find_by(code: 'jane-001') @admin_current = domains(:shop).admin_contacts.find_by(code: 'jane-001')
domain = domains(:airport) domain = domains(:airport)
domain.admin_contacts = [@admin_current] domain.admin_contacts << @admin_current
@admin_new = contacts(:william) @admin_new = contacts(:william)
@admin_new.update(ident: @admin_current.ident, @admin_new.update(ident: @admin_current.ident,
@ -48,6 +48,8 @@ class APIDomainAdminContactsTest < ApplicationIntegrationTest
end end
def test_return_affected_domains_in_alphabetical_order def test_return_affected_domains_in_alphabetical_order
domain = domains(:airport)
domain.admin_contacts = [@admin_current]
patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current.code, patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current.code,
new_contact_id: @admin_new.code }, new_contact_id: @admin_new.code },
headers: { 'HTTP_AUTHORIZATION' => http_auth_key } headers: { 'HTTP_AUTHORIZATION' => http_auth_key }
@ -124,23 +126,15 @@ class APIDomainAdminContactsTest < ApplicationIntegrationTest
JSON.parse(response.body, symbolize_names: true) JSON.parse(response.body, symbolize_names: true)
end end
def test_disallow_self_replacement
patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current.code,
new_contact_id: @admin_current.code },
headers: { 'HTTP_AUTHORIZATION' => http_auth_key }
assert_response :bad_request
assert_equal ({ code: 2304, message: 'New contact must be different from current', data: {} }),
JSON.parse(response.body, symbolize_names: true)
end
def test_admin_bulk_changed_when_domain_update_prohibited def test_admin_bulk_changed_when_domain_update_prohibited
domains(:shop).update!(statuses: [DomainStatus::SERVER_UPDATE_PROHIBITED]) domains(:shop).update!(statuses: [DomainStatus::SERVER_UPDATE_PROHIBITED])
domains(:airport).admin_contacts = [@admin_current]
shop_admin_contact = Contact.find_by(code: 'jane-001') shop_admin_contact = Contact.find_by(code: 'jane-001')
assert domains(:shop).admin_contacts.include?(shop_admin_contact) assert domains(:shop).admin_contacts.include?(shop_admin_contact)
patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: 'jane-001', patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current.code,
new_contact_id: 'john-001' }, new_contact_id: @admin_new.code },
headers: { 'HTTP_AUTHORIZATION' => http_auth_key } headers: { 'HTTP_AUTHORIZATION' => http_auth_key }
assert_response :ok assert_response :ok