vcr 2.0.0.rc1 → 2.0.0.rc2

data/features/http_libraries/net_http.feature

@@ -33,7 +33,7 @@ Feature: Net::HTTP
       """
     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!"
+    And the file "cassettes/net_http.yml" should contain "VCR works with Net::HTTP posts!"
 
     When I run `ruby vcr_net_http.rb`
     Then the output should contain "VCR works with Net::HTTP posts!"
@@ -65,7 +65,7 @@ Feature: Net::HTTP
       """
     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!"
+    And the file "cassettes/net_http.yml" should contain "VCR works with Net::HTTP gets!"
 
     When I run `ruby vcr_net_http.rb`
     Then the output should contain "VCR works with Net::HTTP gets!"
@@ -97,7 +97,7 @@ Feature: Net::HTTP
       """
     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!"
+    And the file "cassettes/net_http.yml" should contain "VCR works with Net::HTTP gets!"
 
     When I run `ruby vcr_net_http.rb`
     Then the output should contain "VCR works with Net::HTTP gets!"
@@ -124,7 +124,7 @@ Feature: Net::HTTP
       """
     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!"
+    And the file "cassettes/net_http.yml" should contain "VCR works with Net::HTTP gets!"
 
     When I run `ruby vcr_net_http.rb`
     Then the output should contain "VCR works with Net::HTTP gets!"
@@ -157,9 +157,9 @@ Feature: Net::HTTP
         """
       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"
+      And the file "cassettes/https.yml" should contain "VCR gist"
 
-      When I modify the file "cassettes/https.yml" to replace "body: VCR gist" with "body: HTTPS replaying works"
+      When I modify the file "cassettes/https.yml" to replace "VCR gist" with "HTTPS replaying works"
       And I run `ruby vcr_https.rb`
       Then the output should contain "HTTPS replaying works"
 

data/features/middleware/faraday.feature

@@ -23,6 +23,7 @@ Feature: Faraday middleware
       require 'vcr'
 
       VCR.configure do |c|
+        c.default_cassette_options = { :serialize_with => :syck }
         c.cassette_library_dir = 'cassettes'
       end
 
@@ -45,7 +46,7 @@ Feature: Faraday middleware
       Response 1: Hello foo 1
       Response 2: Hello foo 1
       """
-    And the file "cassettes/example.yml" should contain "body: Hello foo 1"
+    And the file "cassettes/example.yml" should contain "Hello foo 1"
 
     Examples:
       | adapter  |

data/features/middleware/rack.feature

@@ -61,7 +61,7 @@ Feature: Rack
       Response 1: Hello foo 1
       Response 2: Hello foo 1
       """
-    And the file "cassettes/proxied.yml" should contain "body: Hello foo 1"
+    And the file "cassettes/proxied.yml" should contain "Hello foo 1"
 
   Scenario: Set cassette name based on rack request env
     Given a file named "proxy_server.rb" with:
@@ -88,5 +88,5 @@ Feature: Rack
       Response 1: Hello foo 1
       Response 2: Hello foo 1
       """
-    And the file "cassettes/localhost.yml" should contain "body: Hello foo 1"
+    And the file "cassettes/localhost.yml" should contain "Hello foo 1"
 

data/features/record_modes/all.feature

@@ -26,22 +26,26 @@ Feature: :all
       """
     And 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-Length:
-            - '20'
-          body: old response
-          http_version: '1.1'
+          headers: 
+            Content-Length: 
+            - "20"
+          body: 
+            encoding: UTF-8
+            string: old response
+          http_version: "1.1"
         recorded_at: Tue, 01 Nov 2011 04:58:44 GMT
       recorded_with: VCR 2.0.0
       """
