vcr 2.9.3 → 3.0.0

data/features/configuration/cassette_library_dir.feature

@@ -11,7 +11,7 @@ Feature: cassette_library_dir
   Scenario: cassette_library_dir
     Given a file named "cassette_library_dir.rb" with:
       """ruby
-      start_sinatra_app(:port => 7777) do
+      $server = start_sinatra_app do
         get('/') { "Hello" }
       end
 
@@ -23,7 +23,7 @@ Feature: cassette_library_dir
       end
 
       VCR.use_cassette('localhost') do
-        Net::HTTP.get_response('localhost', '/', 7777)
+        Net::HTTP.get_response('localhost', '/', $server.port)
       end
       """
      And the directory "vcr/cassettes" does not exist

data/features/configuration/debug_logging.feature

@@ -10,7 +10,7 @@ Feature: Debug Logging
     Given a file named "debug_logger.rb" with:
       """ruby
       if ARGV.include?('--with-server')
-        start_sinatra_app(:port => 7777) do
+        $server = start_sinatra_app do
           get('/') { "Hello World" }
         end
       end
@@ -21,31 +21,38 @@ Feature: Debug Logging
         c.hook_into :webmock
         c.cassette_library_dir = 'cassettes'
         c.debug_logger = File.open(ARGV.first, 'w')
+        c.default_cassette_options = {
+          :match_requests_on => [:method, :host, :path]
+        }
       end
 
       VCR.use_cassette('example') do
-        Net::HTTP.get_response(URI("http://localhost:7777/"))
+        port = $server ? $server.port : 7777
+        Net::HTTP.get_response(URI("http://localhost:#{port}/"))
       end
       """
     When I run `ruby debug_logger.rb record.log --with-server`
+    Given that port numbers in "record.log" are normalized to "7777"
     Then the file "record.log" should contain exactly:
       """
-      [Cassette: 'example'] Initialized with options: {:record=>:once, :match_requests_on=>[:method, :uri], :allow_unused_http_interactions=>true, :serialize_with=>:yaml, :persist_with=>:file_system}
+      [Cassette: 'example'] Initialized with options: {:record=>:once, :match_requests_on=>[:method, :host, :path], :allow_unused_http_interactions=>true, :serialize_with=>:yaml, :persist_with=>:file_system}
       [webmock] Handling request: [get http://localhost:7777/] (disabled: false)
-        [Cassette: 'example'] Initialized HTTPInteractionList with request matchers [:method, :uri] and 0 interaction(s): {  }
+        [Cassette: 'example'] Initialized HTTPInteractionList with request matchers [:method, :host, :path] and 0 interaction(s): {  }
       [webmock] Identified request type (recordable) for [get http://localhost:7777/]
       [Cassette: 'example'] Recorded HTTP interaction [get http://localhost:7777/] => [200 "Hello World"]
 
       """
     When I run `ruby debug_logger.rb playback.log`
+    Given that port numbers in "playback.log" are normalized to "7777"
     Then the file "playback.log" should contain exactly:
       """
-      [Cassette: 'example'] Initialized with options: {:record=>:once, :match_requests_on=>[:method, :uri], :allow_unused_http_interactions=>true, :serialize_with=>:yaml, :persist_with=>:file_system}
+      [Cassette: 'example'] Initialized with options: {:record=>:once, :match_requests_on=>[:method, :host, :path], :allow_unused_http_interactions=>true, :serialize_with=>:yaml, :persist_with=>:file_system}
       [webmock] Handling request: [get http://localhost:7777/] (disabled: false)
-        [Cassette: 'example'] Initialized HTTPInteractionList with request matchers [:method, :uri] and 1 interaction(s): { [get http://localhost:7777/] => [200 "Hello World"] }
-        [Cassette: 'example'] Checking if [get http://localhost:7777/] matches [get http://localhost:7777/] using [:method, :uri]
+        [Cassette: 'example'] Initialized HTTPInteractionList with request matchers [:method, :host, :path] and 1 interaction(s): { [get http://localhost:7777/] => [200 "Hello World"] }
+        [Cassette: 'example'] Checking if [get http://localhost:7777/] matches [get http://localhost:7777/] using [:method, :host, :path]
           [Cassette: 'example'] method (matched): current request [get http://localhost:7777/] vs [get http://localhost:7777/]
-          [Cassette: 'example'] uri (matched): current request [get http://localhost:7777/] vs [get http://localhost:7777/]
+          [Cassette: 'example'] host (matched): current request [get http://localhost:7777/] vs [get http://localhost:7777/]
+          [Cassette: 'example'] path (matched): current request [get http://localhost:7777/] vs [get http://localhost:7777/]
         [Cassette: 'example'] Found matching interaction for [get http://localhost:7777/] at index 0: [200 "Hello World"]
       [webmock] Identified request type (stubbed_by_vcr) for [get http://localhost:7777/]
 

data/features/configuration/filter_sensitive_data.feature

@@ -30,7 +30,7 @@ Feature: Filter sensitive data
     Given a file named "filtering.rb" with:
       """ruby
       if ARGV.include?('--with-server')
