Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: rack 2.x dont load Rack::Handler::WEBrick class to avoid warnings #156

Merged
merged 1 commit into from
Aug 6, 2024
Merged

fix: rack 2.x dont load Rack::Handler::WEBrick class to avoid warnings #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions lib/pact/mock_service/cli.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 1 addition & 5 deletions lib/pact/stub_service/cli.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
1 change: 0 additions & 1 deletion lib/rack/handler/webbrick.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down