From fc3a764896e473e0cd69a369f843260cf41e978e Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Mon, 1 Feb 2021 16:52:38 +0500 Subject: [PATCH] Fix discarded domains test --- app/models/concerns/contact/identical.rb | 9 ++++++++- test/integration/api/domain_admin_contacts_test.rb | 9 ++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/models/concerns/contact/identical.rb b/app/models/concerns/contact/identical.rb index aa527f723..1a5516bc5 100644 --- a/app/models/concerns/contact/identical.rb +++ b/app/models/concerns/contact/identical.rb @@ -11,6 +11,13 @@ module Concerns::Contact::Identical ident_country_code org_name ] + + IDENTICAL_ATTRIBUTES = %w[ + ident + ident_type + ident_country_code + ] + private_constant :IDENTIFIABLE_ATTRIBUTES def identical(registrar) @@ -21,7 +28,7 @@ module Concerns::Contact::Identical end def identical_to?(contact) - IDENTIFIABLE_ATTRIBUTES.all? do |attribute| + IDENTICAL_ATTRIBUTES.all? do |attribute| self.attributes[attribute] == contact.attributes[attribute] end end diff --git a/test/integration/api/domain_admin_contacts_test.rb b/test/integration/api/domain_admin_contacts_test.rb index cce80e0c3..2e8cbe6da 100644 --- a/test/integration/api/domain_admin_contacts_test.rb +++ b/test/integration/api/domain_admin_contacts_test.rb @@ -9,12 +9,7 @@ class APIDomainAdminContactsTest < ApplicationIntegrationTest @admin_new.update(ident: @admin_current.ident, ident_type: @admin_current.ident_type, - ident_country_code: @admin_current.ident_country_code, - name: @admin_current.name, - email: @admin_current.email, - phone: @admin_current.phone, - fax: @admin_current.fax, - org_name: @admin_current.org_name) + ident_country_code: @admin_current.ident_country_code) end def test_replace_all_admin_contacts_when_ident_data_doesnt_match @@ -49,7 +44,7 @@ class APIDomainAdminContactsTest < ApplicationIntegrationTest new_contact_id: @admin_new.code }, headers: { 'HTTP_AUTHORIZATION' => http_auth_key } - assert domains(:shop).admin_contacts.find_by(code: @admin_current.code) + assert domains(:airport).admin_contacts.find_by(code: @admin_current.code) end def test_return_affected_domains_in_alphabetical_order