vcr 2.5.0 → 2.6.0

data/spec/vcr/configuration_spec.rb

@@ -68,8 +68,8 @@ describe VCR::Configuration do
 
   describe '#hook_into' do
     it 'requires the named library hook' do
-      subject.should_receive(:require).with("vcr/library_hooks/fakeweb")
-      subject.should_receive(:require).with("vcr/library_hooks/excon")
+      expect(subject).to receive(:require).with("vcr/library_hooks/fakeweb")
+      expect(subject).to receive(:require).with("vcr/library_hooks/excon")
       subject.hook_into :fakeweb, :excon
     end
 
@@ -89,14 +89,14 @@ describe VCR::Configuration do
 
   describe '#ignore_hosts' do
     it 'delegates to the current request_ignorer instance' do
-      VCR.request_ignorer.should_receive(:ignore_hosts).with('example.com', 'example.net')
+      expect(VCR.request_ignorer).to receive(:ignore_hosts).with('example.com', 'example.net')
       subject.ignore_hosts 'example.com', 'example.net'
     end
   end
 
   describe '#ignore_localhost=' do
     it 'delegates to the current request_ignorer instance' do
-      VCR.request_ignorer.should_receive(:ignore_localhost=).with(true)
+      expect(VCR.request_ignorer).to receive(:ignore_localhost=).with(true)
       subject.ignore_localhost = true
     end
   end
@@ -107,7 +107,7 @@ describe VCR::Configuration do
     it 'registers the given block with the request ignorer' do
       block_called = false
       subject.ignore_request { |r| block_called = true }
-      VCR.request_ignorer.ignore?(stub(:parsed_uri => uri))
+      VCR.request_ignorer.ignore?(double(:parsed_uri => uri))
       expect(block_called).to be_true
     end
   end
@@ -155,9 +155,9 @@ describe VCR::Configuration do
       it 'sets up a tag filter' do
         called = false
         VCR.configuration.send(hook_type, :my_tag) { called = true }
-        VCR.configuration.invoke_hook(hook_type, stub, stub(:tags => []))
+        VCR.configuration.invoke_hook(hook_type, double, double(:tags => []))
         expect(called).to be_false
-        VCR.configuration.invoke_hook(hook_type, stub, stub(:tags => [:my_tag]))
+        VCR.configuration.invoke_hook(hook_type, double, double(:tags => [:my_tag]))
         expect(called).to be_true
       end
     end
@@ -165,42 +165,42 @@ describe VCR::Configuration do
 
   %w[ filter_sensitive_data define_cassette_placeholder ].each do |method|
     describe "##{method}" do
-      let(:interaction) { mock('interaction').as_null_object }
-      before(:each) { interaction.stub(:filter!) }
+      let(:interaction) { double('interaction').as_null_object }
+      before(:each) { allow(interaction).to receive(:filter!) }
 
       it 'adds a before_record hook that replaces the string returned by the block with the given string' do
         subject.send(method, 'foo', &lambda { 'bar' })
-        interaction.should_receive(:filter!).with('bar', 'foo')
-        subject.invoke_hook(:before_record, interaction, stub.as_null_object)
+        expect(interaction).to receive(:filter!).with('bar', 'foo')
+        subject.invoke_hook(:before_record, interaction, double.as_null_object)
       end
 
       it 'adds a before_playback hook that replaces the given string with the string returned by the block' do
         subject.send(method, 'foo', &lambda { 'bar' })
-        interaction.should_receive(:filter!).with('foo', 'bar')
-        subject.invoke_hook(:before_playback, interaction, stub.as_null_object)
+        expect(interaction).to receive(:filter!).with('foo', 'bar')
+        subject.invoke_hook(:before_playback, interaction, double.as_null_object)
       end
 
       it 'tags the before_record hook when given a tag' do
-        subject.should_receive(:before_record).with(:my_tag)
+        expect(subject).to receive(:before_record).with(:my_tag)
         subject.send(method, 'foo', :my_tag) { 'bar' }
       end
 
       it 'tags the before_playback hook when given a tag' do
