vcr 1.11.3 → 2.0.0.beta1

data/features/configuration/hooks.feature

@@ -7,7 +7,7 @@ Feature: Hooks
     - `before_playback`: Called before a cassette sets up its stubs for playback.
 
   To use these, call `config.before_record` or `config.before_playback` in
-  your `VCR.config` block.  Provide a block that accepts 0, 1 or 2 arguments.
+  your `VCR.configure` block.  Provide a block that accepts 0, 1 or 2 arguments.
 
   The first argument, if the block accepts it, will be an HTTP interaction.
   Changes you make to the interaction will be reflected in the recording or
@@ -22,7 +22,7 @@ Feature: Hooks
   You can also use tagging to apply hooks to particular cassettes.  Consider
   this code:
 
-      VCR.config do |c|
+      VCR.configure do |c|
         c.before_record(:twitter) { ... } # modify the interactions somehow
       end
 
@@ -60,17 +60,15 @@ Feature: Hooks
 
   Scenario: Replace sensitive data with before_record hook
     Given a file named "before_record_example.rb" with:
-      """
-      require 'vcr_cucumber_helpers'
-
+      """ruby
       start_sinatra_app(:port => 7777) do
         get('/') { "Hello <secret>" }
       end
 
       require 'vcr'
 
-      VCR.config do |c|
-        c.stub_with :fakeweb
+      VCR.configure do |c|
+        c.hook_into :fakeweb
         c.cassette_library_dir = 'cassettes'
 
         c.before_record do |i|
@@ -79,7 +77,7 @@ Feature: Hooks
 
       end
 
-      VCR.use_cassette('recording_example', :record => :new_episodes) do
+      VCR.use_cassette('recording_example') do
         Net::HTTP.get_response('localhost', '/', 7777)
       end
       """
@@ -89,22 +87,20 @@ Feature: Hooks
 
   Scenario: Prevent recording by ignoring interaction in before_record hook
     Given a file named "before_record_ignore.rb" with:
-      """
-      require 'vcr_cucumber_helpers'
-
+      """ruby
       start_sinatra_app(:port => 7777) do
         get('/') { "Hello World" }
       end
 
       require 'vcr'
 
-      VCR.config do |c|
-        c.stub_with :fakeweb
+      VCR.configure do |c|
+        c.hook_into :fakeweb
         c.cassette_library_dir = 'cassettes'
         c.before_record { |i| i.ignore! }
       end
 
-      VCR.use_cassette('recording_example', :record => :new_episodes) do
+      VCR.use_cassette('recording_example') do
         response = Net::HTTP.get_response('localhost', '/', 7777)
         puts "Response: #{response.body}"
       end
@@ -115,11 +111,11 @@ Feature: Hooks
 
   Scenario: Change playback with before_playback hook
     Given a file named "before_playback_example.rb" with:
-      """
+      """ruby
       require 'vcr'
 
-      VCR.config do |c|
-        c.stub_with                :fakeweb
+      VCR.configure do |c|
+        c.hook_into                :fakeweb
         c.cassette_library_dir     = 'cassettes'
 
         c.before_playback do |i|
@@ -127,7 +123,7 @@ Feature: Hooks
         end
       end
 
-      VCR.use_cassette('example', :record => :new_episodes) do
+      VCR.use_cassette('example') do
         response = Net::HTTP.get_response('example.com', '/foo')
         puts "Response: #{response.body}"
       end
@@ -158,17 +154,15 @@ Feature: Hooks
           http_version: "1.1"
       """
     And a file named "before_playback_ignore.rb" with:
-      """
-      require 'vcr_cucumber_helpers'
-
+      """ruby
       start_sinatra_app(:port => 7777) do
         get('/') { "sinatra response" }
       end
 
       require 'vcr'
 
-      VCR.config do |c|
-        c.stub_with                :fakeweb
+      VCR.configure do |c|
+        c.hook_into                :fakeweb
         c.cassette_library_dir     = 'cassettes'
         c.before_playback { |i| i.ignore! }
       end
