vcr 1.6.0 → 1.7.0

data/spec/vcr/deprecations/config_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe VCR::Config, 'deprecations', :disable_warnings => true do
+  describe '.http_stubbing_library' do
+    before(:each) { described_class.stub_with :webmock, :typhoeus }
+
+    it 'returns the first configured stubbing library' do
+      described_class.http_stubbing_library.should == :webmock
+    end
+
+    it 'prints a warning: WARNING: VCR::Config.http_stubbing_library is deprecated.  Use VCR::Config.http_stubbing_libraries instead' do
+      described_class.should_receive(:warn).with("WARNING: `VCR::Config.http_stubbing_library` is deprecated.  Use `VCR::Config.http_stubbing_libraries` instead.")
+      described_class.http_stubbing_library
+    end
+  end
+
+  describe '.http_stubbing_library=' do
+    it 'sets http_stubbing_libraries to an array of the given value' do
+      described_class.http_stubbing_library = :webmock
+      described_class.http_stubbing_libraries.should == [:webmock]
+    end
+
+    it 'prints a warning: WARNING: VCR::Config.http_stubbing_library= is deprecated.  Use VCR::Config.stub_with instead' do
+      described_class.should_receive(:warn).with("WARNING: `VCR::Config.http_stubbing_library = :webmock` is deprecated.  Use `VCR::Config.stub_with :webmock` instead.")
+      described_class.http_stubbing_library = :webmock
+    end
+  end
+
+  it_behaves_like '.ignore_localhost? deprecation'
+end

data/spec/vcr/deprecations/http_stubbing_adapters/common_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+VCR::HttpStubbingAdapters::Common.adapters.each do |adapter|
+  describe adapter, 'deprecations', :disable_warnings => true do
+    it_behaves_like '.ignore_localhost? deprecation'
+  end
+end

data/spec/vcr/deprecations/http_stubbing_adapters/fakeweb_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe VCR::HttpStubbingAdapters::FakeWeb, 'deprecations', :disable_warnings => true do
+  describe 'LOCALHOST_REGEX constant' do
+    subject { described_class::LOCALHOST_REGEX }
+
+    it 'refers to the expected regex' do
+      should == %r|\Ahttps?://((\w+:)?\w+@)?(#{VCR::LOCALHOST_ALIASES.sort.map { |a| Regexp.escape(a) }.join('|')})(:\d+)?/|i
+    end
+
+    it 'prints a warning: WARNING: `VCR::HttpStubbingAdapters::FakeWeb::LOCALHOST_REGEX` is deprecated.' do
+      described_class.should_receive(:warn).with("WARNING: `VCR::HttpStubbingAdapters::FakeWeb::LOCALHOST_REGEX` is deprecated.")
+      subject
+    end
+  end
+end

data/spec/vcr/extensions/net_http_response_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
-describe VCR::Net::HTTPResponse do
-  without_monkey_patches :all
-
+describe VCR::Net::HTTPResponse, :without_monkey_patches => :all do
   def self.it_allows_the_body_to_be_read(expected_regex)
     it 'allows the body to be read using #body' do
       response.body.to_s.should =~ expected_regex

data/spec/vcr/extensions/net_http_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
-describe "Net::HTTP Extensions" do
-  without_webmock_callbacks
-
+describe "Net::HTTP Extensions", :without_webmock_callbacks => true do
   before(:all) { VCR::SinatraApp.port } # ensure the server is started before instantiating any Net::HTTP instances
 
   let(:uri) { URI.parse("http://localhost:#{VCR::SinatraApp.port}/") }

data/spec/vcr/http_stubbing_adapters/fakeweb_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
-describe VCR::HttpStubbingAdapters::FakeWeb do
-  without_webmock_callbacks
-
+describe VCR::HttpStubbingAdapters::FakeWeb, :without_webmock_callbacks => true do
   it_behaves_like 'an http stubbing adapter', ['net/http'], [:method, :uri, :host, :path], :needs_net_http_extension
 
   it_performs('version checking',
@@ -10,7 +8,6 @@ describe VCR::HttpStubbingAdapters::FakeWeb do
     :too_low  => %w[ 1.2.8 1.1.30 0.30.30 ],
     :too_high => %w[ 1.4.0 1.10.0 2.0.0 ]
   ) do