-        subject.should_receive(:before_playback).with(:my_tag)
+        expect(subject).to receive(:before_playback).with(:my_tag)
         subject.send(method, 'foo', :my_tag) { 'bar' }
       end
 
       it 'yields the interaction to the block for the before_record hook' do
         yielded_interaction = nil
         subject.send(method, 'foo', &lambda { |i| yielded_interaction = i; 'bar' })
-        subject.invoke_hook(:before_record, interaction, stub.as_null_object)
+        subject.invoke_hook(:before_record, interaction, double.as_null_object)
         expect(yielded_interaction).to equal(interaction)
       end
 
       it 'yields the interaction to the block for the before_playback hook' do
         yielded_interaction = nil
         subject.send(method, 'foo', &lambda { |i| yielded_interaction = i; 'bar' })
-        subject.invoke_hook(:before_playback, interaction, stub.as_null_object)
+        subject.invoke_hook(:before_playback, interaction, double.as_null_object)
         expect(yielded_interaction).to equal(interaction)
       end
     end
@@ -235,7 +235,7 @@ describe VCR::Configuration do
   end if RUBY_VERSION < '1.9'
 
   describe "#cassette_serializers" do
-    let(:custom_serializer) { stub }
+    let(:custom_serializer) { double }
     it 'allows a custom serializer to be registered' do
       expect { subject.cassette_serializers[:custom] }.to raise_error(ArgumentError)
       subject.cassette_serializers[:custom] = custom_serializer
@@ -244,7 +244,7 @@ describe VCR::Configuration do
   end
 
   describe "#cassette_persisters" do
-    let(:custom_persister) { stub }
+    let(:custom_persister) { double }
     it 'allows a custom persister to be registered' do
       expect { subject.cassette_persisters[:custom] }.to raise_error(ArgumentError)
       subject.cassette_persisters[:custom] = custom_persister
@@ -253,7 +253,7 @@ describe VCR::Configuration do
   end
 
   describe "#uri_parser=" do
-    let(:custom_parser) { stub }
+    let(:custom_parser) { double }
     it 'allows a custom uri parser to be set' do
       subject.uri_parser = custom_parser
       expect(subject.uri_parser).to eq(custom_parser)
@@ -266,7 +266,7 @@ describe VCR::Configuration do
 
   describe "#preserve_exact_body_bytes_for?" do
     def message_for(body)
-      stub(:body => body)
+      double(:body => body)
     end
 
     context "default hook" do
@@ -302,7 +302,7 @@ describe VCR::Configuration do
     it "invokes the configured hook with the http message and the current cassette" do
       VCR.use_cassette('example') do |cassette|
         expect(cassette).to be_a(VCR::Cassette)
-        message = stub(:message)
+        message = double(:message)
 
         yielded_objects = nil
         subject.preserve_exact_body_bytes { |a, b| yielded_objects = [a, b] }
@@ -314,7 +314,7 @@ describe VCR::Configuration do
 
   describe "#configure_rspec_metadata!" do
     it "only configures the underlying metadata once, no matter how many times it is called" do
-      VCR::RSpec::Metadata.should_receive(:configure!).once
+      expect(VCR::RSpec::Metadata).to receive(:configure!).once
       VCR.configure do |c|
         c.configure_rspec_metadata!
       end

data/spec/vcr/deprecations_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe VCR, 'deprecations', :disable_warnings do
   describe ".config" do
     it 'delegates to VCR.configure' do
-      VCR.should_receive(:configure)
+      expect(VCR).to receive(:configure)
       VCR.config { }
     end
 
@@ -14,7 +14,7 @@ describe VCR, 'deprecations', :disable_warnings do
     end
 
     it 'prints a deprecation warning' do
-      VCR.should_receive(:warn).with(/VCR.config.*deprecated/i)
+      expect(VCR).to receive(:warn).with(/VCR.config.*deprecated/i)
 
       VCR.config { }
     end
@@ -26,7 +26,7 @@ describe VCR, 'deprecations', :disable_warnings do
     end
 
     it 'prints a deprecation warning' do
