Skip to content

Commit 7ecd085

Browse files
committed
Support Rack 3
Note: thin is under developing Rack 3 support: macournoyer/thin#399
1 parent 938e7e4 commit 7ecd085

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

lib/rack/test_server/signal_trap_interceptor.rb

+4-1
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,15 @@ def disable
2020
end
2121
end
2222

23-
require 'rack/server'
23+
require 'rackup/server'
2424

2525
# Disable SIGINT handler in Rack::Server.
2626
# https://github.com/rack/rack/blob/2.2.3/lib/rack/server.rb#L319
27+
# https://github.com/rack/rackup/blob/main/lib/rackup/server.rb#L333
2728
Rack::Server.prepend(Rack::TestServer::SignalTrapInterceptor)
29+
Rackup::Server.prepend(Rack::TestServer::SignalTrapInterceptor)
2830

2931
# Mainly inteded to disable SIGINT handler in Puma.
3032
# https://github.com/puma/puma/blob/v5.5.0/lib/puma/launcher.rb#L485
33+
# https://github.com/puma/puma/blob/v6.4.2/lib/puma/launcher.rb#L441
3134
Signal.singleton_class.prepend(Rack::TestServer::SignalTrapInterceptor)

rack-test_server.gemspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ Gem::Specification.new do |spec|
2424
spec.require_paths = ['lib']
2525

2626
spec.required_ruby_version = '>= 2.3'
27-
spec.add_dependency 'rack', '>= 2', '< 3'
27+
spec.add_dependency 'rack'
28+
spec.add_dependency 'rackup'
2829
spec.add_development_dependency 'minitest'
2930
spec.add_development_dependency 'puma'
3031
spec.add_development_dependency 'rake'
3132
spec.add_development_dependency 'sinatra'
32-
spec.add_development_dependency 'thin'
3333
spec.add_development_dependency 'webrick'
3434
end

test/test_launch_server.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def test_launch_puma
4242
_test(server)
4343
end
4444

45-
def test_launch_thin
45+
def _test_launch_thin
4646
server = Rack::TestServer.new(app: MyApp, Port: 8005, server: :thin)
4747
_test(server)
4848
end

test/test_stop_server.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def test_stop_webrick
3232
_test(server)
3333
end
3434

35-
def test_stop_thin
35+
def _test_stop_thin
3636
server = Rack::TestServer.new(app: APP, server: :thin, Port: 8083)
3737
_test(server)
3838
end

0 commit comments

Comments
 (0)