Changes per comments

puma · Jan 23, 2023 · 8ae6e7b · 8ae6e7b
1 parent adadf5a
commit 8ae6e7b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/lib/rack/handler/puma.rb b/lib/rack/handler/puma.rb
@@ -132,5 +132,5 @@ class << self
     end
   end
 else
-  raise "Rack 3 must be used with the Rackup gem"
+  raise "You must install the rackup gem when using Rack 3"
 end
diff --git a/test/test_rack_handler.rb b/test/test_rack_handler.rb
@@ -1,17 +1,16 @@
 require_relative "helper"
 
-require "rack"
-
 module TestRackUp
-  if Rack::RELEASE < '3'
-    require "rack/handler/puma"
+  if ENV.key? "PUMA_CI_RACK_2"
+    require "rack"
     RACK_HANDLER_MOD = ::Rack::Handler
   else
     require "rackup"
-    require "rack/handler/puma"
     RACK_HANDLER_MOD = ::Rackup::Handler
   end
 
+  require "rack/handler/puma"
+
   class TestHandlerGetStrSym < Minitest::Test
     def test_handler
       handler = RACK_HANDLER_MOD.get(:puma)