-    disable_warnings
     before(:each) { @orig_version = FakeWeb::VERSION }
     after(:each)  { FakeWeb::VERSION = @orig_version }
 

data/spec/vcr/http_stubbing_adapters/faraday_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
-describe VCR::HttpStubbingAdapters::Faraday do
-  without_monkey_patches :all
-
+describe VCR::HttpStubbingAdapters::Faraday, :without_monkey_patches => :all do
   it_behaves_like 'an http stubbing adapter',
     %w[ faraday-typhoeus faraday-net_http faraday-patron ],
     [:method, :uri, :host, :path, :body, :headers],
@@ -13,7 +11,6 @@ describe VCR::HttpStubbingAdapters::Faraday do
     :too_low  => %w[ 0.5.2 0.4.99 ],
     :too_high => %w[ 0.6.0 1.0.0 ]
   ) do
-    disable_warnings
     before(:each) { @orig_version = Faraday::VERSION }
     after(:each)  { Faraday::VERSION = @orig_version }
 

data/spec/vcr/http_stubbing_adapters/typhoeus_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
-describe VCR::HttpStubbingAdapters::Typhoeus do
-  without_monkey_patches :vcr
-
+describe VCR::HttpStubbingAdapters::Typhoeus, :without_monkey_patches => :vcr do
   before(:each) do
     ::Typhoeus::Hydra.stubs = []
     ::Typhoeus::Hydra.allow_net_connect = true
@@ -15,7 +13,6 @@ describe VCR::HttpStubbingAdapters::Typhoeus do
     :too_low  => %w[ 0.1.0 0.1.31 0.2.0 ],
     :too_high => %w[ 0.3.0 1.0.0 ]
   ) do
-    disable_warnings
     before(:each) { @orig_version = Typhoeus::VERSION }
     after(:each)  { Typhoeus::VERSION = @orig_version }
 

data/spec/vcr/http_stubbing_adapters/webmock_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
-describe VCR::HttpStubbingAdapters::WebMock do
-  without_monkey_patches :vcr
-
+describe VCR::HttpStubbingAdapters::WebMock, :without_monkey_patches => :vcr do
   it_behaves_like 'an http stubbing adapter',
     %w[net/http patron httpclient em-http-request curb],
     [:method, :uri, :host, :path, :body, :headers]

data/spec/vcr/middleware/faraday_spec.rb

@@ -32,19 +32,19 @@ describe VCR::Middleware::Faraday do
 
     it 'sets the cassette options based on the provided block' do
       app = lambda { |env| VCR.current_cassette.erb.should == { :foo => :bar } }
-      instance = described_class.new(app) do |c|
+      instance = described_class.new(app, &lambda do |c|
         c.name    'c'
         c.options :erb => { :foo => :bar }
-      end
+      end)
 
       instance.call(env_hash)
     end
 
     it 'yields the env to the provided block when the block accepts 2 arguments' do
-      instance = described_class.new(lambda { |env| }) do |c, env|
+      instance = described_class.new(lambda { |env| }, &lambda do |c, env|
         env.should == env_hash
         c.name    'c'
-      end
+      end)
 
       instance.call(env_hash)
     end

data/spec/vcr/middleware/rack_spec.rb

@@ -34,19 +34,19 @@ describe VCR::Middleware::Rack do
 
     it 'sets the cassette options based on the provided block' do
       rack_app = lambda { |env| VCR.current_cassette.erb.should == { :foo => :bar } }
-      instance = described_class.new(rack_app) do |c|
+      instance = described_class.new(rack_app, &lambda do |c|
         c.name    'c'
         c.options :erb => { :foo => :bar }
-      end
+      end)
 
       instance.call({})
     end
 
     it 'yields the rack env to the provided block when the block accepts 2 arguments' do
