Permalink
Browse files

Catch the correct timeout exception during Server#boot

TimeoutError is actually Capybara::TimeoutError, which is unrelated to Ruby's Timeout
  • Loading branch information...
1 parent 2b324d3 commit 13bca79d4520281198ed7c74fa0e089b23231190 @jdelStrother jdelStrother committed Dec 26, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/capybara/server.rb
@@ -76,7 +76,7 @@ def boot
Timeout.timeout(60) { @server_thread.join(0.1) until responsive? }
end
- rescue TimeoutError
+ rescue Timeout::Error
raise "Rack application timed out during boot"
else
self

0 comments on commit 13bca79

Please sign in to comment.