-        start_sinatra_app(:port => 7777) do
+        $server = start_sinatra_app do
           get('/') { "Hello World" }
         end
       end
@@ -45,7 +45,7 @@ Feature: Filter sensitive data
       end
 
       VCR.use_cassette('filtering') do
-        response = Net::HTTP.get_response('localhost', '/', 7777)
+        response = Net::HTTP.get_response('localhost', '/', $server ? $server.port : 0)
         puts "Response: #{response.body}"
       end
       """
@@ -63,7 +63,7 @@ Feature: Filter sensitive data
       """ruby
       if ARGV.include?('--with-server')
         response_count = 0
-        start_sinatra_app(:port => 7777) do
+        $server = start_sinatra_app do
           get('/') { "Hello World #{response_count += 1 }" }
         end
       end
@@ -77,12 +77,12 @@ Feature: Filter sensitive data
       end
 
       VCR.use_cassette('tagged', :tag => :my_tag) do
-        response = Net::HTTP.get_response('localhost', '/', 7777)
+        response = Net::HTTP.get_response('localhost', '/', $server ? $server.port : 0)
         puts "Tagged Response: #{response.body}"
       end
 
       VCR.use_cassette('untagged', :record => :new_episodes) do
-        response = Net::HTTP.get_response('localhost', '/', 7777)
+        response = Net::HTTP.get_response('localhost', '/', $server ? $server.port : 0)
         puts "Untagged Response: #{response.body}"
       end
       """
@@ -104,7 +104,7 @@ Feature: Filter sensitive data
       include_http_adapter_for('net/http')
 
       if ARGV.include?('--with-server')
-        start_sinatra_app(:port => 7777) do
+        $server = start_sinatra_app do
           helpers do
             def request_header_for(header_key_fragment)
               key = env.keys.find { |k| k =~ /#{header_key_fragment}/i }
@@ -132,8 +132,9 @@ Feature: Filter sensitive data
       end
 
       VCR.use_cassette('example', :match_requests_on => [:method, :uri, :headers]) do
+        port = $server ? $server.port : 0
         puts "Response: " + response_body_for(
-          :get, 'http://localhost:7777/', nil,
+          :get, "http://localhost:#{port}/", nil,
           'X-Http-Username' => 'john.doe',
           'X-Http-Password' => USER_PASSWORDS['john.doe']
         )

data/features/configuration/hook_into.feature

@@ -41,11 +41,11 @@ Feature: hook_into
       require 'vcr'
       VCR.configure { |c| c.ignore_localhost = true }
 
-      start_sinatra_app(:port => 7777) do
+      $server = start_sinatra_app do
         get('/') { ARGV[0] }
       end
 
-      puts "The response for request 1 was: #{response_body_for(:get, "http://localhost:7777/")}"
+      puts "The response for request 1 was: #{response_body_for(:get, "http://localhost:#{$server.port}/")}"
 
       VCR.configure do |c|
         <configuration>
@@ -55,7 +55,7 @@ Feature: hook_into
       end
 
       VCR.use_cassette('example') do
-        puts "The response for request 2 was: #{response_body_for(:get, "http://localhost:7777/")}"
+        puts "The response for request 2 was: #{response_body_for(:get, "http://localhost:#{$server.port}/")}"
       end
       """
     When I run `ruby hook_into_http_lib_combo.rb 'Hello World'`
@@ -97,24 +97,24 @@ Feature: hook_into
 
       VCR.configure { |c| c.ignore_localhost = true }
 
-      start_sinatra_app(:port => 7777) do
+      $server = start_sinatra_app do
         get('/:path') { "#{ARGV[0]} #{params[:path]}" }
       end
 
       def net_http_response
