features/request_matching/headers.feature in vcr-2.0.0.beta1 vs features/request_matching/headers.feature in vcr-2.0.0.beta2

@@ -1,50 +1,50 @@
 Feature: Matching on Headers
 
   Use the `:headers` request matcher to match requests on the request headers.
 
-  Background:
+  Scenario Outline: Replay interaction that matches the headers
     Given a previously recorded cassette file "cassettes/example.yml" with:
       """
-      --- 
-      - !ruby/struct:VCR::HTTPInteraction 
-        request: !ruby/struct:VCR::Request 
-          method: :post
-          uri: http://example.net:80/some/long/path
-          body: 
-          headers: 
-            x-user-id: 
-            - "1"
-        response: !ruby/struct:VCR::Response 
-          status: !ruby/struct:VCR::ResponseStatus 
+      ---
+      http_interactions:
+      - request:
+          method: post
+          uri: http://example.net/some/long/path
+          body: ''
+          headers:
+            X-User-Id:
+            - '1'
+        response:
+          status:
             code: 200
             message: OK
-          headers: 
-            content-length: 
-            - "15"
+          headers:
+            Content-Length:
+            - '15'
           body: user 1 response
-          http_version: "1.1"
-      - !ruby/struct:VCR::HTTPInteraction 
-        request: !ruby/struct:VCR::Request 
-          method: :post
-          uri: http://example.net:80/some/long/path
-          body: 
-          headers: 
-            x-user-id: 
-            - "2"
-        response: !ruby/struct:VCR::Response 
-          status: !ruby/struct:VCR::ResponseStatus 
+          http_version: '1.1'
+        recorded_at: Tue, 01 Nov 2011 04:58:44 GMT
+      - request:
+          method: post
+          uri: http://example.net/some/long/path
+          body: ''
+          headers:
+            X-User-Id:
+            - '2'
+        response:
+          status:
             code: 200
             message: OK
-          headers: 
-            content-length: 
-            - "15"
+          headers:
+            Content-Length:
+            - '15'
           body: user 2 response
-          http_version: "1.1"
+          http_version: '1.1'
+        recorded_at: Tue, 01 Nov 2011 04:58:44 GMT
+      recorded_with: VCR 2.0.0
       """
-
-  Scenario Outline: Replay interaction that matches the headers
     And a file named "header_matching.rb" with:
       """ruby
       include_http_adapter_for("<http_lib>")
 
       require 'vcr'
@@ -69,17 +69,13 @@
       Response for user 1: user 1 response
       """
 
     Examples:
       | 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) |
       |                       | faraday (w/ typhoeus) |