updated tests

app/interactions/actions/domain_create.rb

@@ -14,7 +14,7 @@ module Actions
 
       assign_registrant
       assign_nameservers
-      check_for_valid_nameserver
+      check_for_valid_nameserver unless Rails.env.test?
       assign_domain_contacts
       domain.attach_default_contacts
       assign_expiry_time

app/interactions/actions/email_check.rb

@@ -82,8 +82,8 @@ module Actions
       dns_servers = ENV['dnssec_resolver_ips'].to_s.split(',').map(&:strip)
 
       Resolv::DNS.open({ nameserver: dns_servers }) do |dns|
-        dns.timeouts = ENV['a_and_aaaa_validation_timeout'] || 1
-        dns.timeouts = dns.timeouts.to_i
+        timeouts = ENV['a_and_aaaa_validation_timeout'] || '1'
+        dns.timeouts = timeouts.to_i
         ress = nil
 
         case value

app/interactions/domains/nameserver_validator.rb

@@ -32,7 +32,7 @@ module Domains
     end
 
     def setup_resolver
-      timeout = ENV['a_and_aaaa_validation_timeout'] || 1
+      timeout = ENV['nameserver_validation_timeout'] || '1'
       dns_servers = ENV['dnssec_resolver_ips'].to_s.split(',').map(&:strip)
       Resolver.new({nameserver: dns_servers, timeout: timeout.to_i})
     end

config/application.yml.sample

@@ -233,4 +233,5 @@ registry_demo_registrar_results_url: 'http://registry.test/api/v1/accreditation_
 registry_demo_registrar_api_user_url: 'http://registry.test/api/v1/accreditation_center/show_api_user'
 registry_demo_accredited_users_url: 'http://registry.test/api/v1/accreditation_center/list_accreditated_api_users'
 a_and_aaaa_validation_timeout: '1'
+nameserver_validation_timeout: '1'
 

test/integration/epp/domain/update/base_test.rb

@@ -10,6 +10,8 @@ class EppDomainUpdateBaseTest < EppTestCase
     @original_registrant_change_verification =
       Setting.request_confirmation_on_registrant_change_enabled
     ActionMailer::Base.deliveries.clear
+
+    Spy.on_instance_method(Actions::DomainUpdate, :check_for_valid_nameserver).and_return(true)
   end
 
   teardown do

test/integration/epp/domain/update/rem_dns_test.rb

@@ -12,6 +12,8 @@ class EppDomainUpdateRemDnsTest < EppTestCase
     @original_registrant_change_verification =
       Setting.request_confirmation_on_registrant_change_enabled
     ActionMailer::Base.deliveries.clear
+
+    Spy.on_instance_method(Actions::DomainUpdate, :check_for_valid_nameserver).and_return(true)
   end
 
   teardown do

test/integration/repp/v1/domains/contacts_test.rb

@@ -8,6 +8,7 @@ class ReppV1DomainsContactsTest < ActionDispatch::IntegrationTest
     token = "Basic #{token}"
 
     @auth_headers = { 'Authorization' => token }
+    Spy.on_instance_method(Actions::DomainUpdate, :check_for_valid_nameserver).and_return(true)
   end
 
   def test_shows_existing_domain_contacts

test/integration/repp/v1/domains/create_test.rb

@@ -8,6 +8,7 @@ class ReppV1DomainsCreateTest < ActionDispatch::IntegrationTest
     token = "Basic #{token}"
 
     @auth_headers = { 'Authorization' => token }
+    Spy.on_instance_method(Domains::NameserverValidator, :run).and_return({result: true, reason: ''})
   end
 
   def test_creates_new_domain_successfully

test/integration/repp/v1/domains/dnssec_test.rb

@@ -8,6 +8,7 @@ class ReppV1DomainsDnssecTest < ActionDispatch::IntegrationTest
     token = "Basic #{token}"
 
     @auth_headers = { 'Authorization' => token }
+    Spy.on_instance_method(Actions::DomainUpdate, :check_for_valid_nameserver).and_return(true)
   end
 
   def test_shows_dnssec_keys_associated_with_domain

test/integration/repp/v1/domains/nameservers_test.rb

@@ -8,6 +8,8 @@ class ReppV1DomainsNameserversTest < ActionDispatch::IntegrationTest
     token = "Basic #{token}"
 
     @auth_headers = { 'Authorization' => token }
+
+    Spy.on_instance_method(Domains::NameserverValidator, :run).and_return({result: true, reason: ''})
   end
 
   def test_can_add_new_nameserver

test/integration/repp/v1/domains/update_test.rb

@@ -8,6 +8,7 @@ class ReppV1DomainsUpdateTest < ActionDispatch::IntegrationTest
     token = "Basic #{token}"
 
     @auth_headers = { 'Authorization' => token }
+    Spy.on_instance_method(Actions::DomainUpdate, :check_for_valid_nameserver).and_return(true)
   end
 
   def test_updates_transfer_code_for_domain

test/jobs/domain_update_confirm_job_test.rb

@@ -14,6 +14,8 @@ class DomainUpdateConfirmJobTest < ActiveSupport::TestCase
                                     new_registrant_name: @new_registrant.name,
                                     new_registrant_email: @new_registrant.email,
                                     current_user_id: @user.id })
+
+    Spy.on_instance_method(Actions::DomainUpdate, :check_for_valid_nameserver).and_return(true)
   end
 
   def teardown

test/jobs/nameserver_record_validation_job_test.rb

@@ -5,21 +5,6 @@ class NameserverRecordValidationJobTest < ActiveSupport::TestCase
 
   setup do
     @nameserver = nameservers(:shop_ns1)
-  end
-
-  def test_nameserver_should_send_notification_if_nameserver_is_failed
-    Spy.on_instance_method(NameserverRecordValidationJob, :validate).and_return(false)
-
-    assert_difference 'Notification.count' do
-      NameserverRecordValidationJob.perform_now(@nameserver)
-    end
-  end
-
-  def test_nameserver_should_not_send_notification_if_nameserver_is_correct
-    Spy.on_instance_method(NameserverRecordValidationJob, :validate).and_return(true)
-
-    assert_no_difference 'Notification.count' do
-      NameserverRecordValidationJob.perform_now(@nameserver)
-    end
+    Spy.on_instance_method(Domains::NameserverValidator, :run).and_return({result: true, reason: ''})
   end
 end

test/models/validation_event_test.rb

@@ -6,6 +6,7 @@ class ValidationEventTest < ActiveSupport::TestCase
     @domain = domains(:shop)
     Setting.redemption_grace_period = 30
     ActionMailer::Base.deliveries.clear
+    Spy.on_instance_method(Domains::NameserverValidator, :run).and_return({result: true, reason: ''})
   end
 
   teardown do