@@ -183,17 +177,15 @@ Feature: Hooks
 
   Scenario: Multiple hooks are run in order
     Given a file named "multiple_hooks.rb" with:
-      """
-      require 'vcr_cucumber_helpers'
-
+      """ruby
       start_sinatra_app(:port => 7777) do
         get('/') { "Hello World" }
       end
 
       require 'vcr'
 
-      VCR.config do |c|
-        c.stub_with :fakeweb
+      VCR.configure do |c|
+        c.hook_into :fakeweb
         c.cassette_library_dir = 'cassettes'
 
         c.before_record { puts "In before_record hook 1" }
@@ -224,17 +216,15 @@ Feature: Hooks
 
   Scenario: Use tagging to apply hooks to only certain cassettes
     Given a file named "tagged_hooks.rb" with:
-      """
-      require 'vcr_cucumber_helpers'
-
+      """ruby
       start_sinatra_app(:port => 7777) do
         get('/') { "Hello World" }
       end
 
       require 'vcr'
 
-      VCR.config do |c|
-        c.stub_with :fakeweb
+      VCR.configure do |c|
+        c.hook_into :fakeweb
         c.cassette_library_dir = 'cassettes'
 
         c.before_record(:tag_1)   { |i| puts "In before_record hook for tag_1 (#{i.response.body})" }

data/features/configuration/ignore_hosts.feature

@@ -11,9 +11,7 @@ Feature: ignore_hosts
 
   Background:
     Given a file named "sinatra_app.rb" with:
-      """
-      require 'vcr_cucumber_helpers'
-
+      """ruby
       response_count = 0
       start_sinatra_app(:port => 7777) do
         get('/') { "Response #{response_count += 1}" }
@@ -22,20 +20,19 @@ Feature: ignore_hosts
 
   Scenario Outline: ignored host requests are not recorded and are always allowed
     Given a file named "ignore_hosts.rb" with:
-      """
-      require 'vcr_cucumber_helpers'
+      """ruby
       include_http_adapter_for("<http_lib>")
       require 'sinatra_app.rb'
 
       require 'vcr'
 
-      VCR.config do |c|
+      VCR.configure do |c|
         c.ignore_hosts '127.0.0.1', 'localhost'
         c.cassette_library_dir = 'cassettes'
-        c.stub_with <stub_with>
+        <configuration>
       end
 
-      VCR.use_cassette('example', :record => :new_episodes) do
+      VCR.use_cassette('example') do
         puts response_body_for(:get, "http://localhost:7777/")
       end
 
@@ -50,13 +47,15 @@ Feature: ignore_hosts
     And the file "cassettes/example.yml" should not exist
 
     Examples:
-      | stub_with  | http_lib        |
-      | :fakeweb   | net/http        |
-      | :webmock   | net/http        |
-      | :webmock   | httpclient      |
-      | :webmock   | patron          |
-      | :webmock   | curb            |
-      | :webmock   | em-http-request |
-      | :typhoeus  | typhoeus        |
-      | :excon     | excon           |
+      | configuration         | http_lib              |
+      | c.hook_into :fakeweb  | net/http              |
+      | c.hook_into :webmock  | net/http              |
+      | c.hook_into :webmock  | httpclient            |
+      | c.hook_into :webmock  | curb                  |
+      | c.hook_into :webmock  | patron                |
+      | c.hook_into :webmock  | em-http-request       |
+      | c.hook_into :webmock  | typhoeus              |
+      | c.hook_into :typhoeus | typhoeus              |
+      | c.hook_into :excon    | excon                 |
+      |                       | faraday (w/ net_http) |
 

data/features/configuration/ignore_localhost.feature

@@ -11,75 +11,64 @@ Feature: ignore_localhost
 
   Background:
     Given a file named "sinatra_app.rb" with:
