Skip to content

Commit

Permalink
Use latest Excon.
Browse files Browse the repository at this point in the history
  • Loading branch information
myronmarston committed Feb 22, 2012
1 parent 48d7dea commit 9380ddb
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions lib/vcr/library_hooks/excon.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions spec/monkey_patches.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand All @@ -62,7 +62,7 @@ def disable_all!

if defined?(::Excon)
::Excon.stubs.clear
::Excon.mock = false
::Excon.defaults[:mock] = false
end
end

Expand Down
2 changes: 1 addition & 1 deletion vcr.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down

0 comments on commit 9380ddb

Please sign in to comment.