vcr 1.11.1 → 1.11.2

data/spec/support/sinatra_app.rb

@@ -32,6 +32,8 @@ module VCR
       server.port
     end
 
+    @_boot_failed = false
+
     def self.server
       raise "Sinatra app failed to boot." if @_boot_failed
       @server ||= begin

data/spec/support/vcr_localhost_server.rb

@@ -6,6 +6,8 @@ require 'net/http'
 #   http://github.com/jnicklas/capybara/blob/0.3.9/lib/capybara/server.rb
 module VCR
   class LocalhostServer
+    READY_MESSAGE = "VCR server ready"
+
     class Identify
       def initialize(app)
         @app = app
@@ -13,7 +15,7 @@ module VCR
 
       def call(env)
         if env["PATH_INFO"] == "/__identify__"
-          [200, {}, [@app.object_id.to_s]]
+          [200, {}, [VCR::LocalhostServer::READY_MESSAGE]]
         else
           @app.call(env)
         end
@@ -47,9 +49,8 @@ module VCR
 
     def booted?
       res = ::Net::HTTP.get_response("localhost", '/__identify__', port)
-
       if res.is_a?(::Net::HTTPSuccess) or res.is_a?(::Net::HTTPRedirection)
-        return res.body == @rack_app.object_id.to_s
+        return res.body == READY_MESSAGE
       end
     rescue Errno::ECONNREFUSED, Errno::EBADF
       return false

data/spec/vcr/cassette/reader_spec.rb

@@ -21,14 +21,14 @@ describe VCR::Cassette::Reader do
 
     context 'when ERB is disabled' do
       it 'reads the raw file content' do
-        read('no_vars', false).should == no_vars_content
-        read('no_vars', nil).should == no_vars_content
+        read('no_vars', false).should eq(no_vars_content)
+        read('no_vars', nil).should eq(no_vars_content)
       end
     end
 
     context 'when ERB is enabled but no variables are passed' do
       it 'renders the file content as ERB' do
-        read('no_vars', true).should == "7. Some ERB"
+        read('no_vars', true).should eq("7. Some ERB")
       end
 
       it 'raises an appropriate error when the ERB template needs variables' do
@@ -43,7 +43,7 @@ describe VCR::Cassette::Reader do
 
     context 'when ERB is enabled and variables are passed' do
       it 'renders the file content as ERB with the passed variables' do
-        read('vars', :var1 => 'foo', :var2 => 'bar').should == 'foo. ERB with Vars! bar'
+        read('vars', :var1 => 'foo', :var2 => 'bar').should eq('foo. ERB with Vars! bar')
       end
 
       it 'raises an appropriate error when one or more of the needed variables are not passed' do

data/spec/vcr/cassette_spec.rb

@@ -4,7 +4,7 @@ describe VCR::Cassette do
   describe '#file' do
     it 'combines the cassette_library_dir with the cassette name' do
       cassette = VCR::Cassette.new('the_file')
-      cassette.file.should == File.join(VCR::Config.cassette_library_dir, 'the_file.yml')
+      cassette.file.should eq(File.join(VCR::Config.cassette_library_dir, 'the_file.yml'))
     end
 
     it 'strips out disallowed characters so that it is a valid file name with no spaces' do
@@ -27,9 +27,9 @@ describe VCR::Cassette do
   describe '#record_http_interaction' do
     it 'adds the interaction to #new_recorded_interactions' do
       cassette = VCR::Cassette.new(:test_cassette)
-      cassette.new_recorded_interactions.should == []
+      cassette.new_recorded_interactions.should eq([])
       cassette.record_http_interaction(:the_interaction)
-      cassette.new_recorded_interactions.should == [:the_interaction]
+      cassette.new_recorded_interactions.should eq([:the_interaction])
     end
   end
 
@@ -38,12 +38,12 @@ describe VCR::Cassette do
 
     it "returns the provided options" do
       c = VCR::Cassette.new('example', :match_requests_on => [:uri])
-      c.match_requests_on.should == [:uri]
+      c.match_requests_on.should eq([:uri])
     end
 
     it "returns a the default #match_requests_on when it has not been specified for the cassette" do
       c = VCR::Cassette.new('example')