-      instance = described_class.new(lambda { |env| }) do |c, env|
+      instance = described_class.new(lambda { |env| }, &lambda do |c, env|
         env.should == env_hash
         c.name    'c'
-      end
+      end)
 
       instance.call(env_hash)
     end

data/spec/vcr/structs/http_interaction_spec.rb

@@ -20,4 +20,65 @@ describe VCR::HTTPInteraction do
       should be_ignored
     end
   end
+
+  describe '#filter!' do
+    let(:response_status) { VCR::ResponseStatus.new(200, "OK foo") }
+    let(:body) { "The body foo this is (foo-Foo)" }
+    let(:headers) do {
+      'x-http-foo' => ['bar23', '23foo'],
+      'x-http-bar' => ['foo23', '18']
+    } end
+
+    let(:response) do
+      VCR::Response.new(
+        response_status,
+        headers.dup,
+        body.dup,
+        '1.1'
+      )
+    end
+
+    let(:request) do
+      VCR::Request.new(
+        :get,
+        'http://example-foo.com:80/foo/',
+        body.dup,
+        headers.dup
+      )
+    end
+
+    let(:interaction) { VCR::HTTPInteraction.new(request, response) }
+
+    subject { interaction.filter!('foo', 'AAA') }
+
+    it 'does nothing when given a blank argument' do
+      expect {
+        interaction.filter!(nil, 'AAA')
+        interaction.filter!('foo', nil)
+        interaction.filter!("", 'AAA')
+        interaction.filter!('foo', "")
+      }.not_to change { interaction }
+    end
+
+    [:request, :response].each do |part|
+      it "replaces the sensitive text in the #{part} header keys and values" do
+        subject.send(part).headers.should == {
+          'x-http-AAA' => ['bar23', '23AAA'],
+          'x-http-bar' => ['AAA23', '18']
+        }
+      end
+
+      it "replaces the sensitive text in the #{part} body" do
+        subject.send(part).body.should == "The body AAA this is (AAA-Foo)"
+      end
+    end
+
+    it 'replaces the sensitive text in the response status' do
+      subject.response.status.message.should == 'OK AAA'
+    end
+
+    it 'replaces sensitive text in the request URI' do
+      subject.request.uri.should == 'http://example-AAA.com:80/AAA/'
+    end
+  end
 end

data/spec/vcr/structs/request_spec.rb

@@ -13,9 +13,27 @@ describe VCR::Request do
     end
   end
 
+  describe '#method' do
+    subject { VCR::Request.new(:get) }
+
+    context 'when given no arguments' do
+      it 'returns the HTTP method' do
+        subject.method.should == :get
+      end
+    end
+
+    context 'when given an argument' do
+      it 'returns the method object for the named method' do
+        m = subject.method(:class)
+        m.should be_a(Method)
+        m.call.should == described_class
+      end
+    end
+  end
+
   describe '.from_net_http_request' do
-    let(:net_http) { YAML.load(File.read("#{VCR::SPEC_ROOT}/fixtures/#{YAML_SERIALIZATION_VERSION}/example_net_http.yml")) }
-    let(:request)  { YAML.load(File.read("#{VCR::SPEC_ROOT}/fixtures/#{YAML_SERIALIZATION_VERSION}/example_net_http_request.yml")) }
+    let(:net_http) { VCR::YAML.load_file("#{VCR::SPEC_ROOT}/fixtures/#{YAML_SERIALIZATION_VERSION}/example_net_http.yml") }
+    let(:request)  { VCR::YAML.load_file("#{VCR::SPEC_ROOT}/fixtures/#{YAML_SERIALIZATION_VERSION}/example_net_http_request.yml") }
     subject { described_class.from_net_http_request(net_http, request) }
 
     before(:each) do

data/spec/vcr/structs/response_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe VCR::Response do
   describe '.from_net_http_response' do
