diff --git a/.gitignore b/.gitignore index c5df634c..04a55010 100644 --- a/.gitignore +++ b/.gitignore @@ -32,4 +32,5 @@ Gemfile.lock gemfiles/*.gemfile.lock reports/pacts spec/examples.txt -*bethtest* \ No newline at end of file +*bethtest* +.DS_Store \ No newline at end of file diff --git a/Gemfile b/Gemfile index 649524a1..9ffaa88d 100644 --- a/Gemfile +++ b/Gemfile @@ -26,5 +26,10 @@ end group :test do gem 'faraday', '~>2.0' gem 'faraday-retry', '~>2.0' - gem 'rackup', '~> 2.1' + if ENV['RACK_VERSION'] == '2' + gem 'rack', '>= 2.0', '< 3.0' + else + gem 'rack', '>= 3.0', '< 4.0' + gem 'rackup', '~> 2.0' + end end diff --git a/spec/support/ssl_server.rb b/spec/support/ssl_server.rb index 37f75865..35abf61b 100644 --- a/spec/support/ssl_server.rb +++ b/spec/support/ssl_server.rb @@ -34,13 +34,15 @@ def webrick_opts port require "rack" begin require "rackup/handler/webrick" # rack 3 + PactWEBrick = Rackup::Handler::WEBrick rescue LoadError require "rack/handler/webrick" # rack 2 + PactWEBrick = Rack::Handler::WEBrick end opts = webrick_opts(4444) - Rack::Handler::WEBrick.run(app, **opts) do |server| + PactWEBrick.run(app, **opts) do |server| @server = server end end