Permalink
Browse files

Merge remote-tracking branch 'engineyard/master'

* engineyard/master:
  Accept StringIO as a possible fake response body
  • Loading branch information...
2 parents 61c38c5 + 0d69c71 commit 151723bb482a7b2421f0265f920b5678bda96812 @chrisk committed Aug 29, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/fake_web/ext/net_http.rb
@@ -11,7 +11,7 @@ def initialize_with_fakeweb(io, debug_output = nil)
@debug_output = debug_output
@io = case io
- when Socket, OpenSSL::SSL::SSLSocket, IO
+ when Socket, OpenSSL::SSL::SSLSocket, StringIO, IO
io
when String
if !io.include?("\0") && File.exists?(io) && !File.directory?(io)

0 comments on commit 151723b

Please sign in to comment.