mirror of
https://github.com/teamcapybara/capybara.git
synced 2022-11-09 12:08:07 -05:00
Merge remote branch 'gma/master'
This commit is contained in:
commit
d354ea4a8b
1 changed files with 2 additions and 2 deletions
|
@ -51,9 +51,9 @@ class Capybara::Server
|
|||
|
||||
Timeout.timeout(10) do
|
||||
Thread.new do
|
||||
if defined?(Rack::Handler::Mongrel)
|
||||
begin
|
||||
Rack::Handler::Mongrel.run(Identify.new(@app), :Port => port)
|
||||
else
|
||||
rescue LoadError
|
||||
Rack::Handler::WEBrick.run(Identify.new(@app), :Port => port, :AccessLog => [])
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue