vcr 1.11.1 → 1.11.2

data/features/configuration/ignore_hosts.feature

@@ -41,7 +41,7 @@ Feature: ignore_hosts
 
       puts response_body_for(:get, "http://localhost:7777/")
       """
-    When I run "ruby ignore_hosts.rb"
+    When I run `ruby ignore_hosts.rb`
     Then it should pass with:
       """
       Response 1

data/features/configuration/ignore_localhost.feature

@@ -41,7 +41,7 @@ Feature: ignore_localhost
 
       response_body_for(:get, "http://localhost:7777/")
       """
-    When I run "ruby localhost_not_ignored.rb"
+    When I run `ruby localhost_not_ignored.rb`
     Then it should fail with "<error>"
      And the file "cassettes/localhost.yml" should contain "body: Response 1"
 
@@ -85,7 +85,7 @@ Feature: ignore_localhost
 
       puts response_body_for(:get, "http://localhost:7777/")
       """
-    When I run "ruby ignore_localhost_true.rb"
+    When I run `ruby ignore_localhost_true.rb`
     Then it should pass with:
       """
       Response 1

data/features/configuration/stub_with.feature

@@ -64,13 +64,13 @@ Feature: stub_with
         puts "The response for request 2 was: #{response_body_for(:get, "http://localhost:7777/")}"
       end
       """
-    When I run "ruby stubbing_http_lib_combo.rb 'Hello World'"
+    When I run `ruby stubbing_http_lib_combo.rb 'Hello World'`
     Then the output should contain each of the following:
       | The response for request 1 was: Hello World |
       | The response for request 2 was: Hello World |
      And the file "vcr_cassettes/example.yml" should contain "body: Hello World"
 
-    When I run "ruby stubbing_http_lib_combo.rb 'Goodbye World'"
+    When I run `ruby stubbing_http_lib_combo.rb 'Goodbye World'`
     Then the output should contain each of the following:
       | The response for request 1 was: Goodbye World |
       | The response for request 2 was: Hello World   |
@@ -141,7 +141,7 @@ Feature: stub_with
 
       puts "Faraday: #{faraday_response}"
       """
-    When I run "ruby stub_with_multiple.rb 'Hello'"
+    When I run `ruby stub_with_multiple.rb 'Hello'`
     Then the output should contain each of the following:
       | Net::HTTP 1: Hello net_http |
       | Typhoeus 1: Hello typhoeus  |
@@ -156,7 +156,7 @@ Feature: stub_with
       | Hello excon    |
       | Hello faraday  |
 
-    When I run "ruby stub_with_multiple.rb 'Goodbye'"
+    When I run `ruby stub_with_multiple.rb 'Goodbye'`
     Then the output should contain each of the following:
       | Net::HTTP 1: Goodbye net_http |
       | Typhoeus 1: Goodbye typhoeus  |

data/features/http_libraries/em_http_request.feature

@@ -51,7 +51,7 @@ Feature: EM HTTP Request
         end
       end
       """
-    When I run "ruby make_requests.rb Hello"
+    When I run `ruby make_requests.rb Hello`
     Then the output should contain:
       """
       Hello foo
@@ -114,7 +114,7 @@ Feature: EM HTTP Request
           http_version: "1.1"
       """
 
-    When I run "ruby make_requests.rb Goodbye"
+    When I run `ruby make_requests.rb Goodbye`
     Then the output should contain:
       """
       Hello foo
@@ -144,7 +144,7 @@ Feature: EM HTTP Request
         end
       end
       """
-    When I run "ruby make_requests.rb Hello"
+    When I run `ruby make_requests.rb Hello`
     Then the output should contain:
       """
       Hello foo
@@ -207,7 +207,7 @@ Feature: EM HTTP Request
           http_version: "1.1"
       """
 
-    When I run "ruby make_requests.rb Goodbye"
+    When I run `ruby make_requests.rb Goodbye`
     Then the output should contain:
       """
       Hello foo

data/features/http_libraries/net_http.feature

@@ -33,11 +33,11 @@ Feature: Net::HTTP
         puts Net::HTTP.new('localhost', 7777).post('/', '').body
       end
       """
-    When I run "ruby vcr_net_http.rb --with-server"
+    When I run `ruby vcr_net_http.rb --with-server`
     Then the output should contain "VCR works with Net::HTTP posts!"
     And the file "cassettes/net_http.yml" should contain "body: VCR works with Net::HTTP posts!"
 
-    When I run "ruby vcr_net_http.rb"
+    When I run `ruby vcr_net_http.rb`
     Then the output should contain "VCR works with Net::HTTP posts!"
 
     Examples:
@@ -65,11 +65,11 @@ Feature: Net::HTTP
         puts perform_request.body
       end
       """
-    When I run "ruby vcr_net_http.rb --with-server"
+    When I run `ruby vcr_net_http.rb --with-server`
     Then the output should contain "VCR works with Net::HTTP gets!"
     And the file "cassettes/net_http.yml" should contain "body: VCR works with Net::HTTP gets!"
 
-    When I run "ruby vcr_net_http.rb"
+    When I run `ruby vcr_net_http.rb`
     Then the output should contain "VCR works with Net::HTTP gets!"
 
     Examples:
@@ -97,11 +97,11 @@ Feature: Net::HTTP
         puts body
       end
       """
-    When I run "ruby vcr_net_http.rb --with-server"
+    When I run `ruby vcr_net_http.rb --with-server`
     Then the output should contain "VCR works with Net::HTTP gets!"
     And the file "cassettes/net_http.yml" should contain "body: VCR works with Net::HTTP gets!"
 
-    When I run "ruby vcr_net_http.rb"
+    When I run `ruby vcr_net_http.rb`
     Then the output should contain "VCR works with Net::HTTP gets!"
 
     Examples:
@@ -124,11 +124,11 @@ Feature: Net::HTTP
         puts open('http://localhost:7777/').read
       end
       """
-    When I run "ruby vcr_net_http.rb --with-server"
+    When I run `ruby vcr_net_http.rb --with-server`
     Then the output should contain "VCR works with Net::HTTP gets!"
     And the file "cassettes/net_http.yml" should contain "body: VCR works with Net::HTTP gets!"
 
-    When I run "ruby vcr_net_http.rb"
+    When I run `ruby vcr_net_http.rb`
     Then the output should contain "VCR works with Net::HTTP gets!"
 
     Examples:
@@ -157,12 +157,12 @@ Feature: Net::HTTP
           puts response.body
         end
         """
-      When I run "ruby vcr_https.rb"
+      When I run `ruby vcr_https.rb`
       Then the output should contain "VCR gist"
       And the file "cassettes/https.yml" should contain "body: VCR gist"
 
       When I modify the file "cassettes/https.yml" to replace "body: VCR gist" with "body: HTTPS replaying works"
-      And I run "ruby vcr_https.rb"
+      And I run `ruby vcr_https.rb`
       Then the output should contain "HTTPS replaying works"
 
       Examples:

data/features/middleware/faraday.feature

@@ -45,7 +45,7 @@ Feature: Faraday middleware
       puts "Response 1: #{conn.get('/foo').body}"
       puts "Response 2: #{conn.get('/foo').body}"
       """
-    When I run "ruby faraday_example.rb"
+    When I run `ruby faraday_example.rb`
     Then the output should contain:
       """
       Response 1: Hello foo 1
@@ -77,7 +77,7 @@ Feature: Faraday middleware
       puts "Response 3: #{conn.get('/bar').body}"
       puts "Response 4: #{conn.get('/bar').body}"
       """
-    When I run "ruby faraday_example.rb"
+    When I run `ruby faraday_example.rb`
     Then the output should contain:
       """
       Response 1: Hello foo 1

data/features/middleware/rack.feature

@@ -57,7 +57,7 @@ Feature: Rack
         c.allow_http_connections_when_no_cassette = true
       end
       """
-    When I run "ruby client.rb"
+    When I run `ruby client.rb`
     Then the output should contain:
       """
       Response 1: Hello foo 1