-      VCR.should_receive(:warn).with(/VCR::Config.*deprecated/i)
+      expect(VCR).to receive(:warn).with(/VCR::Config.*deprecated/i)
 
       VCR::Config
     end
@@ -44,7 +44,7 @@ describe VCR, 'deprecations', :disable_warnings do
     end
 
     it 'prints a deprecation warning' do
-      VCR::Cassette.should_receive(:warn).with(/VCR::Cassette::MissingERBVariableError.*deprecated/i)
+      expect(VCR::Cassette).to receive(:warn).with(/VCR::Cassette::MissingERBVariableError.*deprecated/i)
 
       VCR::Cassette::MissingERBVariableError
     end
@@ -58,26 +58,26 @@ describe VCR, 'deprecations', :disable_warnings do
 
   describe "VCR.configure { |c| c.stub_with ... }" do
     it 'delegates to #hook_into' do
-      VCR.configuration.should_receive(:hook_into).with(:fakeweb, :excon)
+      expect(VCR.configuration).to receive(:hook_into).with(:fakeweb, :excon)
       VCR.configure { |c| c.stub_with :fakeweb, :excon }
     end
 
     it 'prints a deprecation warning' do
-      VCR.configuration.should_receive(:warn).with(/stub_with.*deprecated/i)
+      expect(VCR.configuration).to receive(:warn).with(/stub_with.*deprecated/i)
       VCR.configure { |c| c.stub_with :fakeweb, :excon }
     end
   end
 
   describe "VCR::Middleware::Faraday" do
     it 'prints a deprecation warning when passed a block' do
-      Kernel.should_receive(:warn).with(/Passing a block .* is deprecated/)
-      VCR::Middleware::Faraday.new(stub) { }
+      expect(Kernel).to receive(:warn).with(/Passing a block .* is deprecated/)
+      VCR::Middleware::Faraday.new(double) { }
     end
   end
 
   describe "VCR::RSpec::Macros" do
     it 'prints a deprecation warning' do
-      Kernel.should_receive(:warn).with(/VCR::RSpec::Macros is deprecated/)
+      expect(Kernel).to receive(:warn).with(/VCR::RSpec::Macros is deprecated/)
       Class.new.extend(VCR::RSpec::Macros)
     end
   end

data/spec/vcr/errors_spec.rb

@@ -82,7 +82,7 @@ module VCR
         it 'mentions :allow_playback_repeats if the current cassette has a used matching interaction' do
           VCR.use_cassette('example') do |cassette|
             expect(cassette.http_interactions).to respond_to(:has_used_interaction_matching?)
-            cassette.http_interactions.stub(:has_used_interaction_matching? => true)
+            allow(cassette.http_interactions).to receive(:has_used_interaction_matching?).and_return(true)
             expect(message).to include('allow_playback_repeats')
           end
         end
@@ -90,7 +90,7 @@ module VCR
         it 'does not mention :allow_playback_repeats if the current cassette does not have a used matching interaction' do
           VCR.use_cassette('example') do |cassette|
             expect(cassette.http_interactions).to respond_to(:has_used_interaction_matching?)
-            cassette.http_interactions.stub(:has_used_interaction_matching? => false)
+            allow(cassette.http_interactions).to receive(:has_used_interaction_matching?).and_return(false)
             expect(message).not_to include('allow_playback_repeats')
           end
         end
@@ -98,7 +98,7 @@ module VCR
         it 'does not mention using a different :match_requests_on option when there are no remaining unused interactions' do
           VCR.use_cassette('example') do |cassette|
             expect(cassette.http_interactions).to respond_to(:remaining_unused_interaction_count)
-            cassette.http_interactions.stub(:remaining_unused_interaction_count => 0)
+            allow(cassette.http_interactions).to receive(:remaining_unused_interaction_count).and_return(0)
             expect(message).not_to include('match_requests_on cassette option')
           end
         end
