Skip to content

Commit 5457575

Browse files
authored
Merge pull request #156 from YOU54F/deps/rackup_2_3
fix: rack 2.x dont load Rack::Handler::WEBrick class to avoid warnings
2 parents 828727e + c5e2311 commit 5457575

File tree

3 files changed

+2
-11
lines changed

3 files changed

+2
-11
lines changed

lib/pact/mock_service/cli.rb

+1-5
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,7 @@ def version
171171

172172
def require_common_dependencies
173173
require 'webrick/https'
174-
begin
175-
require 'rack/handler/webrick'
176-
rescue LoadError
177-
require 'rackup/handler/webrick'
178-
end
174+
require 'rack/handler/webbrick'
179175
require 'fileutils'
180176
require 'pact/mock_service/server/wait_for_server_up'
181177
require 'pact/mock_service/cli/pidfile'

lib/pact/stub_service/cli.rb

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
require 'pact/mock_service/cli/custom_thor'
22
require 'webrick/https'
3-
begin
4-
require 'rack/handler/webrick'
5-
rescue LoadError
6-
require 'rackup/handler/webrick'
7-
end
3+
require 'rack/handler/webbrick'
84
require 'fileutils'
95
require 'pact/mock_service/server/wait_for_server_up'
106
require 'pact/mock_service/cli/pidfile'

lib/rack/handler/webbrick.rb

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ module Rack
22
module Handler
33
begin
44
require 'rack/handler/webrick'
5-
WEBrick = Class.new(Rack::Handler::WEBrick)
65
rescue LoadError
76
require 'rackup/handler/webrick'
87
WEBrick = Class.new(Rackup::Handler::WEBrick)

0 commit comments

Comments
 (0)