Merge pull request vcr#333 from vcr/issue-199

Play nicely with manual excon stubs.

Author: myronmarston

CHANGELOG.md

@@ -15,6 +15,8 @@ Bug Fixes:
 * Explicitly support the latest Excon (0.25). (Myron Marston)
 * Fix detection of encoding errors to handle `ArgumentError` that
   is raised by recent version of `MultiJson` (Myron Marston).
+* Fix Excon adapter so that it allows VCR to play nicely with
+  manual Excon stubs (using Excon's `Excon.stub` API). (Myron Marston)
 
 ## 2.5.0 (May 18, 2013)
 

lib/vcr/middleware/excon.rb

@@ -96,6 +96,10 @@ def ensure_response_body_can_be_read_for_error_case
 
       private
 
+        def externally_stubbed?
+          !!::Excon.stub_for(request_params)
+        end
+
         def should_record?
           @should_record
         end

spec/vcr/library_hooks/excon_spec.rb

@@ -2,11 +2,15 @@
 require 'support/shared_example_groups/excon'
 
 describe "Excon hook", :with_monkey_patches => :excon do
-  # TODO: figure out a way to get disabling VCR to work with Excon
-  #       and allow dirct excon stubs to work.
-  # def directly_stub_request(method, url, response_body)
-  #   ::Excon.stub({ :method => method, :url => url }, { :body => response_body })
-  # end
+  after(:each) do
+    ::Excon.stubs.clear
+    ::Excon.defaults[:mock] = false
+  end
+
+  def directly_stub_request(method, url, response_body)
+    ::Excon.defaults[:mock] = true
+    ::Excon.stub({ :method => method, :url => url }, { :body => response_body })
+  end
 
   it_behaves_like 'a hook into an HTTP library', :excon, 'excon', :status_message_not_exposed