@@ -106,7 +106,7 @@ module VCR
         it 'mentions using a different :match_requests_on option when there are some remaining unused interactions' do
           VCR.use_cassette('example') do |cassette|
             expect(cassette.http_interactions).to respond_to(:remaining_unused_interaction_count)
-            cassette.http_interactions.stub(:remaining_unused_interaction_count => 1)
+            allow(cassette.http_interactions).to receive(:remaining_unused_interaction_count).and_return(1)
             expect(message).to include('match_requests_on cassette option')
           end
         end
@@ -114,7 +114,7 @@ module VCR
         it 'uses the singular (HTTP interaction) when there is only 1 left' do
           VCR.use_cassette('example') do |cassette|
             expect(cassette.http_interactions).to respond_to(:remaining_unused_interaction_count)
-            cassette.http_interactions.stub(:remaining_unused_interaction_count => 1)
+            allow(cassette.http_interactions).to receive(:remaining_unused_interaction_count).and_return(1)
             expect(message).to include('1 HTTP interaction ')
           end
         end
@@ -122,7 +122,7 @@ module VCR
         it 'uses the plural (HTTP interactions) when there is more than 1 left' do
           VCR.use_cassette('example') do |cassette|
             expect(cassette.http_interactions).to respond_to(:remaining_unused_interaction_count)
-            cassette.http_interactions.stub(:remaining_unused_interaction_count => 2)
+            allow(cassette.http_interactions).to receive(:remaining_unused_interaction_count).and_return(2)
             expect(message).to include('2 HTTP interactions ')
           end
         end

data/spec/vcr/library_hooks/excon_spec.rb

@@ -2,11 +2,15 @@ require 'spec_helper'
 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
 
@@ -14,7 +18,7 @@ describe "Excon hook", :with_monkey_patches => :excon do
     let(:excon) { ::Excon.new("http://localhost:#{VCR::SinatraApp.port}/search") }
 
     it 'properly records and plays back the response' do
-      VCR.stub(:real_http_connections_allowed? => true)
+      allow(VCR).to receive(:real_http_connections_allowed?).and_return(true)
       recorded, played_back = [1, 2].map do
         VCR.use_cassette('excon_query', :record => :once) do
           excon.request(:method => :get, :query => { :q => 'Tolkien' }).body
@@ -30,16 +34,17 @@ describe "Excon hook", :with_monkey_patches => :excon do
 
   context 'when Excon raises an error due to an unexpected response status' do
     before(:each) do
-      VCR.stub(:real_http_connections_allowed? => true)
+      allow(VCR).to receive(:real_http_connections_allowed?).and_return(true)
     end
 
     it 'still records properly' do
-      VCR.should_receive(:record_http_interaction) do |interaction|
+      expect(VCR).to receive(:record_http_interaction) do |interaction|
         expect(interaction.response.status.code).to eq(404)
+        expect(interaction.response.body).to eq('404 not 200')
       end
 
       expect {
-        Excon.get("http://localhost:#{VCR::SinatraApp.port}/not_found", :expects => 200)
+        Excon.get("http://localhost:#{VCR::SinatraApp.port}/404_not_200", :expects => 200)
       }.to raise_error(Excon::Errors::Error)
     end
 
@@ -76,7 +81,7 @@ describe "Excon hook", :with_monkey_patches => :excon do
   describe "VCR.configuration.after_library_hooks_loaded hook" do
     it 'disables the webmock excon adapter so it does not conflict with our typhoeus hook' do
       expect(::WebMock::HttpLibAdapters::ExconAdapter).to respond_to(:disable!)
-      ::WebMock::HttpLibAdapters::ExconAdapter.should_receive(:disable!)
+      expect(::WebMock::HttpLibAdapters::ExconAdapter).to receive(:disable!)
       $excon_after_loaded_hook.conditionally_invoke
     end
   end

data/spec/vcr/library_hooks/fakeweb_spec.rb

@@ -22,11 +22,11 @@ describe "FakeWeb hook", :with_monkey_patches => :fakeweb do
 
   describe "some specific Net::HTTP edge cases" do
     before(:each) do
