warn when bundler fails and avoid having to use -I to run tests (#1270)

test/test_app_status.rb

@@ -1,4 +1,4 @@
-require "test_helper"
+require_relative "test_helper"
 
 require "puma/app/status"
 require "rack"

test/test_binder.rb

@@ -1,4 +1,4 @@
-require "test_helper"
+require_relative "test_helper"
 
 require "puma/binder"
 require "puma/events"

test/test_cli.rb

@@ -1,4 +1,4 @@
-require "test_helper"
+require_relative "test_helper"
 
 require "puma/cli"
 

test/test_config.rb

@@ -1,4 +1,4 @@
-require "test_helper"
+require_relative "test_helper"
 
 require "puma/configuration"
 

test/test_events.rb

@@ -1,4 +1,4 @@
-require "test_helper"
+require_relative "test_helper"
 
 require "puma/events"
 

test/test_helper.rb

@@ -4,37 +4,34 @@
 begin
   require "bundler/setup"
 rescue LoadError
+  warn "Failed to load bundler ... this should only happen during package building"
 end
 
 require "net/http"
 require "timeout"
 require "minitest/autorun"
 require "minitest/pride"
-require "puma"
-require "puma/detect"
 
 $LOAD_PATH << File.expand_path("../../lib", __FILE__)
 
+require "puma"
+require "puma/detect"
+
 # Either takes a string to do a get request against, or a tuple of [URI, HTTP] where
 # HTTP is some kind of Net::HTTP request object (POST, HEAD, etc.)
 def hit(uris)
-  results = []
+  uris.map do |u|
+    response =
+      if u.kind_of? String
+        Net::HTTP.get(URI.parse(u))
+      else
+        url = URI.parse(u[0])
+        Net::HTTP.new(url.host, url.port).start {|h| h.request(u[1]) }
+      end
 
-  uris.each do |u|
-    res = nil
-
-    if u.kind_of? String
-      res = Net::HTTP.get(URI.parse(u))
-    else
-      url = URI.parse(u[0])
-      res = Net::HTTP.new(url.host, url.port).start {|h| h.request(u[1]) }
-    end
-
-    assert res != nil, "Didn't get a response: #{u}"
-    results << res
+    assert response, "Didn't get a response: #{u}"
+    response
   end
-
-  return results
 end
 
 module TimeoutEveryTestCase

test/test_http10.rb

@@ -1,4 +1,4 @@
-require "test_helper"
+require_relative "test_helper"
 
 require "puma/puma_http11"
 

test/test_http11.rb

@@ -1,7 +1,7 @@
 # Copyright (c) 2011 Evan Phoenix
 # Copyright (c) 2005 Zed A. Shaw
 
-require "test_helper"
+require_relative "test_helper"
 
 require "puma/puma_http11"
 

test/test_integration.rb

@@ -1,4 +1,4 @@
-require "test_helper"
+require_relative "test_helper"
 
 require "puma/cli"
 require "puma/control_cli"

test/test_iobuffer.rb

@@ -1,4 +1,4 @@
-require "test_helper"
+require_relative "test_helper"
 
 require "puma/io_buffer"
 

test/test_minissl.rb

@@ -1,4 +1,4 @@
-require "test_helper"
+require_relative "test_helper"
 
 require "puma/minissl"
 

test/test_null_io.rb

@@ -1,4 +1,4 @@
-require "test_helper"
+require_relative "test_helper"
 
 require "puma/null_io"
 

test/test_persistent.rb

@@ -1,4 +1,4 @@
-require "test_helper"
+require_relative "test_helper"
 
 class TestPersistent < Minitest::Test
   def setup

test/test_puma_server.rb

@@ -1,4 +1,4 @@
-require "test_helper"
+require_relative "test_helper"
 
 class TestPumaServer < Minitest::Test
 

test/test_puma_server_ssl.rb

@@ -1,4 +1,4 @@
-require "test_helper"
+require_relative "test_helper"
 
 require "puma/events"
 

test/test_pumactl.rb

@@ -1,4 +1,4 @@
-require "test_helper"
+require_relative "test_helper"
 
 require 'puma/control_cli'
 

test/test_rack_handler.rb

@@ -1,4 +1,4 @@
-require "test_helper"
+require_relative "test_helper"
 
 require "rack/handler/puma"
 

test/test_rack_server.rb

@@ -1,4 +1,4 @@
-require "test_helper"
+require_relative "test_helper"
 
 require "rack"
 

test/test_tcp_logger.rb

@@ -1,4 +1,4 @@
-require "test_helper"
+require_relative "test_helper"
 
 require "puma/events"
 require "puma/tcp_logger"

test/test_tcp_rack.rb

@@ -1,4 +1,4 @@
-require "test_helper"
+require_relative "test_helper"
 
 require "puma/events"
 

test/test_thread_pool.rb

@@ -1,4 +1,4 @@
-require "test_helper"
+require_relative "test_helper"
 
 require "puma/thread_pool"
 

test/test_unix_socket.rb

@@ -1,4 +1,4 @@
-require "test_helper"
+require_relative "test_helper"
 
 # UNIX sockets are not recommended on JRuby
 # (or Windows)

test/test_web_server.rb

@@ -1,7 +1,7 @@
 # Copyright (c) 2011 Evan Phoenix
 # Copyright (c) 2005 Zed A. Shaw
 
-require "test_helper"
+require_relative "test_helper"
 
 require "puma/server"