@@ -58,8 +62,8 @@ Feature: :all
       """
     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"
+    And the file "cassettes/example.yml" should contain "Hello"
+    But the file "cassettes/example.yml" should not contain "old response"
 
   Scenario: Record new request
     Given a file named "record_new.rb" with:
@@ -74,5 +78,5 @@ Feature: :all
     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 |
-      | body: Goodbye      |
+      | old response |
+      | Goodbye      |

data/features/record_modes/new_episodes.feature

@@ -25,22 +25,26 @@ Feature: :new_episodes
       """
     And a previously recorded cassette file "cassettes/example.yml" with:
       """
-      ---
-      http_interactions:
-      - request:
+      --- 
+      http_interactions: 
+      - request: 
           method: get
           uri: http://example.com/foo
-          body: ''
+          body: 
+            encoding: UTF-8
+            string: ""
           headers: {}
-        response:
-          status:
+        response: 
+          status: 
             code: 200
             message: OK
-          headers:
-            Content-Length:
-            - '20'
-          body: example.com response
-          http_version: '1.1'
+          headers: 
+            Content-Length: 
+            - "20"
+          body: 
+            encoding: UTF-8
+            string: example.com response
+          http_version: "1.1"
         recorded_at: Tue, 01 Nov 2011 04:58:44 GMT
       recorded_with: VCR 2.0.0
       """
@@ -71,5 +75,5 @@ Feature: :new_episodes
     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 |
-      | body: Hello                |
+      | example.com response |
+      | Hello                |

data/features/record_modes/none.feature

@@ -21,22 +21,26 @@ Feature: :none
       """
     And a previously recorded cassette file "cassettes/example.yml" with:
       """
-      ---
-      http_interactions:
-      - request:
+      --- 
+      http_interactions: 
+      - request: 
           method: get
           uri: http://example.com/foo
-          body: ''
+          body: 
+            encoding: UTF-8
+            string: ""
           headers: {}
-        response:
-          status:
+        response: 
+          status: 
             code: 200
             message: OK
-          headers:
-            Content-Length:
-            - '5'
-          body: Hello
-          http_version: '1.1'
+          headers: 
+            Content-Length: 
+            - "5"
+          body: 
+            encoding: UTF-8
+            string: Hello
+          http_version: "1.1"
         recorded_at: Tue, 01 Nov 2011 04:58:44 GMT
       recorded_with: VCR 2.0.0
       """

data/features/record_modes/once.feature

@@ -28,22 +28,26 @@ Feature: :once
       """
     And a previously recorded cassette file "cassettes/example.yml" with:
       """
-      ---
-      http_interactions:
-      - request:
+      --- 
+      http_interactions: 
+      - request: 
           method: get
           uri: http://example.com/foo
-          body: ''
+          body: 
+            encoding: UTF-8
+            string: ""
           headers: {}
-        response:
-          status:
+        response: 
+          status: 
             code: 200
             message: OK
-          headers:
-            Content-Length:
-            - '20'
-          body: example.com response
-          http_version: '1.1'
+          headers: 
+            Content-Length: 
+            - "20"
+          body: 
+            encoding: UTF-8
+            string: example.com response
+          http_version: "1.1"
         recorded_at: Tue, 01 Nov 2011 04:58:44 GMT
       recorded_with: VCR 2.0.0
       """
@@ -88,4 +92,4 @@ Feature: :once
     When I remove the file "cassettes/example.yml"
     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"
+    And the file "cassettes/example.yml" should contain "Hello"

data/features/request_matching/body.feature

@@ -5,37 +5,45 @@ Feature: Matching on Body
   Background:
     Given a previously recorded cassette file "cassettes/example.yml" with:
       """
-      ---
-      http_interactions:
-      - request:
+      --- 
+      http_interactions: 
+      - request: 
           method: post
           uri: http://example.net/some/long/path
-          body: body1
+          body: 
+            encoding: UTF-8
+            string: body1
           headers: {}
-        response:
-          status:
+        response: 
+          status: 
             code: 200
             message: OK
-          headers:
-            Content-Length:
-            - '14'
-          body: body1 response
-          http_version: '1.1'
+          headers: 
+            Content-Length: 
+            - "14"
+          body: 
+            encoding: UTF-8
+            string: body1 response
+          http_version: "1.1"
         recorded_at: Tue, 01 Nov 2011 04:58:44 GMT
-      - request:
+      - request: 
           method: post
           uri: http://example.net/some/long/path
-          body: body2
+          body: 
+            encoding: UTF-8
+            string: body2
           headers: {}
-        response:
-          status:
+        response: 
+          status: 
             code: 200
             message: OK
-          headers:
-            Content-Length:
-            - '14'
-          body: body2 response
-          http_version: '1.1'
+          headers: 
+            Content-Length: 
+            - "14"
+          body: 
+            encoding: UTF-8
+            string: body2 response
+          http_version: "1.1"
         recorded_at: Tue, 01 Nov 2011 04:58:44 GMT
       recorded_with: VCR 2.0.0
       """