-      VCR.stub(:real_http_connections_allowed? => true)
+      allow(VCR).to receive(:real_http_connections_allowed?).and_return(true)
     end
 
     it 'records the request body when using #post_form' do
-      VCR.should_receive(:record_http_interaction) do |interaction|
+      expect(VCR).to receive(:record_http_interaction) do |interaction|
         expect(interaction.request.body).to eq("q=ruby")
       end
 
@@ -35,7 +35,7 @@ describe "FakeWeb hook", :with_monkey_patches => :fakeweb do
     end
 
     it "does not record headers for which Net::HTTP sets defaults near the end of the real request" do
-      VCR.should_receive(:record_http_interaction) do |interaction|
+      expect(VCR).to receive(:record_http_interaction) do |interaction|
         expect(interaction.request.headers).not_to have_key('content-type')
         expect(interaction.request.headers).not_to have_key('host')
       end
@@ -43,7 +43,7 @@ describe "FakeWeb hook", :with_monkey_patches => :fakeweb do
     end
 
     it "records headers for which Net::HTTP usually sets defaults when the user manually sets their values" do
-      VCR.should_receive(:record_http_interaction) do |interaction|
+      expect(VCR).to receive(:record_http_interaction) do |interaction|
         expect(interaction.request.headers['content-type']).to eq(['foo/bar'])
         expect(interaction.request.headers['host']).to eq(['my-example.com'])
       end
@@ -57,7 +57,7 @@ describe "FakeWeb hook", :with_monkey_patches => :fakeweb do
     end
 
     it 'records the interaction when Net::HTTP#request is called with a block with a return statement' do
-      VCR.should_receive(:record_http_interaction).once
+      expect(VCR).to receive(:record_http_interaction).once
       expect(perform_get_with_returning_block.body).to eq("GET to root")
     end
 
@@ -66,7 +66,7 @@ describe "FakeWeb hook", :with_monkey_patches => :fakeweb do
     end
 
     it 'records the interaction only once, even when Net::HTTP internally recursively calls #request' do
-      VCR.should_receive(:record_http_interaction).once
+      expect(VCR).to receive(:record_http_interaction).once
       make_post_request
     end
 
@@ -129,7 +129,7 @@ describe "FakeWeb hook", :with_monkey_patches => :fakeweb do
       end
 
       it "warns about FakeWeb deprecation" do
-        ::Kernel.should_receive(:warn).with("WARNING: VCR's FakeWeb integration is deprecated and will be removed in VCR 3.0.")
+        expect(::Kernel).to receive(:warn).with("WARNING: VCR's FakeWeb integration is deprecated and will be removed in VCR 3.0.")
         run_hook
       end
     end
@@ -148,7 +148,7 @@ describe "FakeWeb hook", :with_monkey_patches => :fakeweb do
 
       undef make_request
       def make_request(disabled = false)
-        ::Net::HTTP.any_instance.stub(:request_without_vcr).and_raise(SocketError)
+        allow_any_instance_of(::Net::HTTP).to receive(:request_without_vcr).and_raise(SocketError)
         expect {
           ::Net::HTTP.get_response(URI(request_url))
         }.to raise_error(SocketError)

data/spec/vcr/library_hooks/faraday_spec.rb

@@ -47,7 +47,7 @@ describe "Faraday hook" do
       builder.use Faraday::Response::Logger
     end
 
-    conn.builder.should_receive(:warn).with(/Faraday::Response::Logger/)
+    expect(conn.builder).to receive(:warn).with(/Faraday::Response::Logger/)
     conn.builder.lock!
   end
 

data/spec/vcr/library_hooks/typhoeus_0.4_spec.rb

@@ -23,12 +23,12 @@ describe "Typhoeus 0.4 hook", :with_monkey_patches => :typhoeus_0_4 do
 
   describe "VCR.configuration.after_library_hooks_loaded hook" do
     it 'disables the webmock typhoeus adapter so it does not conflict with our typhoeus hook' do