-      """
-      require 'vcr_cucumber_helpers'
-
+      """ruby
       response_count = 0
       start_sinatra_app(:port => 7777) do
         get('/') { "Response #{response_count += 1}" }
       end
       """
 
-  Scenario Outline: localhost requests are not treated differently by default and when the setting is false
+  Scenario Outline: localhost requests are not treated differently by default
     Given a file named "localhost_not_ignored.rb" with:
-      """
-      require 'vcr_cucumber_helpers'
+      """ruby
       include_http_adapter_for("<http_lib>")
       require 'sinatra_app.rb'
 
       require 'vcr'
 
-      VCR.config do |c|
-        <additional_config>
+      VCR.configure do |c|
         c.cassette_library_dir = 'cassettes'
-        c.stub_with <stub_with>
+        <configuration>
       end
 
-      VCR.use_cassette('localhost', :record => :new_episodes) do
+      VCR.use_cassette('localhost') do
         response_body_for(:get, "http://localhost:7777/")
       end
 
       response_body_for(:get, "http://localhost:7777/")
       """
     When I run `ruby localhost_not_ignored.rb`
-    Then it should fail with "<error>"
+    Then it should fail with "Real HTTP connections are disabled"
      And the file "cassettes/localhost.yml" should contain "body: Response 1"
 
     Examples:
-      | stub_with  | http_lib        | error                              | additional_config          |
-      | :fakeweb   | net/http        | Real HTTP connections are disabled |                            |
-      | :fakeweb   | net/http        | Real HTTP connections are disabled | c.ignore_localhost = false |
-      | :webmock   | net/http        | Real HTTP connections are disabled |                            |
-      | :webmock   | net/http        | Real HTTP connections are disabled | c.ignore_localhost = false |
-      | :webmock   | httpclient      | Real HTTP connections are disabled |                            |
-      | :webmock   | httpclient      | Real HTTP connections are disabled | c.ignore_localhost = false |
-      | :webmock   | curb            | Real HTTP connections are disabled |                            |
-      | :webmock   | curb            | Real HTTP connections are disabled | c.ignore_localhost = false |
-      | :webmock   | patron          | Real HTTP connections are disabled |                            |
-      | :webmock   | patron          | Real HTTP connections are disabled | c.ignore_localhost = false |
-      | :webmock   | em-http-request | Real HTTP connections are disabled |                            |
-      | :webmock   | em-http-request | Real HTTP connections are disabled | c.ignore_localhost = false |
-      | :typhoeus  | typhoeus        | Real HTTP requests are not allowed |                            |
-      | :typhoeus  | typhoeus        | Real HTTP requests are not allowed | c.ignore_localhost = false |
-      | :excon     | excon           | Real HTTP connections are disabled |                            |
-      | :excon     | excon           | Real HTTP connections are disabled | c.ignore_localhost = false |
+      | configuration         | http_lib              |
+      | c.hook_into :fakeweb  | net/http              |
+      | c.hook_into :webmock  | net/http              |
+      | c.hook_into :webmock  | httpclient            |
+      | c.hook_into :webmock  | curb                  |
+      | c.hook_into :webmock  | patron                |
+      | c.hook_into :webmock  | em-http-request       |
+      | c.hook_into :webmock  | typhoeus              |
+      | c.hook_into :typhoeus | typhoeus              |
+      | c.hook_into :excon    | excon                 |
+      |                       | faraday (w/ net_http) |
 
   Scenario Outline: localhost requests are allowed and not recorded when ignore_localhost = true
     Given a file named "ignore_localhost_true.rb" with:
-      """
-      require 'vcr_cucumber_helpers'
+      """ruby
       include_http_adapter_for("<http_lib>")
       require 'sinatra_app.rb'
 
       require 'vcr'
 
-      VCR.config do |c|
+      VCR.configure do |c|
         c.ignore_localhost = true
         c.cassette_library_dir = 'cassettes'