-      c.match_requests_on.should == [:uri, :method]
+      c.match_requests_on.should eq([:uri, :method])
     end
   end
 
@@ -65,7 +65,7 @@ describe VCR::Cassette do
 
     it 'does not raise an error in the case of an empty file' do
       VCR::Config.cassette_library_dir = "#{VCR::SPEC_ROOT}/fixtures/#{YAML_SERIALIZATION_VERSION}/cassette_spec"
-      VCR::Cassette.new('empty', :record => :none).recorded_interactions.should == []
+      VCR::Cassette.new('empty', :record => :none).recorded_interactions.should eq([])
     end
 
     it 'creates a stubs checkpoint on the http_stubbing_adapter' do
@@ -124,7 +124,7 @@ describe VCR::Cassette do
 
         it "defaults the record mode to #{record_mode} when VCR::Config.default_cassette_options[:record] is #{record_mode}" do
           cassette = VCR::Cassette.new(:test)
-          cassette.record_mode.should == record_mode
+          cassette.record_mode.should eq(record_mode)
         end
       end
 
@@ -186,7 +186,7 @@ describe VCR::Cassette do
               before(:each) { File.stub(:exist?).with(file_name).and_return(false) }
 
               it "has :#{record_mode} for the record mode" do
-                subject.record_mode.should == record_mode
+                subject.record_mode.should eq(record_mode)
               end
             end
 
@@ -200,7 +200,7 @@ describe VCR::Cassette do
                 before(:each) { File.stub(:stat).with(file_name).and_return(stub(:mtime => Time.now - 7.days + 60)) }
 
                 it "has :#{record_mode} for the record mode" do
-                  subject.record_mode.should == record_mode
+                  subject.record_mode.should eq(record_mode)
                 end
               end
 
@@ -209,12 +209,12 @@ describe VCR::Cassette do
 
                 it "has :all for the record mode when there is an internet connection available" do
                   VCR::InternetConnection.stub(:available? => true)
-                  subject.record_mode.should == :all
+                  subject.record_mode.should eq(:all)
                 end
 
                 it "has :#{record_mode} for the record mode when there is no internet connection available" do
                   VCR::InternetConnection.stub(:available? => false)
-                  subject.record_mode.should == record_mode
+                  subject.record_mode.should eq(record_mode)
                 end
               end
             end
@@ -233,7 +233,7 @@ describe VCR::Cassette do
 
           VCR::Config.cassette_library_dir = "#{VCR::SPEC_ROOT}/fixtures/#{YAML_SERIALIZATION_VERSION}/cassette_spec"
           cassette = VCR::Cassette.new('with_localhost_requests', :record => record_mode)
-          cassette.recorded_interactions.map { |i| URI.parse(i.uri).host }.should == %w[example.com]
+          cassette.recorded_interactions.map { |i| URI.parse(i.uri).host }.should eq(%w[example.com])
         end
 
         it "loads the recorded interactions from the library yml file" do
@@ -244,16 +244,16 @@ describe VCR::Cassette do
 
           i1, i2, i3 = *cassette.recorded_interactions
 
-          i1.request.method.should == :get
-          i1.request.uri.should == 'http://example.com:80/'
+          i1.request.method.should eq(:get)
+          i1.request.uri.should eq('http://example.com:80/')
           i1.response.body.should =~ /You have reached this web page by typing.+example\.com/
 
-          i2.request.method.should == :get
-          i2.request.uri.should == 'http://example.com:80/foo'
+          i2.request.method.should eq(:get)
+          i2.request.uri.should eq('http://example.com:80/foo')
           i2.response.body.should =~ /foo was not found on this server/
 
-          i3.request.method.should == :get
-          i3.request.uri.should == 'http://example.com:80/'
+          i3.request.method.should eq(:get)
+          i3.request.uri.should eq('http://example.com:80/')
           i3.response.body.should =~ /Another example\.com response/
         end
 
@@ -283,19 +283,19 @@ describe VCR::Cassette do
           it "stubs the recorded requests with the http stubbing adapter" do
             VCR::Config.cassette_library_dir = "#{VCR::SPEC_ROOT}/fixtures/#{YAML_SERIALIZATION_VERSION}/cassette_spec"
             VCR.http_stubbing_adapter.should_receive(:stub_requests).with([an_instance_of(VCR::HTTPInteraction)]*3, anything)
