Catch the correct timeout exception during Server#boot

TimeoutError is actually Capybara::TimeoutError, which is unrelated to Ruby's Timeout
2012-12-26 13:50:45 +00:00 · 2012-12-26 13:50:45 +00:00 · 13bca79d45
parent 2b324d3200
commit 13bca79d45
1 changed files with 1 additions and 1 deletions
--- 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