-    let(:response) { YAML.load(File.read("#{VCR::SPEC_ROOT}/fixtures/#{YAML_SERIALIZATION_VERSION}/example_net_http_response.yml")) }
+    let(:response) { VCR::YAML.load_file("#{VCR::SPEC_ROOT}/fixtures/#{YAML_SERIALIZATION_VERSION}/example_net_http_response.yml") }
     subject { described_class.from_net_http_response(response) }
 
     it                 { should be_instance_of(described_class) }
@@ -36,4 +36,26 @@ describe VCR::Response do
       described_class.new(:status, {}, body, '1.1')
     end
   end
+
+  describe '#update_content_length_header' do
+    def instance(body, content_length = nil)
+      headers = { 'content-type' => 'text' }
+      headers.merge!('content-length' => content_length) if content_length
+      described_class.new(VCR::ResponseStatus.new, headers, body)
+    end
+
+    it 'does nothing when the response lacks a content_length header' do
+      inst = instance('the body')
+      expect {
+        inst.update_content_length_header
+      }.not_to change { inst.headers['content-length'] }
+    end
+
+    it 'sets the content_length header to the response body length when the header is present' do
+      inst = instance('the body', '3')
+      expect {
+        inst.update_content_length_header
+      }.to change { inst.headers['content-length'] }.from(['3']).to(['8'])
+    end
+  end
 end

data/spec/vcr/structs/response_status_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe VCR::ResponseStatus do
   describe '.from_net_http_response' do
-    let(:response) { YAML.load(File.read("#{VCR::SPEC_ROOT}/fixtures/#{YAML_SERIALIZATION_VERSION}/example_net_http_response.yml")) }
+    let(:response) { VCR::YAML.load_file("#{VCR::SPEC_ROOT}/fixtures/#{YAML_SERIALIZATION_VERSION}/example_net_http_response.yml") }
     subject { described_class.from_net_http_response(response) }
 
     it            { should be_instance_of(described_class) }

data/spec/vcr/{cucumber_tags_spec.rb → test_frameworks/cucumber_spec.rb}

@@ -2,20 +2,24 @@ require 'spec_helper'
 
 describe VCR::CucumberTags do
   subject { described_class.new(self) }
-  let(:blocks_for_tags) { {} }
+  let(:before_blocks_for_tags) { {} }
+  let(:after_blocks_for_tags) { {} }
 
-  # define our own Around so we can test this in isolation from cucumber's implementation.
-  def Around(tag, &block)
-    blocks_for_tags[tag.sub('@', '')] = block
+  # define our own Before/After so we can test this in isolation from cucumber's implementation.
+  def Before(tag, &block)
+    before_blocks_for_tags[tag.sub('@', '')] = block
+  end
+
+  def After(tag, &block)
+    after_blocks_for_tags[tag.sub('@', '')] = block
   end
 
   def test_tag(cassette_attribute, tag, expected_value)
     VCR.current_cassette.should be_nil
 
-    cassette_during_scenario = nil
-    scenario = lambda { cassette_during_scenario = VCR.current_cassette }
-    blocks_for_tags[tag].call(:scenario_name, scenario)
-    cassette_during_scenario.send(cassette_attribute).should == expected_value
+    before_blocks_for_tags[tag].call
+    VCR.current_cassette.send(cassette_attribute).should == expected_value
+    after_blocks_for_tags[tag].call
 
     VCR.current_cassette.should be_nil
   end

data/spec/vcr/{hooks_spec.rb → util/hooks_spec.rb}

@@ -73,19 +73,19 @@ describe VCR::Hooks do
       end
 
       it 'passes along the provided arguments to the callback' do
-        subject.before_foo { |a, b| invocations << [a, b] }
+        subject.before_foo &lambda { |a, b| invocations << [a, b] }
         subject.invoke_hook(:before_foo, nil, :arg1, :arg2)
         invocations.flatten.should == [:arg1, :arg2]
       end
 
       it 'only passes along 1 argument when the block accepts only 1 arguments' do