-            cassette = VCR::Cassette.new('example', :record => record_mode)
+            VCR::Cassette.new('example', :record => record_mode)
           end
 
           it "passes the :match_request_on option to #stub_requests" do
             VCR::Config.cassette_library_dir = "#{VCR::SPEC_ROOT}/fixtures/#{YAML_SERIALIZATION_VERSION}/cassette_spec"
             VCR.http_stubbing_adapter.should_receive(:stub_requests).with(anything, [:body, :headers])
-            cassette = VCR::Cassette.new('example', :record => record_mode, :match_requests_on => [:body, :headers])
+            VCR::Cassette.new('example', :record => record_mode, :match_requests_on => [:body, :headers])
           end
         else
           it "does not stub the recorded requests with the http stubbing adapter" do
             VCR::Config.cassette_library_dir = "#{VCR::SPEC_ROOT}/fixtures/#{YAML_SERIALIZATION_VERSION}/cassette_spec"
             VCR.http_stubbing_adapter.should_not_receive(:stub_requests)
-            cassette = VCR::Cassette.new('example', :record => record_mode)
+            VCR::Cassette.new('example', :record => record_mode)
           end
         end
       end
@@ -324,7 +324,7 @@ describe VCR::Cassette do
 
       expect { cassette.eject }.to change { File.exist?(cassette.file) }.from(false).to(true)
       saved_recorded_interactions = VCR::YAML.load_file(cassette.file)
-      saved_recorded_interactions.should == recorded_interactions
+      saved_recorded_interactions.should eq(recorded_interactions)
     end
 
     it 'invokes the appropriately tagged before_record hooks' do
@@ -359,7 +359,7 @@ describe VCR::Cassette do
       cassette.eject
 
       saved_recorded_interactions = VCR::YAML.load_file(cassette.file)
-      saved_recorded_interactions.should == [interaction_2]
+      saved_recorded_interactions.should eq([interaction_2])
     end
 
     it 'does not write the cassette to disk if all interactions have been ignored' do
@@ -380,7 +380,7 @@ describe VCR::Cassette do
 
       expect { cassette.eject }.to change { File.exist?(cassette.file) }.from(false).to(true)
       saved_recorded_interactions = VCR::YAML.load_file(cassette.file)
-      saved_recorded_interactions.should == recorded_interactions
+      saved_recorded_interactions.should eq(recorded_interactions)
     end
 
     [:all, :none, :new_episodes].each do |record_mode|
@@ -440,12 +440,12 @@ describe VCR::Cassette do
             it 'removes the old interactions that match new requests, and saves the new interactions follow the old ones' do
               subject.eject
 
-              saved_recorded_interactions.should == [
+              saved_recorded_interactions.should eq([
                 old_interaction_2,
                 new_interaction_1,
                 new_interaction_2,
                 new_interaction_3
-              ]
+              ])
             end
 
             it "matches old requests to new ones using the cassette's match attributes" do
@@ -464,14 +464,14 @@ describe VCR::Cassette do
             it 'saves the old interactions followed by the new ones to disk' do
               subject.eject
 
-              saved_recorded_interactions.should == [
+              saved_recorded_interactions.should eq([
                 old_interaction_1,
                 old_interaction_2,
                 old_interaction_3,
                 new_interaction_1,
                 new_interaction_2,
                 new_interaction_3
-              ]
+              ])
             end
           end
         end

data/spec/vcr/config_spec.rb

@@ -22,10 +22,10 @@ describe VCR::Config do
   describe '.default_cassette_options' do
     it 'has a hash with some defaults even if it is set to nil' do
       VCR::Config.default_cassette_options = nil
-      VCR::Config.default_cassette_options.should == {
+      VCR::Config.default_cassette_options.should eq({
         :match_requests_on => VCR::RequestMatcher::DEFAULT_MATCH_ATTRIBUTES,
         :record            => :once
-      }
+      })
     end
 
     it "returns #{VCR::RequestMatcher::DEFAULT_MATCH_ATTRIBUTES.inspect} for :match_requests_on when other defaults have been set" do
@@ -42,14 +42,14 @@ describe VCR::Config do
   describe '.stub_with' do
     it 'stores the given symbols in http_stubbing_libraries' do
       VCR::Config.stub_with :fakeweb, :typhoeus
