vcr 2.9.3 → 3.0.0

data/features/hooks/before_record.feature

@@ -26,7 +26,7 @@ Feature: before_record hook
   Scenario: Modify recorded response
     Given a file named "before_record_example.rb" with:
       """ruby
-      start_sinatra_app(:port => 7777) do
+      $server = start_sinatra_app do
         get('/') { "Hello Earth" }
       end
 
@@ -42,7 +42,7 @@ Feature: before_record hook
       end
 
       VCR.use_cassette('recording_example') do
-        Net::HTTP.get_response('localhost', '/', 7777)
+        Net::HTTP.get_response('localhost', '/', $server.port)
       end
       """
     When I run `ruby before_record_example.rb`
@@ -52,7 +52,7 @@ Feature: before_record hook
   Scenario: Modify recorded response based on the cassette
     Given a file named "before_record_example.rb" with:
       """ruby
-      start_sinatra_app(:port => 7777) do
+      $server = start_sinatra_app do
         get('/') { "Hello Earth" }
       end
 
@@ -68,7 +68,7 @@ Feature: before_record hook
       end
 
       VCR.use_cassette('recording_example') do
-        Net::HTTP.get_response('localhost', '/', 7777)
+        Net::HTTP.get_response('localhost', '/', $server.port)
       end
       """
     When I run `ruby before_record_example.rb`
@@ -77,7 +77,7 @@ Feature: before_record hook
   Scenario: Prevent recording by ignoring interaction in before_record hook
     Given a file named "before_record_ignore.rb" with:
       """ruby
-      start_sinatra_app(:port => 7777) do
+      $server = start_sinatra_app do
         get('/') { "Hello World" }
       end
 
@@ -90,7 +90,7 @@ Feature: before_record hook
       end
 
       VCR.use_cassette('recording_example') do
-        response = Net::HTTP.get_response('localhost', '/', 7777)
+        response = Net::HTTP.get_response('localhost', '/', $server.port)
         puts "Response: #{response.body}"
       end
       """
@@ -101,7 +101,7 @@ Feature: before_record hook
   Scenario: Multiple hooks are run in order
     Given a file named "multiple_hooks.rb" with:
       """ruby
-      start_sinatra_app(:port => 7777) do
+      $server = start_sinatra_app do
         get('/') { "Hello World" }
       end
 
@@ -116,7 +116,7 @@ Feature: before_record hook
       end
 
       VCR.use_cassette('example', :record => :new_episodes) do
-        response = Net::HTTP.get_response('localhost', '/', 7777)
+        response = Net::HTTP.get_response('localhost', '/', $server.port)
         puts "Response: #{response.body}"
       end
       """
@@ -131,7 +131,7 @@ Feature: before_record hook
   Scenario: Use tagging to apply hook to only certain cassettes
     Given a file named "tagged_hooks.rb" with:
       """ruby
-      start_sinatra_app(:port => 7777) do
+      $server = start_sinatra_app do
         get('/') { "Hello World" }
       end
 
@@ -151,7 +151,7 @@ Feature: before_record hook
         puts "Using tag: #{tag.inspect}"
 
         VCR.use_cassette('example', :record => :new_episodes, :tag => tag) do
-          response = Net::HTTP.get_response('localhost', '/', 7777)
+          response = Net::HTTP.get_response('localhost', '/', $server.port)
           puts "Response: #{response.body}"
         end
       end

data/features/http_libraries/em_http_request.feature

@@ -10,7 +10,7 @@ Feature: EM HTTP Request
       """ruby
       require 'em-http-request'
 
-      start_sinatra_app(:port => 7777) do
+      $server = start_sinatra_app do
         %w[ foo bar bazz ].each_with_index do |path, index|
           get "/#{path}" do
             sleep index * 0.1 # ensure the async callbacks are invoked in order
@@ -24,6 +24,9 @@ Feature: EM HTTP Request
       VCR.configure do |c|
         c.hook_into :webmock
         c.cassette_library_dir = 'cassettes'