-        c.stub_with <stub_with>
+        <configuration>
       end
 
-      VCR.use_cassette('localhost', :record => :new_episodes) do
+      VCR.use_cassette('localhost') do
         puts response_body_for(:get, "http://localhost:7777/")
       end
 
@@ -94,13 +83,15 @@ Feature: ignore_localhost
     And the file "cassettes/localhost.yml" should not exist
 
     Examples:
-      | stub_with  | http_lib        |
-      | :fakeweb   | net/http        |
-      | :webmock   | net/http        |
-      | :webmock   | httpclient      |
-      | :webmock   | patron          |
-      | :webmock   | curb            |
-      | :webmock   | em-http-request |
-      | :typhoeus  | typhoeus        |
-      | :excon     | excon           |
+      | configuration         | http_lib              |
+      | c.hook_into :fakeweb  | net/http              |
+      | c.hook_into :webmock  | net/http              |
+      | c.hook_into :webmock  | httpclient            |
+      | c.hook_into :webmock  | curb                  |
+      | c.hook_into :webmock  | patron                |
+      | c.hook_into :webmock  | em-http-request       |
+      | c.hook_into :webmock  | typhoeus              |
+      | c.hook_into :typhoeus | typhoeus              |
+      | c.hook_into :excon    | excon                 |
+      |                       | faraday (w/ net_http) |
 

data/features/http_libraries/em_http_request.feature

@@ -7,9 +7,8 @@ Feature: EM HTTP Request
 
   Background:
     Given a file named "vcr_setup.rb" with:
-      """
+      """ruby
       require 'em-http-request'
-      require 'vcr_cucumber_helpers'
 
       start_sinatra_app(:port => 7777) do
         %w[ foo bar bazz ].each_with_index do |path, index|
@@ -22,18 +21,18 @@ Feature: EM HTTP Request
 
       require 'vcr'
 
-      VCR.config do |c|
-        c.stub_with :webmock
+      VCR.configure do |c|
+        c.hook_into :webmock
         c.cassette_library_dir = 'cassettes'
       end
       """
 
   Scenario: multiple simultaneous HttpRequest objects
     Given a file named "make_requests.rb" with:
-      """
+      """ruby
       require 'vcr_setup'
 
-      VCR.use_cassette('em_http', :record => :new_episodes) do
+      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
@@ -124,10 +123,10 @@ Feature: EM HTTP Request
 
   Scenario: MultiRequest
     Given a file named "make_requests.rb" with:
-      """
+      """ruby
       require 'vcr_setup'
 
-      VCR.use_cassette('em_http', :record => :new_episodes) do
+      VCR.use_cassette('em_http') do
         EventMachine.run do
           multi = EventMachine::MultiRequest.new
 

data/features/http_libraries/net_http.feature

@@ -6,9 +6,7 @@ Feature: Net::HTTP
 
   Background:
     Given a file named "vcr_setup.rb" with:
-      """
-      require 'vcr_cucumber_helpers'
-
+      """ruby
       if ARGV[0] == '--with-server'
         start_sinatra_app(:port => 7777) do
           get('/')  { 'VCR works with Net::HTTP gets!' }
@@ -21,15 +19,15 @@ Feature: Net::HTTP
 
   Scenario Outline: Calling #post on new Net::HTTP instance
     Given a file named "vcr_net_http.rb" with:
-      """
+      """ruby
       require 'vcr_setup.rb'
 
-      VCR.config do |c|
-        c.stub_with <stub_with>
+      VCR.configure do |c|
+        c.hook_into <hook_into>
         c.cassette_library_dir = 'cassettes'
       end
 
-      VCR.use_cassette('net_http', :record => :new_episodes) do
+      VCR.use_cassette('net_http') do
         puts Net::HTTP.new('localhost', 7777).post('/', '').body
       end
       """