-        subject.before_foo { |a| invocations << a }
+        subject.before_foo &lambda { |a| invocations << a }
         subject.invoke_hook(:before_foo, nil, :arg1, :arg2)
         invocations.flatten.should == [:arg1]
       end
 
       it 'passes along all arguments when the block accepts a variable number of args' do
-        subject.before_foo { |*a| invocations << a }
+        subject.before_foo &lambda { |*a| invocations << a }
         subject.invoke_hook(:before_foo, nil, :arg1, :arg2)
         invocations.flatten.should == [:arg1, :arg2]
       end

data/spec/vcr/util/internet_connection_spec.rb

@@ -7,7 +7,7 @@ describe VCR::InternetConnection do
     end
 
     def stub_pingecho_with(value)
-      Ping.stub(:pingecho).with("example.com", anything, anything).and_return(value)
+      VCR::Ping.stub(:pingecho).with("example.com", anything, anything).and_return(value)
     end
 
     context 'when pinging example.com succeeds' do
@@ -17,7 +17,7 @@ describe VCR::InternetConnection do
       end
 
       it 'memoizes the value so no extra pings are made' do
-        Ping.should_receive(:pingecho).once.and_return(true)
+        VCR::Ping.should_receive(:pingecho).once.and_return(true)
         3.times { described_class.available? }
       end
     end
@@ -29,7 +29,7 @@ describe VCR::InternetConnection do
       end
 
       it 'memoizes the value so no extra pings are made' do
-        Ping.should_receive(:pingecho).once.and_return(false)
+        VCR::Ping.should_receive(:pingecho).once.and_return(false)
         3.times { described_class.available? }
       end
     end

data/spec/vcr_spec.rb

@@ -52,14 +52,14 @@ describe VCR do
 
     it 'yields' do
       yielded = false
-      VCR.use_cassette(:cassette_test) { yielded = true }
+      VCR.use_cassette(:cassette_test, &lambda { yielded = true })
       yielded.should be_true
     end
 
     it 'yields the cassette instance if the block expects an argument' do
-      VCR.use_cassette('name', :record => :new_episodes) do |cassette|
+      VCR.use_cassette('name', :record => :new_episodes, &lambda do |cassette|
         cassette.should equal(VCR.current_cassette)
-      end
+      end)
     end
 
     it 'yields the cassette instance if the block expects a variable number of args' do

data/vcr.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/myronmarston/vcr"
   s.authors = ["Myron Marston"]
   s.summary = "Record your test suite's HTTP interactions and replay them during future test runs for fast, deterministic, accurate tests."
-  s.description = "VCR provides helpers to record your test suite's HTTP interactions and replay them during future test runs for fast, deterministic, accurate tests.  It works with any ruby testing framework, and provides built-in support for cucumber."
+  s.description = "VCR provides a simple API to record and replay your test suite's HTTP interactions.  It works with a variety of HTTP client libraries, HTTP stubbing libraries and testing frameworks."
   s.email = "myron.marston@gmail.com"
   s.require_path = "lib"
   s.files        = `git ls-files`.split("\n")
@@ -21,9 +21,9 @@ Gem::Specification.new do |s|
     'bundler'         => '~> 1.0.7',
     'rake'            => '~> 0.8.7',
 
-    'rspec'           => '~> 2.4.0',
+    'rspec'           => '~> 2.5',
     'cucumber'        => '~> 0.9.4',
-    'aruba'           => '~> 0.2.1',
+    'aruba'           => '0.2.4',
     'shoulda'         => '~> 2.9.2',
 
     'fakeweb'         => '~> 1.3.0',
@@ -40,9 +40,9 @@ Gem::Specification.new do |s|
   end
 
   {
-    'patron'          => '~> 0.4.6',
+    'patron'          => '0.4.9',
     'em-http-request' => '~> 0.2.7',
-    'curb'            => '~> 0.7.8',
+    'curb'            => '0.7.8',
     'typhoeus'        => '~> 0.2.1'
   }.each do |lib, version|
     s.add_development_dependency lib, version