Merge branch 'master' into refactor-messages

# Conflicts:
#	app/views/epp/poll/poll_req.xml.builder
#	test/fixtures/messages.yml
#	test/integration/epp/poll_test.rb
This commit is contained in:
Artur Beljajev 2018-09-17 13:21:33 +03:00
commit 1679e4b72e
8 changed files with 55 additions and 7 deletions

View file

@ -22,7 +22,6 @@ class WhoisRecordTest < ActiveSupport::TestCase
registrant_kind: 'priv',
email: 'john@inbox.test',
expire: '2010-07-05',
nameservers: ['ns1.bestnames.test', 'ns2.bestnames.test'],
registrar_address: 'Main Street, New York, New York, 12345',
dnssec_keys: [],
}
@ -30,6 +29,10 @@ class WhoisRecordTest < ActiveSupport::TestCase
expected_partial_hash.each do |key, value|
assert_equal(value, @record.generated_json[key])
end
['ns1.bestnames.test', 'ns2.bestnames.test'].each do |item|
assert(@record.generated_json[:nameservers].include?(item))
end
end
def test_generated_body_has_justified_disclaimer