-      VCR::Config.http_stubbing_libraries.should == [:fakeweb, :typhoeus]
+      VCR::Config.http_stubbing_libraries.should eq([:fakeweb, :typhoeus])
     end
   end
 
   describe '.http_stubbing_libraries' do
     it 'returns an empty array even when the variable is nil' do
       VCR::Config.send(:remove_instance_variable, :@http_stubbing_libraries)
-      VCR::Config.http_stubbing_libraries.should == []
+      VCR::Config.http_stubbing_libraries.should eq([])
     end
   end
 
@@ -63,20 +63,20 @@ describe VCR::Config do
 
     it 'adds the given hosts to the ignored_hosts list' do
       VCR::Config.ignore_hosts 'example.com', 'example.net'
-      VCR::Config.ignored_hosts.should == %w[ example.com example.net ]
+      VCR::Config.ignored_hosts.should eq(%w[ example.com example.net ])
       VCR::Config.ignore_host 'example.org'
-      VCR::Config.ignored_hosts.should == %w[ example.com example.net example.org ]
+      VCR::Config.ignored_hosts.should eq(%w[ example.com example.net example.org ])
     end
 
     it 'removes duplicate hosts' do
       VCR::Config.ignore_host 'example.com'
       VCR::Config.ignore_host 'example.com'
-      VCR::Config.ignored_hosts.should == ['example.com']
+      VCR::Config.ignored_hosts.should eq(['example.com'])
     end
 
     it "updates the http_stubbing_adapter's ignored_hosts list" do
       VCR::Config.ignore_hosts 'example.com', 'example.org'
-      stubbing_adapter.send(:ignored_hosts).should == %w[ example.com example.org ]
+      stubbing_adapter.send(:ignored_hosts).should eq(%w[ example.com example.org ])
     end
   end
 
@@ -88,13 +88,13 @@ describe VCR::Config do
     it 'adds the localhost aliases to the ignored_hosts list when set to true' do
       VCR::Config.ignore_host 'example.com'
       VCR::Config.ignore_localhost = true
-      VCR::Config.ignored_hosts.should == ['example.com', *VCR::LOCALHOST_ALIASES]
+      VCR::Config.ignored_hosts.should eq(['example.com', *VCR::LOCALHOST_ALIASES])
     end
 
     it 'removes the localhost aliases from the ignored_hosts list when set to false' do
       VCR::Config.ignore_host 'example.com', *VCR::LOCALHOST_ALIASES
       VCR::Config.ignore_localhost = false
-      VCR::Config.ignored_hosts.should == ['example.com']
+      VCR::Config.ignored_hosts.should eq(['example.com'])
     end
   end
 
@@ -102,7 +102,7 @@ describe VCR::Config do
     [true, false].each do |val|
       it "sets the allow_http_connections_when_no_cassette to #{val} when set to #{val}" do
         VCR::Config.allow_http_connections_when_no_cassette = val
-        VCR::Config.allow_http_connections_when_no_cassette?.should == val
+        VCR::Config.allow_http_connections_when_no_cassette?.should eq(val)
       end
     end
 

data/spec/vcr/deprecations/cassette_spec.rb

@@ -23,14 +23,14 @@ describe VCR::Cassette, 'deprecations', :disable_warnings => true do
     context "when the ignored_hosts list is set to #{orig_ignored_hosts.inspect} and the :allow_real_http option is set to :localhost" do
       before(:each) do
         VCR::Config.ignored_hosts.clear
-        VCR::Config.ignore_hosts *orig_ignored_hosts
+        VCR::Config.ignore_hosts(*orig_ignored_hosts)
       end
 
       subject { VCR::Cassette.new('cassette name', :allow_real_http => :localhost) }
 
       it "sets the ignored_hosts list to the list of localhost aliases" do
         subject
-        VCR::Config.ignored_hosts.should == VCR::LOCALHOST_ALIASES
+        VCR::Config.ignored_hosts.should eq(VCR::LOCALHOST_ALIASES)
       end
 
       it "prints a warning: VCR's :allow_real_http cassette option is deprecated.  Instead, use the ignore_localhost configuration option." do
