From b2ee760f306a24419d8ae0f4927d731bebbd76ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Tue, 24 Sep 2024 15:08:41 +0200 Subject: [PATCH] Update test dependencies --- .../install/gems/dependency_api_fallback_spec.rb | 14 ++++++++------ .../realworld/gemfile_source_header_spec.rb | 14 ++++++++------ spec/bundler/realworld/mirror_probe_spec.rb | 14 ++++++++------ tool/bundler/test_gems.rb | 9 +++++---- 4 files changed, 29 insertions(+), 22 deletions(-) diff --git a/spec/bundler/install/gems/dependency_api_fallback_spec.rb b/spec/bundler/install/gems/dependency_api_fallback_spec.rb index 5e700ea976..107da15d67 100644 --- a/spec/bundler/install/gems/dependency_api_fallback_spec.rb +++ b/spec/bundler/install/gems/dependency_api_fallback_spec.rb @@ -15,13 +15,15 @@ RSpec.describe "gemcutter's dependency API" do # mustermann depends on URI::RFC2396_PARSER behavior URI.parser = URI::RFC2396_PARSER if URI.respond_to?(:parser=) + require "rackup/server" + @t = Thread.new do - server = Rack::Server.start(app: EndpointTimeout, - Host: "0.0.0.0", - Port: port, - server: "webrick", - AccessLog: [], - Logger: Spec::SilentLogger.new) + server = Rackup::Server.start(app: EndpointTimeout, + Host: "0.0.0.0", + Port: port, + server: "webrick", + AccessLog: [], + Logger: Spec::SilentLogger.new) server.start end @t.run diff --git a/spec/bundler/realworld/gemfile_source_header_spec.rb b/spec/bundler/realworld/gemfile_source_header_spec.rb index 45f5d0fd22..f47ba3a855 100644 --- a/spec/bundler/realworld/gemfile_source_header_spec.rb +++ b/spec/bundler/realworld/gemfile_source_header_spec.rb @@ -39,13 +39,15 @@ RSpec.describe "fetching dependencies with a mirrored source", realworld: true d require_relative "../support/artifice/endpoint_mirror_source" + require "rackup/server" + @t = Thread.new do - Rack::Server.start(app: EndpointMirrorSource, - Host: "0.0.0.0", - Port: @port, - server: "webrick", - AccessLog: [], - Logger: Spec::SilentLogger.new) + Rackup::Server.start(app: EndpointMirrorSource, + Host: "0.0.0.0", + Port: @port, + server: "webrick", + AccessLog: [], + Logger: Spec::SilentLogger.new) end.run wait_for_server("127.0.0.1", @port) diff --git a/spec/bundler/realworld/mirror_probe_spec.rb b/spec/bundler/realworld/mirror_probe_spec.rb index fc97f92375..61312860d1 100644 --- a/spec/bundler/realworld/mirror_probe_spec.rb +++ b/spec/bundler/realworld/mirror_probe_spec.rb @@ -112,13 +112,15 @@ RSpec.describe "fetching dependencies with a not available mirror", realworld: t require_relative "../support/artifice/endpoint" + require "rackup/server" + @server_thread = Thread.new do - Rack::Server.start(app: Endpoint, - Host: host, - Port: @server_port, - server: "webrick", - AccessLog: [], - Logger: Spec::SilentLogger.new) + Rackup::Server.start(app: Endpoint, + Host: host, + Port: @server_port, + server: "webrick", + AccessLog: [], + Logger: Spec::SilentLogger.new) end.run wait_for_server(host, @server_port) diff --git a/tool/bundler/test_gems.rb b/tool/bundler/test_gems.rb index 32cb6b34ee..bb7d4edb9a 100644 --- a/tool/bundler/test_gems.rb +++ b/tool/bundler/test_gems.rb @@ -2,12 +2,13 @@ source "https://rubygems.org" -gem "rack", "~> 2.0" +gem "rack", "~> 3.0" +gem "rackup", "~> 2.1" gem "base64" -gem "webrick", "1.7.0" -gem "rack-test", "~> 1.1" +gem "webrick", "~> 1.8" +gem "rack-test", "~> 2.1" gem "compact_index", "~> 0.15.0" -gem "sinatra", "~> 3.0" +gem "sinatra", "~> 4.0" gem "rake", "~> 13.1" gem "builder", "~> 3.2" gem "rb_sys"