Rack::Handler -> Rackup::Handler

sinatra · Mar 5, 2023 · 4e6165d · 4e6165d
1 parent f800370
commit 4e6165d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb
@@ -2,6 +2,7 @@
 
 # external dependencies
 require 'rack'
+require 'rackup'
 require 'tilt'
 require 'rack/protection'
 require 'mustermann'
@@ -1530,7 +1531,7 @@ def run!(options = {}, &block)
         return if running?
 
         set options
-        handler         = Rack::Handler.pick(server)
+        handler         = Rackup::Handler.pick(server)
         handler_name    = handler.name.gsub(/.*::/, '')
         server_settings = settings.respond_to?(:server_settings) ? settings.server_settings : {}
         server_settings.merge!(Port: port, Host: bind)

diff --git a/test/integration/rainbows.rb b/test/integration/rainbows.rb
@@ -1,6 +1,6 @@
 require 'rainbows'
 
-module Rack
+module Rackup
   module Handler
     class Rainbows
       def self.run(app, **options)
@@ -15,6 +15,6 @@ def self.run(app, **options)
       end
     end
 
-    register :rainbows, ::Rack::Handler::Rainbows
+    register :rainbows, ::Rackup::Handler::Rainbows
   end
 end
diff --git a/test/server_test.rb b/test/server_test.rb
@@ -1,7 +1,7 @@
 require_relative 'test_helper'
 require 'stringio'
 
-module Rack::Handler
+module Rackup::Handler
   class Mock
     extend Minitest::Assertions
     # Allow assertions in request context