+        c.before_record do |i|
+          i.request.uri.sub!(/:\d+/, ':7777')
+        end
       end
       """
 
@@ -35,7 +38,7 @@ Feature: EM HTTP Request
       VCR.use_cassette('em_http') do
         EventMachine.run do
           http_array = %w[ foo bar bazz ].map do |p|
-            EventMachine::HttpRequest.new("http://localhost:7777/#{p}").get
+            EventMachine::HttpRequest.new("http://localhost:#{$server.port}/#{p}").get
           end
 
           http_array.each do |http|
@@ -145,7 +148,7 @@ Feature: EM HTTP Request
           multi = EventMachine::MultiRequest.new
 
           %w[ foo bar bazz ].each do |path|
-            multi.add(path, EventMachine::HttpRequest.new("http://localhost:7777/#{path}").get)
+            multi.add(path, EventMachine::HttpRequest.new("http://localhost:#{$server.port}/#{path}").get)
           end
 
           multi.callback do

data/features/http_libraries/net_http.feature

@@ -7,14 +7,24 @@ Feature: Net::HTTP
   Background:
     Given a file named "vcr_setup.rb" with:
       """ruby
+      require 'ostruct'
+
       if ARGV[0] == '--with-server'
-        start_sinatra_app(:port => 7777) do
+        $server = start_sinatra_app do
           get('/')  { 'VCR works with Net::HTTP gets!' }
           post('/') { 'VCR works with Net::HTTP posts!' }
         end
+      else
+        $server = OpenStruct(:port => 0)
       end
 
       require 'vcr'
+
+      VCR.configure do |c|
+        c.default_cassette_options = {
+          :match_requests_on => [:method, :host, :path]
+        }
+      end
       """
 
   Scenario Outline: Calling #post on new Net::HTTP instance
@@ -28,7 +38,7 @@ Feature: Net::HTTP
       end
 
       VCR.use_cassette('net_http') do
-        puts Net::HTTP.new('localhost', 7777).post('/', '').body
+        puts Net::HTTP.new('localhost', $server.port).post('/', '').body
       end
       """
     When I run `ruby vcr_net_http.rb --with-server`
@@ -54,7 +64,7 @@ Feature: Net::HTTP
       end
 
       def perform_request
-        Net::HTTP.new('localhost', 7777).request(Net::HTTP::Get.new('/', {})) do |response|
+        Net::HTTP.new('localhost', $server.port).request(Net::HTTP::Get.new('/', {})) do |response|
           return response
         end
       end
@@ -88,7 +98,7 @@ Feature: Net::HTTP
       VCR.use_cassette('net_http') do
         body = ''
 
-        Net::HTTP.new('localhost', 7777).request_get('/') do |response|
+        Net::HTTP.new('localhost', $server.port).request_get('/') do |response|
           response.read_body { |frag| body << frag }
         end
 
@@ -119,7 +129,7 @@ Feature: Net::HTTP
       end
 
       VCR.use_cassette('net_http') do
-        puts open('http://localhost:7777/').read
+        puts open("http://localhost:#{$server.port}/").read
       end
       """
     When I run `ruby vcr_net_http.rb --with-server`

data/features/middleware/faraday.feature

@@ -15,7 +15,7 @@ Feature: Faraday middleware
     Given a file named "faraday_example.rb" with:
       """ruby
       request_count = 0
-      start_sinatra_app(:port => 7777) do
+      $server = start_sinatra_app do
         get('/:path') { "Hello #{params[:path]} #{request_count += 1}" }
       end
 
@@ -28,7 +28,7 @@ Feature: Faraday middleware
         c.cassette_library_dir = 'cassettes'
       end
 
-      conn = Faraday::Connection.new(:url => 'http://localhost:7777') do |builder|
+      conn = Faraday::Connection.new(:url => "http://localhost:#{$server.port}") do |builder|
         builder.use VCR::Middleware::Faraday
         builder.adapter :<adapter>
       end

data/features/middleware/rack.feature