@@ -40,7 +40,7 @@ describe VCR::Cassette, 'deprecations', :disable_warnings => true do
 
       it "reverts ignore_hosts when the cassette is ejected" do
         subject.eject
-        VCR::Config.ignored_hosts.should == orig_ignored_hosts
+        VCR::Config.ignored_hosts.should eq(orig_ignored_hosts)
       end
 
       {
@@ -49,7 +49,7 @@ describe VCR::Cassette, 'deprecations', :disable_warnings => true do
         'http://example.com' => false
       }.each do |url, expected_value|
         it "returns #{expected_value} for #allow_real_http_requests_to? when it is given #{url}" do
-          subject.allow_real_http_requests_to?(URI.parse(url)).should == expected_value
+          subject.allow_real_http_requests_to?(URI.parse(url)).should eq(expected_value)
         end
       end
     end

data/spec/vcr/deprecations/config_spec.rb

@@ -5,7 +5,7 @@ describe VCR::Config, 'deprecations', :disable_warnings => true do
     before(:each) { described_class.stub_with :webmock, :typhoeus }
 
     it 'returns the first configured stubbing library' do
-      described_class.http_stubbing_library.should == :webmock
+      described_class.http_stubbing_library.should eq(:webmock)
     end
 
     it 'prints a warning: WARNING: VCR::Config.http_stubbing_library is deprecated.  Use VCR::Config.http_stubbing_libraries instead' do
@@ -17,7 +17,7 @@ describe VCR::Config, 'deprecations', :disable_warnings => true do
   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]
+      described_class.http_stubbing_libraries.should eq([:webmock])
     end
 
     it 'prints a warning: WARNING: VCR::Config.http_stubbing_library= is deprecated.  Use VCR::Config.stub_with instead' do

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

@@ -5,7 +5,7 @@ describe VCR::HttpStubbingAdapters::FakeWeb, 'deprecations', :disable_warnings =
     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
+      should be == %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

data/spec/vcr/extensions/net_http_response_spec.rb

@@ -12,7 +12,7 @@ describe VCR::Net::HTTPResponse do
 
     it 'allows the body to be read using #read_body with a block' do
       yielded_body = ''
-      ret_val = response { |r| r.read_body { |s| yielded_body << s.to_s } }
+      response { |r| r.read_body { |s| yielded_body << s.to_s } }
       yielded_body.should =~ expected_regex
     end
 
@@ -20,7 +20,7 @@ describe VCR::Net::HTTPResponse do
       dest = ''
       ret_val = response { |r| r.read_body(dest) }.body
       dest.to_s.should =~ expected_regex
-      ret_val.to_s.should == dest
+      ret_val.to_s.should eq(dest)
     end
 
     it 'raises an ArgumentError if both a destination string and a block is given to #read_body' do
@@ -45,7 +45,7 @@ describe VCR::Net::HTTPResponse do
       let(:http_verb_method) { :"request_#{http_verb}" }
 
       def response(&block)
-        if @response && block
+        if defined?(@response) && block
           block.call(@response)
           return @response
         end

data/spec/vcr/extensions/net_http_spec.rb

@@ -8,8 +8,8 @@ describe "Net::HTTP Extensions", :with_monkey_patches => :vcr do
 
   it 'checks if the request is stubbed using a VCR::Request' do
     VCR.http_stubbing_adapter.should_receive(:request_stubbed?) do |request, _|
-      request.uri.should == "http://localhost:#{VCR::SinatraApp.port}/"
-      request.method.should == :get
+      request.uri.should eq("http://localhost:#{VCR::SinatraApp.port}/")
+      request.method.should eq(:get)
       true
     end
     Net::HTTP.get(uri)
@@ -48,8 +48,8 @@ describe "Net::HTTP Extensions", :with_monkey_patches => :vcr do
 
     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|
-        interaction.request.headers['content-type'].should == ['foo/bar']
-        interaction.request.headers['host'].should == ['my-example.com']
+        interaction.request.headers['content-type'].should eq(['foo/bar'])
+        interaction.request.headers['host'].should eq(['my-example.com'])
       end
       Net::HTTP.new('localhost', VCR::SinatraApp.port).send_request('POST', '/', '', { 'Content-Type' => 'foo/bar', 'Host' => 'my-example.com' })
     end