make test_helper no longer be loaded as a test (#1283)

running `rake` loads all files starting with `test_` which is not supposed to also load the helper, since the helper should be loaded by each test and is not a test itself.
2022-11-09 13:48:40 -05:00 · 2017-05-12 12:16:55 -07:00 · 2017-05-12 12:16:55 -07:00 · 9d93a0f62f
commit 9d93a0f62f
parent e77355e089
24 changed files with 23 additions and 23 deletions
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
--- a/test/rackup/hello-env.ru
+++ b/test/rackup/hello-env.ru
--- a/test/test_app_status.rb
+++ b/test/test_app_status.rb
@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"

 require "puma/app/status"
 require "rack"
--- a/test/test_binder.rb
+++ b/test/test_binder.rb
@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"

 require "puma/binder"
 require "puma/events"
--- a/test/test_cli.rb
+++ b/test/test_cli.rb
@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"

 require "puma/cli"

--- a/test/test_config.rb
+++ b/test/test_config.rb
@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"

 require "puma/configuration"

--- a/test/test_events.rb
+++ b/test/test_events.rb
@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"

 require "puma/events"

--- a/test/test_http10.rb
+++ b/test/test_http10.rb
@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"

 require "puma/puma_http11"

--- a/test/test_http11.rb
+++ b/test/test_http11.rb
@ -1,7 +1,7 @@
 # Copyright (c) 2011 Evan Phoenix
 # Copyright (c) 2005 Zed A. Shaw

-require_relative "test_helper"
+require_relative "helper"

 require "puma/puma_http11"

--- a/test/test_integration.rb
+++ b/test/test_integration.rb
@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"

 require "puma/cli"
 require "puma/control_cli"
@ -239,7 +239,7 @@ class TestIntegration < Minitest::Test

  # It does not share environments between multiple generations, which would break Dotenv
  def test_restart_restores_environment
-    server("-q test/hello-env.ru")
+    server("-q test/rackup/hello-env.ru")

    s = connect
    initial_reply = s.read
--- a/test/test_iobuffer.rb
+++ b/test/test_iobuffer.rb
@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"

 require "puma/io_buffer"

--- a/test/test_minissl.rb
+++ b/test/test_minissl.rb
@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"

 require "puma/minissl"

--- a/test/test_null_io.rb
+++ b/test/test_null_io.rb
@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"

 require "puma/null_io"

--- a/test/test_persistent.rb
+++ b/test/test_persistent.rb
@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"

 class TestPersistent < Minitest::Test
  def setup
--- a/test/test_puma_server.rb
+++ b/test/test_puma_server.rb
@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"

 class TestPumaServer < Minitest::Test

--- a/test/test_puma_server_ssl.rb
+++ b/test/test_puma_server_ssl.rb
@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"

 require "puma/events"

--- a/test/test_pumactl.rb
+++ b/test/test_pumactl.rb
@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"

 require 'puma/control_cli'

--- a/test/test_rack_handler.rb
+++ b/test/test_rack_handler.rb
@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"

 require "rack/handler/puma"

--- a/test/test_rack_server.rb
+++ b/test/test_rack_server.rb
@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"

 require "rack"

--- a/test/test_tcp_logger.rb
+++ b/test/test_tcp_logger.rb
@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"

 require "puma/events"
 require "puma/tcp_logger"
--- a/test/test_tcp_rack.rb
+++ b/test/test_tcp_rack.rb
@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"

 require "puma/events"

--- a/test/test_thread_pool.rb
+++ b/test/test_thread_pool.rb
@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"

 require "puma/thread_pool"

--- a/test/test_unix_socket.rb
+++ b/test/test_unix_socket.rb
@ -1,4 +1,4 @@
-require_relative "test_helper"
+require_relative "helper"

 # UNIX sockets are not recommended on JRuby
 # (or Windows)
--- a/test/test_web_server.rb
+++ b/test/test_web_server.rb
@ -1,7 +1,7 @@
 # Copyright (c) 2011 Evan Phoenix
 # Copyright (c) 2005 Zed A. Shaw

-require_relative "test_helper"
+require_relative "helper"

 require "puma/server"