Skip to content
Browse files

Use latest Excon.

  • Loading branch information...
1 parent 48d7dea commit 9380ddb7f2d94559baa353115e508b42f35ba9b6 @myronmarston committed Feb 22, 2012
Showing with 6 additions and 5 deletions.
  1. +1 −0 CHANGELOG.md
  2. +2 −2 lib/vcr/library_hooks/excon.rb
  3. +2 −2 spec/monkey_patches.rb
  4. +1 −1 vcr.gemspec
View
1 CHANGELOG.md
@@ -28,6 +28,7 @@
request or response body in order to preserve the bytes exactly.
Thanks to [Jeff Pollard](https://github.com/Fluxx) for help
designing this feature and for code reviewing it.
+ * Update to and require latest Excon (0.9.6).
## Bug Fixes
View
4 lib/vcr/library_hooks/excon.rb
@@ -2,7 +2,7 @@
require 'vcr/request_handler'
require 'excon'
-VCR::VersionChecker.new('Excon', Excon::VERSION, '0.9.5', '0.9').check_version!
+VCR::VersionChecker.new('Excon', Excon::VERSION, '0.9.6', '0.9').check_version!
module VCR
class LibraryHooks
@@ -151,7 +151,7 @@ def normalized_headers(headers)
end
end
-Excon.mock = true
+Excon.defaults[:mock] = true
VCR.configuration.after_library_hooks_loaded do
# ensure WebMock's Excon adapter does not conflict with us here
View
4 spec/monkey_patches.rb
@@ -37,7 +37,7 @@ def enable!(scope)
$original_excon_stubs.each do |stub|
::Excon.stubs << stub
end
- ::Excon.mock = true
+ ::Excon.defaults[:mock] = true
when :vcr
realias Net::HTTP, :request, :with_vcr
else raise ArgumentError.new("Unexpected scope: #{scope}")
@@ -62,7 +62,7 @@ def disable_all!
if defined?(::Excon)
::Excon.stubs.clear
- ::Excon.mock = false
+ ::Excon.defaults[:mock] = false
end
end
View
2 vcr.gemspec
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
s.add_development_dependency 'faraday', '~> 0.7.2'
s.add_development_dependency 'httpclient', '~> 2.1.5.2'
- s.add_development_dependency 'excon', '~> 0.9.5'
+ s.add_development_dependency 'excon', '~> 0.9.6'
s.add_development_dependency 'timecop', '~> 0.3.5'
s.add_development_dependency 'rack', '~> 1.3.6'

0 comments on commit 9380ddb

Please sign in to comment.
Something went wrong with that request. Please try again.