-        Net::HTTP.get_response('localhost', '/net_http', 7777).body
+        Net::HTTP.get_response('localhost', '/net_http', $server.port).body
       end
 
       def typhoeus_response
-        Typhoeus::Request.get("http://localhost:7777/typhoeus").body
+        Typhoeus::Request.get("http://localhost:#{$server.port}/typhoeus").body
       end
 
       def excon_response
-        Excon.get("http://localhost:7777/excon").body
+        Excon.get("http://localhost:#{$server.port}/excon").body
       end
 
       def faraday_response
-        Faraday::Connection.new(:url => 'http://localhost:7777') do |builder|
+        Faraday::Connection.new(:url => "http://localhost:#{$server.port}") do |builder|
           builder.adapter :<faraday_adapter>
         end.get('/faraday').body
       end

data/features/configuration/ignore_request.feature

@@ -24,7 +24,7 @@ Feature: Ignore Request
     Given a file named "sinatra_app.rb" with:
       """ruby
       response_count = 0
-      start_sinatra_app(:port => 7777) do
+      $server = start_sinatra_app do
         get('/') { "Port 7777 Response #{response_count += 1}" }
       end
       """
@@ -37,7 +37,7 @@ Feature: Ignore Request
       require 'sinatra_app.rb'
 
       response_count = 0
-      start_sinatra_app(:port => 8888) do
+      $server_8888 = start_sinatra_app do
         get('/') { "Port 8888 Response #{response_count += 1}" }
       end
 
@@ -45,7 +45,7 @@ Feature: Ignore Request
 
       VCR.configure do |c|
         c.ignore_request do |request|
-          URI(request.uri).port == 7777
+          URI(request.uri).port == $server.port
         end
 
         c.default_cassette_options = { :serialize_with => :syck }
@@ -54,21 +54,20 @@ Feature: Ignore Request
       end
 
       VCR.use_cassette('example') do
-        puts response_body_for(:get, "http://localhost:8888/")
+        puts response_body_for(:get, "http://localhost:#{$server_8888.port}/")
       end
 
       VCR.use_cassette('example') do
-        puts response_body_for(:get, "http://localhost:7777/")
+        puts response_body_for(:get, "http://localhost:#{$server.port}/")
       end
 
-      puts response_body_for(:get, "http://localhost:7777/")
-      puts response_body_for(:get, "http://localhost:8888/")
+      puts response_body_for(:get, "http://localhost:#{$server.port}/")
+      puts response_body_for(:get, "http://localhost:#{$server_8888.port}/")
       """
     When I run `ruby ignore_request.rb`
     Then it should fail with an error like:
       """
       An HTTP request has been made that VCR does not know how to handle:
-        GET http://localhost:8888/
       """
      And the output should contain:
       """
@@ -101,10 +100,10 @@ Feature: Ignore Request
       end
 
       VCR.use_cassette('example') do
-        puts response_body_for(:get, "http://localhost:7777/")
+        puts response_body_for(:get, "http://localhost:#{$server.port}/")
       end
 
-      puts response_body_for(:get, "http://localhost:7777/")
+      puts response_body_for(:get, "http://localhost:#{$server.port}/")
       """
     When I run `ruby ignore_hosts.rb`
     Then it should pass with:
@@ -138,10 +137,10 @@ Feature: Ignore Request
       end
 
       VCR.use_cassette('localhost') do
-        response_body_for(:get, "http://localhost:7777/")
+        response_body_for(:get, "http://localhost:#{$server.port}/")
       end
 
-      response_body_for(:get, "http://localhost:7777/")
+      response_body_for(:get, "http://localhost:#{$server.port}/")
       """
     When I run `ruby localhost_not_ignored.rb`
     Then it should fail with "An HTTP request has been made that VCR does not know how to handle"
@@ -170,10 +169,10 @@ Feature: Ignore Request
       end
 
       VCR.use_cassette('localhost') do
-        puts response_body_for(:get, "http://localhost:7777/")
+        puts response_body_for(:get, "http://localhost:#{$server.port}/")
       end
 
