Permalink
Browse files

Merge pull request #918 from jdelStrother/timeout_error

Catch the correct timeout exception during Server#boot
  • Loading branch information...
2 parents 2b324d3 + 13bca79 commit 00df18ac5fa32f2a54329b709fb47ee80c67a7fe @jnicklas jnicklas committed Dec 26, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/capybara/server.rb
View
@@ -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 00df18a

Please sign in to comment.