Permalink
Browse files

Merge pull request #919 from jdelStrother/timeout_error

Remove Capybara::TimeoutError
  • Loading branch information...
2 parents 5b164d4 + fce44de commit eddf995f4a183979e08e8d3894ef14c62b89fd5f @jnicklas jnicklas committed Dec 31, 2012
Showing with 1 addition and 2 deletions.
  1. +1 −2 lib/capybara.rb
View
@@ -12,9 +12,8 @@ class ExpectationNotMet < ElementNotFound; end
class FileNotFound < CapybaraError; end
class UnselectNotAllowed < CapybaraError; end
class NotSupportedByDriverError < CapybaraError; end
- class TimeoutError < CapybaraError; end
class LocateHiddenElementError < CapybaraError; end
- class InfiniteRedirectError < TimeoutError; end
+ class InfiniteRedirectError < CapybaraError; end
class << self
attr_accessor :asset_root, :app_host, :run_server, :default_host, :always_include_port

0 comments on commit eddf995

Please sign in to comment.