@@ -18,7 +18,7 @@ Feature: Rack
     Given a file named "remote_server.rb" with:
       """ruby
       request_count = 0
-      start_sinatra_app(:port => 7777) do
+      $server = start_sinatra_app do
         get('/:path') { "Hello #{params[:path]} #{request_count += 1}" }
       end
       """
@@ -28,7 +28,7 @@ Feature: Rack
       require 'proxy_server'
       require 'cgi'
 
-      url = URI.parse("http://localhost:8888?url=#{CGI.escape('http://localhost:7777/foo')}")
+      url = URI.parse("http://localhost:#{$proxy.port}?url=#{CGI.escape("http://localhost:#{$server.port}/foo")}")
 
       puts "Response 1: #{Net::HTTP.get_response(url).body}"
       puts "Response 2: #{Net::HTTP.get_response(url).body}"
@@ -40,7 +40,7 @@ Feature: Rack
       """ruby
       require 'vcr'
 
-      start_sinatra_app(:port => 8888) do
+      $proxy = start_sinatra_app do
         use VCR::Middleware::Rack do |cassette|
           cassette.name    'proxied'
           cassette.options :record => :new_episodes
@@ -68,7 +68,7 @@ Feature: Rack
       """ruby
       require 'vcr'
 
-      start_sinatra_app(:port => 8888) do
+      $proxy = start_sinatra_app do
         use VCR::Middleware::Rack do |cassette, env|
           cassette.name    env['SERVER_NAME']
         end

data/features/record_modes/all.feature

@@ -12,7 +12,7 @@ Feature: :all
   Background:
     Given a file named "setup.rb" with:
       """ruby
-      start_sinatra_app(:port => 7777) do
+      $server = start_sinatra_app do
         get('/')    { 'Hello' }
         get('/foo') { 'Goodbye' }
       end
@@ -30,7 +30,7 @@ Feature: :all
       http_interactions: 
       - request: 
           method: get
-          uri: http://localhost:7777/
+          uri: http://localhost/
           body: 
             encoding: UTF-8
             string: ""
@@ -55,8 +55,8 @@ Feature: :all
       """ruby
       require 'setup'
 
-      VCR.use_cassette('example', :record => :all) do
-        response = Net::HTTP.get_response('localhost', '/', 7777)
+      VCR.use_cassette('example', :record => :all, :match_requests_on => [:method, :host, :path]) do
+        response = Net::HTTP.get_response('localhost', '/', $server.port)
         puts "Response: #{response.body}"
       end
       """
@@ -71,7 +71,7 @@ Feature: :all
       require 'setup'
 
       VCR.use_cassette('example', :record => :all) do
-        response = Net::HTTP.get_response('localhost', '/foo', 7777)
+        response = Net::HTTP.get_response('localhost', '/foo', $server.port)
         puts "Response: #{response.body}"
       end
       """

data/features/record_modes/new_episodes.feature

@@ -12,7 +12,7 @@ Feature: :new_episodes
   Background:
     Given a file named "setup.rb" with:
       """ruby
-      start_sinatra_app(:port => 7777) do
+      $server = start_sinatra_app do
         get('/') { 'Hello' }
       end
 
@@ -68,7 +68,7 @@ Feature: :new_episodes
       require 'setup'
 
       VCR.use_cassette('example', :record => :new_episodes) do
-        response = Net::HTTP.get_response('localhost', '/', 7777)
+        response = Net::HTTP.get_response('localhost', '/', $server.port)
         puts "Response: #{response.body}"
       end
       """

data/features/record_modes/once.feature

@@ -15,7 +15,7 @@ Feature: :once
   Background:
     Given a file named "setup.rb" with:
       """ruby
-      start_sinatra_app(:port => 7777) do
+      $server = start_sinatra_app do
         get('/') { 'Hello' }
       end
 
@@ -72,7 +72,7 @@ Feature: :once
       require 'setup'
 
       VCR.use_cassette('example', :record => :once) do
-        response = Net::HTTP.get_response('localhost', '/', 7777)
+        response = Net::HTTP.get_response('localhost', '/', $server.port)
         puts "Response: #{response.body}"
       end
       """
@@ -85,7 +85,7 @@ Feature: :once
       require 'setup'
 
       VCR.use_cassette('example', :record => :once) do
-        response = Net::HTTP.get_response('localhost', '/', 7777)
+        response = Net::HTTP.get_response('localhost', '/', $server.port)
         puts "Response: #{response.body}"
       end
       """

data/features/step_definitions/cli_steps.rb

@@ -68,63 +68,60 @@ module VCRHelpers
     in_current_dir do
       file = File.read(file_name)
       regex = /#{Regexp.escape(orig_text)}/
-      file.should =~ regex
+      expect(file).to match(regex)
 
       file = file.gsub(regex, new_text)
       File.open(file_name, 'w') { |f| f.write(file) }
     end
   end
-
-  def redis
-    @redis ||= begin
-       require 'redis'
-       Redis.connect
-    end
-  end
 end
 World(VCRHelpers)
 
-Given /the following files do not exist:/ do |files|
+Given(/the following files do not exist:/) do |files|
   check_file_presence(files.raw.map{|file_row| file_row[0]}, false)
 end
 
-Given /^the directory "([^"]*)" does not exist$/ do |dir|
+Given(/^the directory "([^"]*)" does not exist$/) do |dir|
   check_directory_presence([dir], false)
 end
 
-Given /^a previously recorded cassette file "([^"]*)" with:$/ do |file_name, content|
+Given(/^a previously recorded cassette file "([^"]*)" with:$/) do |file_name, content|
   write_file(file_name, normalize_cassette_content(content))
 end
 
-Given /^it is (.*)$/ do |date_string|
+Given(/^it is (.*)$/) do |date_string|
   set_env('DATE_STRING', date_string)
 end
 
-Given /^the redis DB has no data$/ do
-  redis.flushdb
+Given(/^that port numbers in "([^"]*)" are normalized to "([^"]*)"$/) do |file_name, port|
+  in_current_dir do
+    contents = File.read(file_name)
+    contents = contents.gsub(/:\d{2,}\//, ":#{port}/")
+    File.open(file_name, 'w') { |f| f.write(contents) }
+  end
 end
 
-When /^I modify the file "([^"]*)" to replace "([^"]*)" with "([^"]*)"$/ do |file_name, orig_text, new_text|
+When(/^I modify the file "([^"]*)" to replace "([^"]*)" with "([^"]*)"$/) do |file_name, orig_text, new_text|
   modify_file(file_name, orig_text, new_text)
 end
 
-When /^I append to file "([^"]*)":$/ do |file_name, content|
+When(/^I append to file "([^"]*)":$/) do |file_name, content|
   append_to_file(file_name, "\n" + content)
 end
 
-When /^I set the "([^"]*)" environment variable to "([^"]*)"$/ do |var, value|
+When(/^I set the "([^"]*)" environment variable to "([^"]*)"$/) do |var, value|
   set_env(var, value)
 end
 
-Then /^the file "([^"]*)" should exist$/ do |file_name|
+Then(/^the file "([^"]*)" should exist$/) do |file_name|
   check_file_presence([file_name], true)
 end
 
-Then /^it should (pass|fail) with "([^"]*)"$/ do |pass_fail, partial_output|
+Then(/^it should (pass|fail) with "([^"]*)"$/) do |pass_fail, partial_output|
   assert_exit_status_and_partial_output(pass_fail == 'pass', partial_output)
 end
 
-Then /^it should (pass|fail) with an error like:$/ do |pass_fail, partial_output|
+Then(/^it should (pass|fail) with an error like:$/) do |pass_fail, partial_output|
   assert_success(pass_fail == 'pass')
 
   # different implementations place the exception class at different
@@ -138,38 +135,44 @@ Then /^it should (pass|fail) with an error like:$/ do |pass_fail, partial_output
   assert_partial_output(partial_output, process_output)
 end
 
-Then /^the output should contain each of the following:$/ do |table|
+Then(/^the output should contain each of the following:$/) do |table|
   table.raw.flatten.each do |string|
     assert_partial_output(string, all_output)
   end
 end
 
-Then /^the file "([^"]*)" should contain YAML like:$/ do |file_name, expected_content|
+Then(/^the file "([^"]*)" should contain YAML like:$/) do |file_name, expected_content|
   actual_content = in_current_dir { File.read(file_name) }
-  normalize_cassette_hash(YAML.load(actual_content)).should == normalize_cassette_hash(YAML.load(expected_content))
+  expect(normalize_cassette_hash(YAML.load(actual_content))).to eq(normalize_cassette_hash(YAML.load(expected_content)))
 end
 
-Then /^the file "([^"]*)" should contain JSON like:$/ do |file_name, expected_content|
+Then(/^the file "([^"]*)" should contain JSON like:$/) do |file_name, expected_content|
   actual_content = in_current_dir { File.read(file_name) }
   actual = MultiJson.decode(actual_content)
-  expected = MultiJson.decode(expected_content)
-  normalize_cassette_hash(actual).should == normalize_cassette_hash(expected)
+  expected = MultiJson.decode(expected_content.to_s)
+  expect(normalize_cassette_hash(actual)).to eq(normalize_cassette_hash(expected))
 end
 
-Then /^the file "([^"]*)" should contain ruby like:$/ do |file_name, expected_content|
+Then(/^the file "([^"]*)" should contain compressed YAML like:$/) do |file_name, expected_content|
+  actual_content = in_current_dir { File.read(file_name) }
+  unzipped_content = Zlib.inflate(actual_content)
+  expect(normalize_cassette_hash(YAML.load(unzipped_content))).to eq(normalize_cassette_hash(YAML.load(expected_content)))
+end
+
+Then(/^the file "([^"]*)" should contain ruby like:$/) do |file_name, expected_content|
   actual_content = in_current_dir { File.read(file_name) }
   actual = eval(actual_content)
   expected = eval(expected_content)
-  normalize_cassette_hash(actual).should == normalize_cassette_hash(expected)
+  expect(normalize_cassette_hash(actual)).to eq(normalize_cassette_hash(expected))
 end
 
-Then /^the file "([^"]*)" should contain each of these:$/ do |file_name, table|
+Then(/^the file "([^"]*)" should contain each of these:$/) do |file_name, table|
   table.raw.flatten.each do |string|
     check_file_content(file_name, string, true)
   end
 end
 
-Then /^the file "([^"]*)" should contain a YAML fragment like:$/ do |file_name, fragment|
+Then(/^the file "([^"]*)" should contain a YAML fragment like:$/) do |file_name, fragment|
   in_current_dir do
     file_content = File.read(file_name)
 
@@ -180,22 +183,17 @@ Then /^the file "([^"]*)" should contain a YAML fragment like:$/ do |file_name,
       line.strip.gsub('"', "'").gsub("'", '')
     end.join("\n")
 
-    file_content.should include(fragment.gsub("'", ''))
+    expect(file_content).to include(fragment.gsub("'", ''))
   end
 end
 
-Then /^the cassette "([^"]*)" should have the following response bodies:$/ do |file, table|
+Then(/^the cassette "([^"]*)" should have the following response bodies:$/) do |file, table|
   interactions = in_current_dir { YAML.load_file(file) }['http_interactions'].map { |h| VCR::HTTPInteraction.from_hash(h) }
   actual_response_bodies = interactions.map { |i| i.response.body }
   expected_response_bodies = table.raw.flatten
-  actual_response_bodies.should =~ expected_response_bodies
+  expect(actual_response_bodies).to match(expected_response_bodies)
 end
 
-Then /^the value stored at the redis key "([^"]*)" should include "([^"]*)"$/ do |key, value_fragment|
-  redis.get(key).should include(value_fragment)
-end
-
-Then /^it should (pass|fail)$/ do |pass_fail|
+Then(/^it should (pass|fail)$/) do |pass_fail|
   assert_success(pass_fail == 'pass')
 end
-