From 3a77e420bdfd644740f325c258994f1191162d9a Mon Sep 17 00:00:00 2001 From: Oleg Hasjanov Date: Thu, 4 Mar 2021 15:32:19 +0200 Subject: [PATCH] test: removed unless tests, added new tests for dnskey and for domain --- test/helpers/form_helper_test.rb | 11 ++++ test/helpers/form_tag_helper_test.rb | 9 +++ .../domain_update_confirms_test.rb | 18 ------ .../registrar_area/domains_test.rb | 2 + test/models/dns/zone_test.rb | 4 ++ test/models/dnskey_test.rb | 59 +++++++++++++++++-- 6 files changed, 79 insertions(+), 24 deletions(-) create mode 100644 test/helpers/form_helper_test.rb create mode 100644 test/helpers/form_tag_helper_test.rb delete mode 100644 test/integration/registrant_area/domain_update_confirms_test.rb diff --git a/test/helpers/form_helper_test.rb b/test/helpers/form_helper_test.rb new file mode 100644 index 000000000..199384170 --- /dev/null +++ b/test/helpers/form_helper_test.rb @@ -0,0 +1,11 @@ +require 'test_helper' + +class FormHelperTest < ActionView::TestCase + def test_legal_document_field + meth = MiniTest::Mock.new + returned_legal_document_field = ApplicationController.helpers.legal_document_field('Hello', meth) + + assert returned_legal_document_field.include? 'data-legal-document="true"' + assert returned_legal_document_field.include? 'accept=".pdf,.asice,.asics,.sce,.scs,.adoc,.edoc,.bdoc,.zip,.rar,.gz,.tar,.7z,.odt,.doc,.docx"' + end +end \ No newline at end of file diff --git a/test/helpers/form_tag_helper_test.rb b/test/helpers/form_tag_helper_test.rb new file mode 100644 index 000000000..f664957fc --- /dev/null +++ b/test/helpers/form_tag_helper_test.rb @@ -0,0 +1,9 @@ +require 'test_helper' + +class FormTagHelperTest < ActionView::TestCase + def test_legal_document_field + returned_legal_document_field = ApplicationController.helpers.legal_document_field_tag('Hello') + assert returned_legal_document_field.include? 'data-legal-document="true"' + assert returned_legal_document_field.include? 'accept=".pdf,.asice,.asics,.sce,.scs,.adoc,.edoc,.bdoc,.zip,.rar,.gz,.tar,.7z,.odt,.doc,.docx"' + end +end \ No newline at end of file diff --git a/test/integration/registrant_area/domain_update_confirms_test.rb b/test/integration/registrant_area/domain_update_confirms_test.rb deleted file mode 100644 index dae83e1ea..000000000 --- a/test/integration/registrant_area/domain_update_confirms_test.rb +++ /dev/null @@ -1,18 +0,0 @@ -require 'test_helper' - -class RegistrantAreaDomainUpdateConfirmsIntegrationTest < ApplicationIntegrationTest - - setup do - @domain = domains(:shop) - end - - def test_show_confirm_to_update_domain - @domain.update!(registrant_verification_asked_at: Time.zone.now, - registrant_verification_token: 'test', - statuses: [DomainStatus::PENDING_UPDATE]) - - get registrant_domain_update_confirm_path(@domain, token: 'test', confirmed: true) - - assert @domain.registrant_update_confirmable?('test') - end -end diff --git a/test/integration/registrar_area/domains_test.rb b/test/integration/registrar_area/domains_test.rb index 1a4e0534c..307bcae5e 100644 --- a/test/integration/registrar_area/domains_test.rb +++ b/test/integration/registrar_area/domains_test.rb @@ -1,6 +1,8 @@ require 'test_helper' class RegistrarAreaDomainsIntegrationTest < ApplicationIntegrationTest + include FormTagHelper + setup do sign_in users(:api_bestnames) end diff --git a/test/models/dns/zone_test.rb b/test/models/dns/zone_test.rb index fab4c6355..b77669a25 100644 --- a/test/models/dns/zone_test.rb +++ b/test/models/dns/zone_test.rb @@ -178,6 +178,10 @@ class DNS::ZoneTest < ActiveSupport::TestCase assert_nil Whois::Record.find_by(name: subzone.origin) end + def test_generate_zonefile + + end + private def valid_zone diff --git a/test/models/dnskey_test.rb b/test/models/dnskey_test.rb index ab2f11c6d..2f4eff3af 100644 --- a/test/models/dnskey_test.rb +++ b/test/models/dnskey_test.rb @@ -1,11 +1,58 @@ require 'test_helper' class DnskeyTest < ActiveSupport::TestCase - setup do - @dnskey = 'AwEAAddt2AkLfYGKgiEZB5SmIF8EvrjxNMH6HtxWEA4RJ9Ao6LCWheg8 ' - end + include EppErrors - def test_dns_key - - end + setup do + @dnskey = 'AwEAAddt2AkLfYGKgiEZB5SmIF8EvrjxNMH6HtxWEA4RJ9Ao6LCWheg8' + @domain = domains(:shop) + end + + def test_valid_dns_key + dns = Dnskey.new + dns.domain_id = @domain.id + dns.flags = 257 + dns.protocol = 3 + dns.alg = 8 + dns.public_key = @dnskey + + assert dns.save + end + + def test_invalid_algrorithm + dns = Dnskey.new + dns.alg = 666 + errors = dns.validate_algorithm + assert_equal errors, ['Valid algorithms are: 3, 5, 6, 7, 8, 10, 13, 14'] + end + + def test_invalid_protocol + dns = Dnskey.new + dns.protocol = 666 + errors = dns.validate_protocol + assert_equal errors, ['Valid protocols are: 3'] + end + + def test_invalid_flags + dns = Dnskey.new + dns.flags = 666 + errors = dns.validate_flags + assert_equal errors, ['Valid flags are: 0, 256, 257'] + end + + def test_ds_digest_type_one + Setting.ds_digest_type = 1 + + dns = Dnskey.new + dns.domain_id = @domain.id + dns.flags = 257 + dns.protocol = 3 + dns.alg = 8 + dns.public_key = @dnskey + + assert dns.save + + assert_equal dns.ds_digest_type, 1 + assert_equal dns.ds_digest, '640D173A44D9AF2856FBE282EE64CE11A76DBB84' + end end \ No newline at end of file