Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 0 deletions

diff --git a/spec/support/helpers/dns_helpers.rb b/spec/support/helpers/dns_helpers.rb
index e673e36adbd..0250e432609 100644
--- a/spec/support/helpers/dns_helpers.rb
+++ b/spec/support/helpers/dns_helpers.rb
@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
 module DnsHelpers
+  include ViteHelper
+
   def block_dns!
     stub_all_dns!
     stub_invalid_dns!
     permit_local_dns!
     permit_postgresql!
     permit_redis!
+    permit_vite!
   end
 
   def permit_dns!
@@ -66,6 +69,14 @@ module DnsHelpers
     end
   end
 
+  def permit_vite!
+    # https://github.com/ElMassimo/vite_ruby/blob/7d2f558c9760802e5d763bfa40efe87607eb166a/vite_ruby/lib/vite_ruby.rb#L91
+    # uses Socket.tcp to connect to vite dev server - this won't necessarily be localhost
+    return unless vite_enabled?
+
+    allow(Addrinfo).to receive(:getaddrinfo).with(ViteRuby.instance.config.host, ViteRuby.instance.config.port, nil, :STREAM, anything, anything, any_args).and_call_original
+  end
+
   def stub_resolver(stubbed_lookups = {})
     resolver = instance_double('Resolv::DNS')
     allow(resolver).to receive(:timeouts=)