@@ -41,17 +39,17 @@ Feature: Net::HTTP
     Then the output should contain "VCR works with Net::HTTP posts!"
 
     Examples:
-      | stub_with |
+      | hook_into |
       | :fakeweb  |
       | :webmock  |
 
   Scenario Outline: Return from yielded block
     Given a file named "vcr_net_http.rb" with:
-      """
+      """ruby
       require 'vcr_setup.rb'
 
-      VCR.config do |c|
-        c.stub_with <stub_with>
+      VCR.configure do |c|
+        c.hook_into <hook_into>
         c.cassette_library_dir = 'cassettes'
       end
 
@@ -61,7 +59,7 @@ Feature: Net::HTTP
         end
       end
 
-      VCR.use_cassette('net_http', :record => :new_episodes) do
+      VCR.use_cassette('net_http') do
         puts perform_request.body
       end
       """
@@ -73,21 +71,21 @@ Feature: Net::HTTP
     Then the output should contain "VCR works with Net::HTTP gets!"
 
     Examples:
-      | stub_with |
+      | hook_into |
       | :fakeweb  |
       | :webmock  |
 
   Scenario Outline: Use Net::ReadAdapter to read body in fragments
     Given a file named "vcr_net_http.rb" with:
-      """
+      """ruby
       require 'vcr_setup.rb'
 
-      VCR.config do |c|
-        c.stub_with <stub_with>
+      VCR.configure do |c|
+        c.hook_into <hook_into>
         c.cassette_library_dir = 'cassettes'
       end
 
-      VCR.use_cassette('net_http', :record => :new_episodes) do
+      VCR.use_cassette('net_http') do
         body = ''
 
         Net::HTTP.new('localhost', 7777).request_get('/') do |response|
@@ -105,22 +103,22 @@ Feature: Net::HTTP
     Then the output should contain "VCR works with Net::HTTP gets!"
 
     Examples:
-      | stub_with |
+      | hook_into |
       | :fakeweb  |
       | :webmock  |
 
   Scenario Outline: Use open-uri (which is built on top of Net::HTTP and uses a seldom-used Net::HTTP API)
     Given a file named "vcr_net_http.rb" with:
-      """
+      """ruby
       require 'open-uri'
       require 'vcr_setup.rb'
 
-      VCR.config do |c|
-        c.stub_with <stub_with>
+      VCR.configure do |c|
+        c.hook_into <hook_into>
         c.cassette_library_dir = 'cassettes'
       end
 
-      VCR.use_cassette('net_http', :record => :new_episodes) do
+      VCR.use_cassette('net_http') do
         puts open('http://localhost:7777/').read
       end
       """
@@ -132,23 +130,23 @@ Feature: Net::HTTP
     Then the output should contain "VCR works with Net::HTTP gets!"
 
     Examples:
-      | stub_with |
+      | hook_into |
       | :fakeweb  |
       | :webmock  |
 
     Scenario Outline: Make an HTTPS request
       Given a file named "vcr_https.rb" with:
-        """
+        """ruby
         require 'vcr'
 
-        VCR.config do |c|
-          c.stub_with <stub_with>
+        VCR.configure do |c|
+          c.hook_into <hook_into>
           c.cassette_library_dir = 'cassettes'
         end
 
         uri = URI("https://raw.github.com/gist/fb555cb593f3349d53af/6921dd638337d3f6a51b0e02e7f30e3c414f70d6/vcr_gist")
 
-        VCR.use_cassette('https', :record => :new_episodes) do
+        VCR.use_cassette('https') do
           http = Net::HTTP.new(uri.host, uri.port)
           http.use_ssl = true
           http.verify_mode = OpenSSL::SSL::VERIFY_NONE
@@ -166,6 +164,6 @@ Feature: Net::HTTP
       Then the output should contain "HTTPS replaying works"
 
       Examples:
-        | stub_with |
+        | hook_into |
         | :fakeweb  |
         | :webmock  |