Merge pull request #156 from YOU54F/deps/rackup_2_3

fix: rack 2.x dont load Rack::Handler::WEBrick class to avoid warnings
pact-foundation · Aug 6, 2024 · 5457575 · 5457575
2 parents 828727e + c5e2311
commit 5457575
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/lib/pact/mock_service/cli.rb b/lib/pact/mock_service/cli.rb
@@ -171,11 +171,7 @@ def version
 
         def require_common_dependencies
           require 'webrick/https'
-          begin
-            require 'rack/handler/webrick'
-          rescue LoadError
-            require 'rackup/handler/webrick'
-          end
+          require 'rack/handler/webbrick'
           require 'fileutils'
           require 'pact/mock_service/server/wait_for_server_up'
           require 'pact/mock_service/cli/pidfile'

diff --git a/lib/pact/stub_service/cli.rb b/lib/pact/stub_service/cli.rb
@@ -1,10 +1,6 @@
 require 'pact/mock_service/cli/custom_thor'
 require 'webrick/https'
-begin
-  require 'rack/handler/webrick'
-rescue LoadError
-  require 'rackup/handler/webrick'
-end
+require 'rack/handler/webbrick'
 require 'fileutils'
 require 'pact/mock_service/server/wait_for_server_up'
 require 'pact/mock_service/cli/pidfile'

diff --git a/lib/rack/handler/webbrick.rb b/lib/rack/handler/webbrick.rb
@@ -2,7 +2,6 @@ module Rack
   module Handler
       begin
         require 'rack/handler/webrick'
-        WEBrick = Class.new(Rack::Handler::WEBrick)
       rescue LoadError
         require 'rackup/handler/webrick'
         WEBrick = Class.new(Rackup::Handler::WEBrick)