-      puts response_body_for(:get, "http://localhost:7777/")
+      puts response_body_for(:get, "http://localhost:#{$server.port}/")
       """
     When I run `ruby ignore_localhost_true.rb`
     Then it should pass with:

data/features/configuration/preserve_exact_body_bytes.feature

@@ -24,7 +24,7 @@ Feature: Preserve Exact Body Bytes
       string = "abc \xFA"
       puts "Valid encoding: #{string.valid_encoding?}"
 
-      start_sinatra_app(:port => 7777) do
+      $server = start_sinatra_app do
         get('/') { string }
       end
 
@@ -43,7 +43,7 @@ Feature: Preserve Exact Body Bytes
         puts
         puts label
         VCR.use_cassette('example', :serialize_with => :json) do
-          body = Net::HTTP.get_response(URI("http://localhost:7777/")).body
+          body = Net::HTTP.get_response('localhost', '/', $server.port).body
           puts "Body: #{body.inspect}"
         end
       end
@@ -71,7 +71,7 @@ Feature: Preserve Exact Body Bytes
   Scenario: Preserve exact bytes for cassette with `:preserve_exact_body_bytes` option
     Given a file named "preserve.rb" with:
       """ruby
-      start_sinatra_app(:port => 7777) do
+      $server = start_sinatra_app do
         get('/') { "Hello World" }
       end
 
@@ -89,11 +89,11 @@ Feature: Preserve Exact Body Bytes
       end
 
       VCR.use_cassette('preserve_bytes', :preserve_exact_body_bytes => true) do
-        Net::HTTP.get_response(URI("http://localhost:7777/"))
+        Net::HTTP.get_response('localhost', '/', $server.port)
       end
 
       VCR.use_cassette('dont_preserve_bytes') do
-        Net::HTTP.get_response(URI("http://localhost:7777/"))
+        Net::HTTP.get_response('localhost', '/', $server.port)
       end
       """
     When I run `ruby preserve.rb`

data/features/configuration/uri_parser.feature

@@ -27,7 +27,7 @@ Feature: uri_parser
       http_interactions:
       - request:
           method: get
-          uri: http://bad_url.example.com/
+          uri: http://example.com/hello
           body:
             encoding: UTF-8
             string: ""
@@ -51,16 +51,25 @@ Feature: uri_parser
     Given a file named "uri_parser.rb" with:
       """ruby
       require 'vcr'
-      require 'addressable/uri'
+      require 'uri'
+
+      module MyURI
+        def self.parse(url)
+          uri = URI.parse(url)
+          uri.host = 'example.com'
+          uri.path = '/hello'
+          uri
+        end
+      end
 
       VCR.configure do |c|
-        c.uri_parser = Addressable::URI
+        c.uri_parser = MyURI
         c.hook_into :webmock
         c.cassette_library_dir = 'cassettes'
       end
 
       VCR.use_cassette('example') do
-        puts Net::HTTP.get_response('bad_url.example.com', '/').body
+        puts Net::HTTP.get_response('evil.org', '/projects').body
       end
       """
      When I run `ruby uri_parser.rb`
@@ -70,7 +79,6 @@ Feature: uri_parser
     Given a file named "uri_parser_default.rb" with:
       """ruby
       require 'vcr'
-      require 'addressable/uri'
 
       VCR.configure do |c|
         c.hook_into :webmock
@@ -78,12 +86,8 @@ Feature: uri_parser
       end
 
       VCR.use_cassette('example') do
-        puts Net::HTTP.get_response('bad_url.example.com', '/').body
+        puts Net::HTTP.get_response('example.com', '/hello').body
       end
       """
      When I run `ruby uri_parser_default.rb`
-     Then it should fail with an error like:
-     """
-     URI::InvalidURIError
-     """
-
+     Then it should pass with "Hello"

data/features/hooks/after_http_request.feature

@@ -22,7 +22,7 @@ Feature: after_http_request hook
       """ruby
       include_http_adapter_for("<http_lib>")
 
-      start_sinatra_app(:port => 7777) do
+      $server = start_sinatra_app do
         get('/foo') { "Hello World (foo)" }
         get('/bar') { "Hello World (bar)" }
       end
@@ -34,12 +34,13 @@ Feature: after_http_request hook
         c.cassette_library_dir = 'cassettes'
         c.ignore_localhost = true
         c.after_http_request(:ignored?, lambda { |req| req.uri =~ /foo/ }) do |request, response|
-          puts "Response for #{request.method} #{request.uri}: #{response.body}"
+          uri = request.uri.sub(/:\d+/, ":7777")
+          puts "Response for #{request.method} #{uri}: #{response.body}"
         end
       end
 
