Permalink
Browse files

Test against new webmock, excon and em-http-request releases.

  • Loading branch information...
1 parent 4fbcc9b commit 73df3592533dd4bf500402d2219ef1bf14c8a43a @myronmarston committed Mar 16, 2012
Showing with 7 additions and 7 deletions.
  1. +2 −2 lib/vcr/library_hooks/excon.rb
  2. +2 −2 spec/vcr/library_hooks/excon_spec.rb
  3. +3 −3 vcr.gemspec
@@ -2,7 +2,7 @@
require 'vcr/request_handler'
require 'excon'
-VCR::VersionChecker.new('Excon', Excon::VERSION, '0.9.6', '0.10').check_version!
+VCR::VersionChecker.new('Excon', Excon::VERSION, '0.9.6', '0.11').check_version!
module VCR
class LibraryHooks
@@ -52,7 +52,7 @@ def real_request_params
# a raw response, and then the main request (with :mock => true) can
# handle failure/retry on its own with its set options.
params.merge(:mock => false, :retry_limit => 0).tap do |p|
- [:expects, :idempotent, :instrumentor_name, :instrumentor].each do |key|
+ [:expects, :idempotent, :instrumentor_name, :instrumentor, :response_block, :request_block].each do |key|
p.delete(key)
end
end
@@ -32,9 +32,9 @@
chunks = []
VCR.use_cassette('excon_streaming', :record => :once) do
- Excon.get("http://localhost:#{VCR::SinatraApp.port}/foo") do |chunk, remaining_bytes, total_bytes|
+ Excon.get "http://localhost:#{VCR::SinatraApp.port}/foo", :response_block => lambda { |chunk, remaining_bytes, total_bytes|
chunks << chunk
- end
+ }
end
chunks.join
View
@@ -27,11 +27,11 @@ Gem::Specification.new do |s|
s.add_development_dependency 'shoulda', '~> 2.9.2'
s.add_development_dependency 'fakeweb', '~> 1.3.0'
- s.add_development_dependency 'webmock', '~> 1.8.0'
+ s.add_development_dependency 'webmock', '~> 1.8.3'
s.add_development_dependency 'faraday', '~> 0.8.0.rc2'
s.add_development_dependency 'httpclient', '~> 2.1.5.2'
- s.add_development_dependency 'excon', '>= 0.9.6', '< 1.0'
+ s.add_development_dependency 'excon', '>= 0.11.0', '< 1.0'
s.add_development_dependency 'timecop', '~> 0.3.5'
s.add_development_dependency 'rack', '~> 1.3.6'
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
unless RUBY_PLATFORM == 'java'
s.add_development_dependency 'patron', '~> 0.4.15'
- s.add_development_dependency 'em-http-request', '1.0.1'
+ s.add_development_dependency 'em-http-request', '~> 1.0.2'
s.add_development_dependency 'curb', '~> 0.8.0'
s.add_development_dependency 'typhoeus', '~> 0.3.3'
s.add_development_dependency 'yajl-ruby', '~> 1.1.0'

0 comments on commit 73df359

Please sign in to comment.