From 13bca79d4520281198ed7c74fa0e089b23231190 Mon Sep 17 00:00:00 2001
From: Jonathan del Strother <jon.delStrother@audioboo.fm>
Date: Wed, 26 Dec 2012 13:50:45 +0000
Subject: [PATCH] Catch the correct timeout exception during Server#boot

TimeoutError is actually Capybara::TimeoutError, which is unrelated to Ruby's Timeout
---
 lib/capybara/server.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/capybara/server.rb b/lib/capybara/server.rb
index dc04d615..2e9ddbb0 100644
--- a/lib/capybara/server.rb
+++ b/lib/capybara/server.rb
@@ -76,7 +76,7 @@ module Capybara
 
         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