aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource/test/connection_test.rb
diff options
context:
space:
mode:
authorCheah Chu Yeow <chuyeow@gmail.com>2008-04-16 18:39:19 +0800
committerMichael Koziarski <michael@koziarski.com>2008-04-22 09:30:56 +1200
commitcf32baf915442ffe153ec0e4d8148f147776c30a (patch)
tree9405205f0ab6ddfceb49043206aa034f33a53cc1 /activeresource/test/connection_test.rb
parent105910429d5873dce677ef32eef5f705e0625d86 (diff)
downloadrails-cf32baf915442ffe153ec0e4d8148f147776c30a.tar.gz
rails-cf32baf915442ffe153ec0e4d8148f147776c30a.tar.bz2
rails-cf32baf915442ffe153ec0e4d8148f147776c30a.zip
Rescue from Timeout::Error in ActiveResource::Connection.
Signed-off-by: Michael Koziarski <michael@koziarski.com>
Diffstat (limited to 'activeresource/test/connection_test.rb')
-rw-r--r--activeresource/test/connection_test.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/activeresource/test/connection_test.rb b/activeresource/test/connection_test.rb
index 6c907614e7..8e43e451ff 100644
--- a/activeresource/test/connection_test.rb
+++ b/activeresource/test/connection_test.rb
@@ -168,6 +168,15 @@ class ConnectionTest < Test::Unit::TestCase
assert_equal 200, response.code
end
+ uses_mocha('test_timeout') do
+ def test_timeout
+ @http = mock('new Net::HTTP')
+ @conn.expects(:http).returns(@http)
+ @http.expects(:get).raises(Timeout::Error, 'execution expired')
+ assert_raises(ActiveResource::TimeoutError) { @conn.get('/people_timeout.xml') }
+ end
+ end
+
protected
def assert_response_raises(klass, code)
assert_raise(klass, "Expected response code #{code} to raise #{klass}") do