-      ::WebMock::HttpLibAdapters::TyphoeusAdapter.should_receive(:disable!)
+      expect(::WebMock::HttpLibAdapters::TyphoeusAdapter).to receive(:disable!)
       $typhoeus_after_loaded_hook.conditionally_invoke
     end
 
     it "warns about Typhoeus 0.4 deprecation" do
-      ::Kernel.should_receive(:warn).with("WARNING: VCR's Typhoeus 0.4 integration is deprecated and will be removed in VCR 3.0.")
+      expect(::Kernel).to receive(:warn).with("WARNING: VCR's Typhoeus 0.4 integration is deprecated and will be removed in VCR 3.0.")
       $typhoeus_0_4_after_loaded_hook.conditionally_invoke
     end
   end

data/spec/vcr/library_hooks/typhoeus_spec.rb

@@ -23,7 +23,7 @@ describe "Typhoeus hook", :with_monkey_patches => :typhoeus do
 
   describe "VCR.configuration.after_library_hooks_loaded hook" do
     it 'disables the webmock typhoeus adapter so it does not conflict with our typhoeus hook' do
-      ::WebMock::HttpLibAdapters::TyphoeusAdapter.should_receive(:disable!)
+      expect(::WebMock::HttpLibAdapters::TyphoeusAdapter).to receive(:disable!)
       $typhoeus_after_loaded_hook.conditionally_invoke
     end
   end
@@ -65,22 +65,81 @@ describe "Typhoeus hook", :with_monkey_patches => :typhoeus do
     end
   end
 
+  context "when used with a typhoeus-based faraday connection" do
+    let(:base_url) { "http://localhost:#{VCR::SinatraApp.port}" }
+
+    let(:conn) do
+      Faraday.new(:url => base_url) do |faraday|
+        faraday.adapter  :typhoeus
+      end
+    end
+
+    def get_response
+      # Ensure faraday hook doesn't handle the request.
+      VCR.library_hooks.exclusively_enabled(:typhoeus) do
+        VCR.use_cassette("faraday") do
+          conn.get("/")
+        end
+      end
+    end
+
+    it 'records and replays headers correctly' do
+      pending "waiting on typhoeus/typhoeus#324" do
+        recorded = get_response
+        played_back = get_response
+
+        expect(played_back.headers).to eq(recorded.headers)
+      end
+    end
+  end
+
   context '#effective_url' do
-    def make_single_request
-      VCR.use_cassette('single') do
-        response = Typhoeus::Request.new("http://localhost:#{VCR::SinatraApp.port}/").run
+    ResponseValues = Struct.new(:status, :body, :effective_url)
 
-        response.effective_url
+    def url_for(path)
+      "http://localhost:#{VCR::SinatraApp.port}#{path}"
+    end
+
+    def make_single_request(path, options = {})
+      VCR.use_cassette('single') do |cassette|
+        response = Typhoeus::Request.new(url_for(path), options).run
+
+        yield cassette if block_given?
+
+        ResponseValues.new(
+          response.code,
+          response.body,
+          response.effective_url
+        )
       end
     end
 
-    it 'recorded and played back properly' do
-      recorded = make_single_request
-      played_back = make_single_request
-      expect(recorded).not_to be_nil
+    it 'records and plays back properly' do
+      recorded = make_single_request('/')
+      played_back = make_single_request('/')
 
+      expect(recorded.effective_url).to eq(url_for('/'))
       expect(played_back).to eq(recorded)
     end
+
+    it 'falls back to the request url when it was not recorded (e.g. on VCR <= 2.5.0)' do
+      make_single_request('/') do |cassette|
+        cassette.new_recorded_interactions.each { |i| i.response.adapter_metadata.clear }
+      end
+
+      played_back = make_single_request('/')
+      expect(played_back.effective_url).to eq(url_for('/'))
+    end
+
+    context "when following redirects" do
+      it 'records and plays back properly' do
+        recorded = make_single_request('/redirect-to-root', :followlocation => true)
+        played_back = make_single_request('/redirect-to-root', :followlocation => true)
+
+        expect(recorded.effective_url).to eq(url_for('/'))
+        expect(played_back).to eq(recorded)
+      end
+    end
   end
 end