data/features/request_matching/custom_matcher.feature

@@ -15,37 +15,45 @@ Feature: Register and use a custom matcher
   Background:
     Given a previously recorded cassette file "cassettes/example.yml" with:
       """
-      ---
-      http_interactions:
-      - request:
+      --- 
+      http_interactions: 
+      - request: 
           method: get
           uri: http://foo.com:9000/foo
-          body: ''
+          body: 
+            encoding: UTF-8
+            string: ""
           headers: {}
-        response:
-          status:
+        response: 
+          status: 
             code: 200
             message: OK
-          headers:
-            Content-Length:
-            - '18'
-          body: port 9000 response
-          http_version: '1.1'
+          headers: 
+            Content-Length: 
+            - "18"
+          body: 
+            encoding: UTF-8
+            string: port 9000 response
+          http_version: "1.1"
         recorded_at: Tue, 01 Nov 2011 04:58:44 GMT
-      - request:
+      - request: 
           method: get
           uri: http://foo.com:8000/foo
-          body: ''
+          body: 
+            encoding: UTF-8
+            string: ""
           headers: {}
-        response:
-          status:
+        response: 
+          status: 
             code: 200
             message: OK
-          headers:
-            Content-Length:
-            - '18'
-          body: port 8000 response
-          http_version: '1.1'
+          headers: 
+            Content-Length: 
+            - "18"
+          body: 
+            encoding: UTF-8
+            string: port 8000 response
+          http_version: "1.1"
         recorded_at: Tue, 01 Nov 2011 04:58:44 GMT
       recorded_with: VCR 2.0.0
       """

data/features/request_matching/headers.feature

@@ -5,41 +5,49 @@ Feature: Matching on Headers
   Scenario Outline: Replay interaction that matches the headers
     Given a previously recorded cassette file "cassettes/example.yml" with:
       """
-      ---
-      http_interactions:
-      - request:
+      --- 
+      http_interactions: 
+      - request: 
           method: post
           uri: http://example.net/some/long/path
-          body: ''
-          headers:
-            X-User-Id:
-            - '1'
-        response:
-          status:
+          body: 
+            encoding: UTF-8
+            string: ""
+          headers: 
+            X-User-Id: 
+            - "1"
+        response: 
+          status: 
             code: 200
             message: OK
-          headers:
-            Content-Length:
-            - '15'
-          body: user 1 response
-          http_version: '1.1'
+          headers: 
+            Content-Length: 
+            - "15"
+          body: 
+            encoding: UTF-8
+            string: user 1 response
+          http_version: "1.1"
         recorded_at: Tue, 01 Nov 2011 04:58:44 GMT
-      - request:
+      - request: 
           method: post
           uri: http://example.net/some/long/path
-          body: ''
-          headers:
-            X-User-Id:
-            - '2'
-        response:
-          status:
+          body: 
+            encoding: UTF-8
+            string: ""
+          headers: 
+            X-User-Id: 
+            - "2"
+        response: 
+          status: 
             code: 200
             message: OK
-          headers:
-            Content-Length:
-            - '15'
-          body: user 2 response
-          http_version: '1.1'
+          headers: 
+            Content-Length: 
+            - "15"
+          body: 
+            encoding: UTF-8
+            string: user 2 response
+          http_version: "1.1"
         recorded_at: Tue, 01 Nov 2011 04:58:44 GMT
       recorded_with: VCR 2.0.0
       """