-      make_http_request(:get, "http://localhost:7777/foo")
-      make_http_request(:get, "http://localhost:7777/bar")
+      make_http_request(:get, "http://localhost:#{$server.port}/foo")
+      make_http_request(:get, "http://localhost:#{$server.port}/bar")
       """
     When I run `ruby after_http_request.rb`
     Then the output should contain "Response for get http://localhost:7777/foo: Hello World (foo)"

data/features/hooks/around_http_request.feature

@@ -19,7 +19,7 @@ Feature: around_http_request hook
       include_http_adapter_for("<http_lib>")
 
       request_count = 0
-      start_sinatra_app(:port => 7777) do
+      $server = start_sinatra_app do
         get('/') { "Response #{request_count += 1 }" }
       end
 
@@ -34,8 +34,8 @@ Feature: around_http_request hook
         end
       end
 
-      puts "Response for request 1: " + response_body_for(:get, "http://localhost:7777/")
-      puts "Response for request 2: " + response_body_for(:get, "http://localhost:7777/")
+      puts "Response for request 1: " + response_body_for(:get, "http://localhost:#{$server.port}/")
+      puts "Response for request 2: " + response_body_for(:get, "http://localhost:#{$server.port}/")
       """
     When I run `ruby globally_handle_requests.rb`
     Then it should pass with:

data/features/hooks/before_http_request.feature

@@ -23,7 +23,7 @@ Feature: before_http_request hook
       include_http_adapter_for("<http_lib>")
 
       if ARGV.include?('--with-server')
-        start_sinatra_app(:port => 7777) do
+        $server = start_sinatra_app do
           get('/') { "Hello World" }
         end
       end
@@ -41,10 +41,12 @@ Feature: before_http_request hook
       end
 
       VCR.use_cassette('hook_example') do
-        make_http_request(:get, "http://localhost:7777/")
+        port = $server ? $server.port : 0
+        make_http_request(:get, "http://localhost:#{port}/")
       end
       """
     When I run `ruby before_http_request.rb run1.log --with-server`
+    Given that port numbers in "run1.log" are normalized to "7777"
     Then the file "run1.log" should contain "before real request: get http://localhost:7777/"
     When I run `ruby before_http_request.rb run2.log`
     Then the file "run2.log" should not exist

data/features/hooks/before_playback.feature

@@ -10,8 +10,7 @@ Feature: before_playback hook
   You can also call `#ignore!` on the HTTP interaction to prevent VCR
   from playing it back.
 
-  If you don't your hook to apply to all cassettes, you can use tags for
-  this purpose.  Consider this code:
+  You can use tags to specify a cassette, otherwise your hook will apply to all cassettes.  Consider this code:
 
       VCR.configure do |c|
         c.before_playback(:twitter) { ... } # modify the interactions somehow
@@ -26,25 +25,25 @@ Feature: before_playback hook
   Background:
     Given a previously recorded cassette file "cassettes/example.yml" with:
       """
-      --- 
-      http_interactions: 
-      - request: 
+      ---
+      http_interactions:
+      - request:
           method: get
           uri: http://localhost:7777/
-          body: 
+          body:
             encoding: UTF-8
             string: ""
           headers: {}
-        response: 
-          status: 
+        response:
+          status:
             code: 200
             message: OK
-          headers: 
-            Content-Type: 
+          headers:
+            Content-Type:
             - text/html;charset=utf-8
-            Content-Length: 
+            Content-Length:
             - "20"
-          body: 
+          body:
             encoding: UTF-8
             string: previously recorded response
           http_version: "1.1"
@@ -99,7 +98,7 @@ Feature: before_playback hook
   Scenario: Prevent playback by ignoring interaction in before_playback hook
     Given a file named "before_playback_ignore.rb" with:
       """ruby
-      start_sinatra_app(:port => 7777) do
+      $server = start_sinatra_app do
         get('/') { "sinatra response" }
       end
 
@@ -111,8 +110,8 @@ Feature: before_playback hook
         c.before_playback { |i| i.ignore! }
       end
 
-      VCR.use_cassette('localhost', :record => :new_episodes) do
-        response = Net::HTTP.get_response('localhost', '/', 7777)
+      VCR.use_cassette('localhost', :record => :new_episodes, :match_requests_on => [:method, :host, :path]) do
+        response = Net::HTTP.get_response('localhost', '/', $server.port)
         puts "Response: #{response.body}"
       end
       """