@@ -85,7 +85,7 @@ Feature: Rack
         c.allow_http_connections_when_no_cassette = true
       end
       """
-    When I run "ruby client.rb"
+    When I run `ruby client.rb`
     Then the output should contain:
       """
       Response 1: Hello foo 1

data/features/record_modes/all.feature

@@ -58,7 +58,7 @@ Feature: :all
         puts "Response: #{response.body}"
       end
       """
-    When I run "ruby re_record.rb"
+    When I run `ruby re_record.rb`
     Then it should pass with "Response: Hello"
     And the file "cassettes/example.yml" should contain "body: Hello"
     But the file "cassettes/example.yml" should not contain "body: old response"
@@ -73,7 +73,7 @@ Feature: :all
         puts "Response: #{response.body}"
       end
       """
-    When I run "ruby record_new.rb"
+    When I run `ruby record_new.rb`
     Then it should pass with "Response: Goodbye"
     And the file "cassettes/example.yml" should contain each of these:
       | body: old response |

data/features/record_modes/new_episodes.feature

@@ -57,7 +57,7 @@ Feature: :new_episodes
         puts "Response: #{response.body}"
       end
       """
-    When I run "ruby replay_recorded_response.rb"
+    When I run `ruby replay_recorded_response.rb`
     Then it should pass with "Response: example.com response"
 
   Scenario: New requests get recorded
@@ -70,7 +70,7 @@ Feature: :new_episodes
         puts "Response: #{response.body}"
       end
       """
-    When I run "ruby record_new_requests.rb"
+    When I run `ruby record_new_requests.rb`
     Then it should pass with "Response: Hello"
     And the file "cassettes/example.yml" should contain each of these:
       | body: example.com response |

data/features/record_modes/none.feature

@@ -51,7 +51,7 @@ Feature: :none
         puts "Response: #{response.body}"
       end
       """
-    When I run "ruby replay_recorded_response.rb"
+    When I run `ruby replay_recorded_response.rb`
     Then it should pass with "Response: Hello"
 
   Scenario: New requests are prevented
@@ -63,5 +63,5 @@ Feature: :none
         Net::HTTP.get_response('example.com', '/bar')
       end
       """
-    When I run "ruby prevent_new_request.rb"
+    When I run `ruby prevent_new_request.rb`
     Then it should fail with "Real HTTP connections are disabled. Unregistered request: GET http://example.com/bar"

data/features/record_modes/once.feature

@@ -60,7 +60,7 @@ Feature: :once
         puts "Response: #{response.body}"
       end
       """
-    When I run "ruby replay_recorded_response.rb"
+    When I run `ruby replay_recorded_response.rb`
     Then it should pass with "Response: example.com response"
 
   Scenario: New requests result in an error when the cassette file exists
@@ -73,7 +73,7 @@ Feature: :once
         puts "Response: #{response.body}"
       end
       """
-    When I run "ruby error_for_new_requests_when_cassette_exists.rb"
+    When I run `ruby error_for_new_requests_when_cassette_exists.rb`
     Then it should fail with "Real HTTP connections are disabled"
 
   Scenario: New requests get recorded when there is no cassette file
