File tree 4 files changed +16
-4
lines changed
4 files changed +16
-4
lines changed Original file line number Diff line number Diff line change
1
+ require 'rack'
2
+ require 'rackup'
3
+
4
+ module Teaspoon
5
+ if Gem ::Version . new ( Rack . release ) > '3.0'
6
+ RackupServerShim = ::Rackup ::Server
7
+ else
8
+ RackupServerShim = ::Rack ::Server
9
+ end
10
+ end
Original file line number Diff line number Diff line change 1
1
require "socket"
2
2
require "timeout"
3
3
require "webrick"
4
+ require_relative "rackup_server_shim"
4
5
5
6
module Teaspoon
6
7
class Server
@@ -16,7 +17,7 @@ def start
16
17
17
18
thread = Thread . new do
18
19
disable_logging
19
- server = Rack :: Server . new ( rack_options )
20
+ server = RackupServerShim . new ( rack_options )
20
21
server . start
21
22
end
22
23
wait_until_started ( thread )
Original file line number Diff line number Diff line change 20
20
end
21
21
22
22
it "starts a rack server" do
23
- expect ( Rack :: Server ) . to receive ( :new ) . and_return ( server )
23
+ expect ( Teaspoon :: RackupServerShim ) . to receive ( :new ) . and_return ( server )
24
24
expect ( server ) . to receive ( :start )
25
25
26
26
subject . start
41
41
)
42
42
end
43
43
44
- it "creates a Rack::Server with the correct setting" do
44
+ it "creates a Teaspoon::RackupServerShim with the correct setting" do
45
45
expected_opts = {
46
46
app : Rails . application ,
47
47
Host : subject . host ,
52
52
server : Teaspoon . configuration . server ,
53
53
Silent : true ,
54
54
}
55
- expect ( Rack :: Server ) . to receive ( :new ) . with ( expected_opts ) . and_return ( server )
55
+ expect ( Teaspoon :: RackupServerShim ) . to receive ( :new ) . with ( expected_opts ) . and_return ( server )
56
56
57
57
subject . start
58
58
@block . call
Original file line number Diff line number Diff line change @@ -20,6 +20,7 @@ Gem::Specification.new do |s|
20
20
21
21
s . required_ruby_version = ">= 2.7"
22
22
s . add_runtime_dependency "railties" , ">= 5.0"
23
+ s . add_runtime_dependency "rackup" , ">= 2.1"
23
24
s . add_development_dependency "simplecov" , "< 0.18"
24
25
if RUBY_VERSION > "3"
25
26
s . add_development_dependency "webrick"
You can’t perform that action at this time.
0 commit comments