Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 13 deletions

diff --git a/spec/support/helpers/stub_requests.rb b/spec/support/helpers/stub_requests.rb
index bde5535705e..b77b366e037 100644
--- a/spec/support/helpers/stub_requests.rb
+++ b/spec/support/helpers/stub_requests.rb
@@ -18,15 +18,15 @@ module StubRequests
   end
 
   def stub_dns(url, ip_address:, port: 80)
-    debug_with_puts "beginning of stub_dns"
+    DebugWithPuts.debug_with_puts "beginning of stub_dns"
     url = parse_url(url)
-    debug_with_puts "before socket = Socket.sockaddr_in"
+    DebugWithPuts.debug_with_puts "before socket = Socket.sockaddr_in"
     socket = Socket.sockaddr_in(port, ip_address)
-    debug_with_puts "after socket = Socket.sockaddr_in"
+    DebugWithPuts.debug_with_puts "after socket = Socket.sockaddr_in"
 
-    debug_with_puts "before addr = Addrinfo.new(socket)"
+    DebugWithPuts.debug_with_puts "before addr = Addrinfo.new(socket)"
     addr = Addrinfo.new(socket)
-    debug_with_puts "after addr = Addrinfo.new(socket)"
+    DebugWithPuts.debug_with_puts "after addr = Addrinfo.new(socket)"
 
     # See Gitlab::UrlBlocker
     allow(Addrinfo).to receive(:getaddrinfo)
@@ -58,12 +58,4 @@ module StubRequests
   def parse_url(url)
     url.is_a?(URI) ? url : URI(url)
   end
-
-  # TODO: Remove the debug_with_puts statements below! Used for debugging purposes.
-  # TODO: https://gitlab.com/gitlab-org/quality/engineering-productivity/team/-/issues/323#note_1688925316
-  def debug_with_puts(message)
-    return unless ENV['CI'] # rubocop:disable RSpec/AvoidConditionalStatements -- Debug information only in the CI
-
-    puts "[#{Time.current}] #{message}"
-  end
 end