@@ -87,6 +87,6 @@ Feature: :once
       end
       """
     When I remove the file "cassettes/example.yml"
-    And I run "ruby record_new_requests.rb"
+    And I run `ruby record_new_requests.rb`
     Then it should pass with "Response: Hello"
     And the file "cassettes/example.yml" should contain "body: Hello"

data/features/step_definitions/cli_steps.rb

@@ -69,7 +69,7 @@ Given /^the directory "([^"]*)" does not exist$/ do |dir|
 end
 
 Given /^a previously recorded cassette file "([^"]*)" with:$/ do |file_name, content|
-  create_file(file_name, normalize_cassette_yaml(content))
+  write_file(file_name, normalize_cassette_yaml(content))
 end
 
 Given /^(\d+) days have passed since the cassette was recorded$/ do |day_count|
@@ -80,6 +80,10 @@ When /^I modify the file "([^"]*)" to replace "([^"]*)" with "([^"]*)"$/ do |fil
   modify_file(file_name, orig_text, new_text)
 end
 
+When /^I set the "([^"]*)" environment variable to "([^"]*)"$/ do |var, value|
+  set_env(var, value)
+end
+
 Then /^the file "([^"]*)" should exist$/ do |file_name|
   check_file_presence([file_name], true)
 end
@@ -90,7 +94,7 @@ end
 
 Then /^the output should contain each of the following:$/ do |table|
   table.raw.flatten.each do |string|
-    assert_partial_output(string)
+    assert_partial_output(string, all_output)
   end
 end
 

data/features/support/env.rb

@@ -2,14 +2,7 @@ require 'rubygems'
 require 'bundler'
 Bundler.setup
 
-# Current version of aruba won't run on JRuby or Rubinius due to
-# dependency on background_process.  We have a work around to fix this.
-NEEDS_ARUBA_FIX = defined?(RUBY_ENGINE) && %w[ jruby rbx ].include?(RUBY_ENGINE)
-
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/aruba_workaround' if NEEDS_ARUBA_FIX
-
-require 'aruba'
-require 'aruba_patches' if NEEDS_ARUBA_FIX
+require 'aruba/cucumber'
 
 Before do
   this_dir = File.dirname(__FILE__)
@@ -28,3 +21,7 @@ elsif RUBY_PLATFORM == 'java'
   end
 end
 
+Before do
+  @aruba_timeout_seconds = RUBY_PLATFORM == 'java' ? 60 : 10
+end
+

data/features/support/http_lib_filters.rb

@@ -21,7 +21,12 @@ elsif defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
   UNSUPPORTED_HTTP_LIBS = %w[ patron em-http-request curb ]
 elsif RUBY_PLATFORM == 'java'
   # These gems have C extensions and can't install on JRuby.
-  UNSUPPORTED_HTTP_LIBS = %w[ typhoeus patron curb em-http-request ]
+  c_dependent_libs = %w[ typhoeus patron curb em-http-request ]
+
+  # The latest version of httpclient seems to freeze up the cukes
+  # on JRuby.  I'm not sure why, and there's little benefit to running
+  # them on JRuby...so we just skip them.  Excon seems to have the same issue :(.
+  UNSUPPORTED_HTTP_LIBS = c_dependent_libs + %w[ httpclient excon ]
 elsif RUBY_VERSION == '1.8.6' && ENV['TRAVIS']
   UNSUPPORTED_HTTP_LIBS = %w[ em-http-request ]
 end

data/features/test_frameworks/cucumber.feature

@@ -89,7 +89,7 @@ Feature: Usage with Cucumber
           When a request is made to "http://localhost:7777/disallowed_2"
       """
     And the directory "features/cassettes" does not exist
-    When I run "cucumber WITH_SERVER=true features/vcr_example.feature"
+    When I run `cucumber WITH_SERVER=true features/vcr_example.feature`
     Then it should fail with "3 scenarios (2 failed, 1 passed)"
     And the output should contain each of the following:
       | Real HTTP connections are disabled. Unregistered request: GET http://localhost:7777/disallowed_1 |
@@ -101,7 +101,7 @@ Feature: Usage with Cucumber
 
     # Run again without the server; we'll get the same responses because VCR
     # will replay the recorded responses.
-    When I run "cucumber features/vcr_example.feature"
+    When I run `cucumber features/vcr_example.feature`
     Then it should fail with "3 scenarios (2 failed, 1 passed)"
     And the output should contain each of the following:
       | Real HTTP connections are disabled. Unregistered request: GET http://localhost:7777/disallowed_1 |

data/features/test_frameworks/rspec.feature

@@ -77,7 +77,7 @@ Feature: Usage with RSpec
         c.extend VCR::RSpec::Macros
       end
       """
-    When I run "rspec spec/vcr_example_spec.rb"
+    When I run `rspec spec/vcr_example_spec.rb`
     Then the output should contain "2 examples, 0 failures"
      And the file "spec/cassettes/VCR-RSpec_integration/without_an_explicit_cassette_name.yml" should contain "body: Hello"
      And the file "spec/cassettes/net_http_example.yml" should contain "body: Hello"
@@ -103,7 +103,7 @@ Feature: Usage with RSpec
         c.extend VCR::RSpec::Macros
       end
       """
-    When I run "ruby -Ispec spec/vcr_example_spec.rb"
+    When I run `ruby -Ispec spec/vcr_example_spec.rb`
     Then the output should contain "2 examples, 0 failures"
      And the file "spec/cassettes/VCR-RSpec_integration/without_an_explicit_cassette_name.yml" should contain "body: Hello"
      And the file "spec/cassettes/net_http_example.yml" should contain "body: Hello"

data/features/test_frameworks/shoulda.feature

@@ -13,18 +13,19 @@ Feature: Usage with Shoulda
   errors occur.
 
   Scenario: Use `VCR.insert_cassette` and `VCR.eject_cassette`
-    Given a file named "test/test_helper.rb" with:
+    Given a file named "test/test_server.rb" with:
       """
-      require 'test/unit'
-      require 'shoulda'
       require 'vcr_cucumber_helpers'
 
-      if ARGV.include?('--with-server')
-        start_sinatra_app(:port => 7777) do
-          get('/') { "Hello" }
-        end
+      start_sinatra_app(:port => 7777) do
+        get('/') { "Hello" }
       end
-
+      """
+    Given a file named "test/test_helper.rb" with:
+      """
+      require 'test/test_server' if ENV['SERVER'] == 'true'
+      require 'test/unit'
+      require 'shoulda'
       require 'vcr'
 
       VCR.config do |c|
@@ -55,10 +56,12 @@ Feature: Usage with Shoulda
       end
       """
     And the directory "test/fixtures/vcr_cassettes" does not exist
-    When I run "ruby -Itest test/vcr_example_test.rb -- --with-server"
+    When I set the "SERVER" environment variable to "true"
+     And I run `ruby -Itest test/vcr_example_test.rb`
     Then it should pass with "1 tests, 1 assertions, 0 failures, 0 errors"
     And the file "test/fixtures/vcr_cassettes/shoulda_example.yml" should contain "body: Hello"
 
     # Run again without starting the sinatra server so the response will be replayed
-    When I run "ruby -Itest test/vcr_example_test.rb"
+    When I set the "SERVER" environment variable to "false"
+     And I run `ruby -Itest test/vcr_example_test.rb`
     Then it should pass with "1 tests, 1 assertions, 0 failures, 0 errors"

data/features/test_frameworks/test_unit.feature

@@ -4,17 +4,18 @@ Feature: Usage with Test::Unit
   `VCR.use_cassette`.
 
   Scenario: Use `VCR.use_cassette` in a test
-    Given a file named "test/test_helper.rb" with:
+    Given a file named "test/test_server.rb" with:
       """
-      require 'test/unit'
       require 'vcr_cucumber_helpers'
 
-      if ARGV.include?('--with-server')
-        start_sinatra_app(:port => 7777) do
-          get('/') { "Hello" }
-        end
+      start_sinatra_app(:port => 7777) do
+        get('/') { "Hello" }
       end
-
+      """
+    Given a file named "test/test_helper.rb" with:
+      """
+      require 'test/test_server' if ENV['SERVER'] == 'true'
+      require 'test/unit'
       require 'vcr'
 
       VCR.config do |c|
@@ -37,10 +38,12 @@ Feature: Usage with Test::Unit
       end
       """
     And the directory "test/fixtures/vcr_cassettes" does not exist
-    When I run "ruby -Itest test/vcr_example_test.rb -- --with-server"
+    When I set the "SERVER" environment variable to "true"
+     And I run `ruby -Itest test/vcr_example_test.rb`
     Then it should pass with "1 tests, 1 assertions, 0 failures, 0 errors"
     And the file "test/fixtures/vcr_cassettes/test_unit_example.yml" should contain "body: Hello"
 
     # Run again without starting the sinatra server so the response will be replayed
-    When I run "ruby -Itest test/vcr_example_test.rb"
+    When I set the "SERVER" environment variable to "false"
+     And I run `ruby -Itest test/vcr_example_test.rb`
     Then it should pass with "1 tests, 1 assertions, 0 failures, 0 errors"