Added request body and headers to recorded response. These will come …

…in handy for getting VCR to work with webmock.
myronmarston · Apr 11, 2010 · 7003176 · 7003176
1 parent 323d72d
commit 7003176
Show file tree

Hide file tree

Showing 22 changed files with 221 additions and 29 deletions.
diff --git a/features/fixtures/vcr_cassettes/1.8.6/cucumber_tags/replay_cassette1.yml b/features/fixtures/vcr_cassettes/1.8.6/cucumber_tags/replay_cassette1.yml
@@ -41,3 +41,10 @@
     message: OK
     read: true
     socket: 
+  request_headers: 
+    accept: 
+    - "*/*"
+    connection: 
+    - close
+    host: 
+    - example.com
diff --git a/features/fixtures/vcr_cassettes/1.8.6/cucumber_tags/replay_cassette2.yml b/features/fixtures/vcr_cassettes/1.8.6/cucumber_tags/replay_cassette2.yml
@@ -21,6 +21,13 @@
     message: Not Found
     read: true
     socket: 
+  request_headers: 
+    accept: 
+    - "*/*"
+    connection: 
+    - close
+    host: 
+    - example.com
 - !ruby/struct:VCR::RecordedResponse 
   method: :get
   uri: http://example.com:80/after_nested
@@ -43,3 +50,10 @@
     message: Not Found
     read: true
     socket: 
+  request_headers: 
+    accept: 
+    - "*/*"
+    connection: 
+    - close
+    host: 
+    - example.com
diff --git a/features/fixtures/vcr_cassettes/1.8.6/cucumber_tags/replay_cassette3.yml b/features/fixtures/vcr_cassettes/1.8.6/cucumber_tags/replay_cassette3.yml
@@ -41,6 +41,13 @@
     message: OK
     read: true
     socket: 
+  request_headers: 
+    accept: 
+    - "*/*"
+    connection: 
+    - close
+    host: 
+    - example.com
 - !ruby/struct:VCR::RecordedResponse 
   method: :get
   uri: http://example.com:80/
@@ -83,3 +90,10 @@
     message: OK
     read: true
     socket: 
+  request_headers: 
+    accept: 
+    - "*/*"
+    connection: 
+    - close
+    host: 
+    - example.com
diff --git a/features/fixtures/vcr_cassettes/1.8.6/nested_replay_cassette.yml b/features/fixtures/vcr_cassettes/1.8.6/nested_replay_cassette.yml
@@ -21,3 +21,10 @@
     message: Not Found
     read: true
     socket: 
+  request_headers: 
+    accept: 
+    - "*/*"
+    connection: 
+    - close
+    host: 
+    - example.com
diff --git a/features/fixtures/vcr_cassettes/1.8.6/not_the_real_response.yml b/features/fixtures/vcr_cassettes/1.8.6/not_the_real_response.yml
@@ -41,3 +41,10 @@
     message: OK
     read: true
     socket: 
+  request_headers: 
+    accept: 
+    - "*/*"
+    connection: 
+    - close
+    host: 
+    - example.com
diff --git a/features/fixtures/vcr_cassettes/1.8.7/cucumber_tags/replay_cassette1.yml b/features/fixtures/vcr_cassettes/1.8.7/cucumber_tags/replay_cassette1.yml
@@ -41,3 +41,11 @@
     message: OK
     read: true
     socket: 
+  request_body: 
+  request_headers: 
+    accept: 
+    - "*/*"
+    connection: 
+    - close
+    host: 
+    - example.com
diff --git a/features/fixtures/vcr_cassettes/1.8.7/cucumber_tags/replay_cassette2.yml b/features/fixtures/vcr_cassettes/1.8.7/cucumber_tags/replay_cassette2.yml
@@ -43,3 +43,11 @@
     message: Not Found
     read: true
     socket: 
+  request_body: 
+  request_headers: 
+    accept: 
+    - "*/*"
+    connection: 
+    - close
+    host: 
+    - example.com
diff --git a/features/fixtures/vcr_cassettes/1.8.7/cucumber_tags/replay_cassette3.yml b/features/fixtures/vcr_cassettes/1.8.7/cucumber_tags/replay_cassette3.yml
@@ -83,3 +83,11 @@
     message: OK
     read: true
     socket: 
+  request_body: 
+  request_headers: 
+    accept: 
+    - "*/*"
+    connection: 
+    - close
+    host: 
+    - example.com
diff --git a/features/fixtures/vcr_cassettes/1.8.7/nested_replay_cassette.yml b/features/fixtures/vcr_cassettes/1.8.7/nested_replay_cassette.yml
@@ -21,3 +21,11 @@
     message: Not Found
     read: true
     socket: 
+  request_body: 
+  request_headers: 
+    accept: 
+    - "*/*"
+    connection: 
+    - close
+    host: 
+    - example.com
diff --git a/features/fixtures/vcr_cassettes/1.8.7/not_the_real_response.yml b/features/fixtures/vcr_cassettes/1.8.7/not_the_real_response.yml
@@ -41,3 +41,11 @@
     message: OK
     read: true
     socket: 
+  request_body: 
+  request_headers: 
+    accept: 
+    - "*/*"
+    connection: 
+    - close
+    host: 
+    - example.com
diff --git a/features/fixtures/vcr_cassettes/1.9.1/cucumber_tags/replay_cassette1.yml b/features/fixtures/vcr_cassettes/1.9.1/cucumber_tags/replay_cassette1.yml
@@ -41,3 +41,11 @@
     message: OK
     read: true
     socket: 
+  :request_body: 
+  :request_headers: 
+    accept: 
+    - "*/*"
+    connection: 
+    - close
+    host: 
+    - example.com
diff --git a/features/fixtures/vcr_cassettes/1.9.1/cucumber_tags/replay_cassette2.yml b/features/fixtures/vcr_cassettes/1.9.1/cucumber_tags/replay_cassette2.yml
@@ -29,6 +29,14 @@
     message: OK
     read: true
     socket: 
+  :request_body: 
+  :request_headers: 
+    accept: 
+    - "*/*"
+    connection: 
+    - close
+    host: 
+    - example.com
 - !ruby/struct:VCR::RecordedResponse 
   :method: :get
   :uri: http://example.com:80/after_nested
@@ -59,3 +67,11 @@
     message: OK
     read: true
     socket:
+  :request_body: 
+  :request_headers: 
+    accept: 
+    - "*/*"
+    connection: 
+    - close
+    host: 
+    - example.com
diff --git a/features/fixtures/vcr_cassettes/1.9.1/cucumber_tags/replay_cassette3.yml b/features/fixtures/vcr_cassettes/1.9.1/cucumber_tags/replay_cassette3.yml
@@ -41,6 +41,14 @@
     message: OK
     read: true
     socket: 
+  :request_body: 
+  :request_headers: 
+    accept: 
+    - "*/*"
+    connection: 
+    - close
+    host: 
+    - example.com
 - !ruby/struct:VCR::RecordedResponse 
   :method: :get
   :uri: http://example.com:80/
@@ -83,3 +91,11 @@
     message: OK
     read: true
     socket: 
+  :request_body: 
+  :request_headers: 
+    accept: 
+    - "*/*"
+    connection: 
+    - close
+    host: 
+    - example.com
diff --git a/features/fixtures/vcr_cassettes/1.9.1/nested_replay_cassette.yml b/features/fixtures/vcr_cassettes/1.9.1/nested_replay_cassette.yml
@@ -28,4 +28,12 @@
     http_version: "1.1"
     message: OK
     read: true
-    socket: 
+    socket: 
+  :request_body: 
+  :request_headers: 
+    accept: 
+    - "*/*"
+    connection: 
+    - close
+    host: 
+    - example.com
diff --git a/features/fixtures/vcr_cassettes/1.9.1/not_the_real_response.yml b/features/fixtures/vcr_cassettes/1.9.1/not_the_real_response.yml
@@ -41,3 +41,11 @@
     message: OK
     read: true
     socket: 
+  :request_body: 
+  :request_headers: 
+    accept: 
+    - "*/*"
+    connection: 
+    - close
+    host: 
+    - example.com
diff --git a/lib/vcr/extensions/net_http.rb b/lib/vcr/extensions/net_http.rb
@@ -44,7 +44,7 @@ def __store_response_with_vcr__(response, request)
         method = request.method.downcase.to_sym
 
         unless FakeWeb.registered_uri?(method, uri)
-          cassette.store_recorded_response!(VCR::RecordedResponse.new(method, uri, response))
+          cassette.store_recorded_response!(VCR::RecordedResponse.new(method, uri, response, request.body, request.to_hash))
         end
       end
     end

diff --git a/lib/vcr/recorded_response.rb b/lib/vcr/recorded_response.rb
@@ -1,4 +1,4 @@
 module VCR
-  class RecordedResponse < Struct.new(:method, :uri, :response)
+  class RecordedResponse < Struct.new(:method, :uri, :response, :request_body, :request_headers)
   end
 end
diff --git a/spec/extensions/net_http_spec.rb b/spec/extensions/net_http_spec.rb
@@ -25,7 +25,7 @@ def perform_get_with_returning_block
 
       it 'calls #store_recorded_response! on the current cassette' do
         recorded_response = VCR::RecordedResponse.new(:get, 'http://example.com:80/', :example_response)
-        VCR::RecordedResponse.should_receive(:new).with(:get, 'http://example.com:80/', an_instance_of(Net::HTTPOK)).and_return(recorded_response)
+        VCR::RecordedResponse.should_receive(:new).with(:get, 'http://example.com:80/', an_instance_of(Net::HTTPOK), anything, anything).and_return(recorded_response)
         @current_cassette.should_receive(:store_recorded_response!).with(recorded_response)
         Net::HTTP.get(@uri)
       end

diff --git a/spec/fixtures/1.8.6/cassette_spec/example.yml b/spec/fixtures/1.8.6/cassette_spec/example.yml
@@ -44,6 +44,14 @@
     message: OK
     read: true
     socket: 
+  request_body: 
+  request_headers: 
+    accept: 
+    - "*/*"
+    connection: 
+    - close
+    host: 
+    - example.com
 - !ruby/struct:VCR::RecordedResponse 
   method: :get
   uri: http://example.com:80/foo
@@ -76,6 +84,14 @@
     message: Not Found
     read: true
     socket: 
+  request_body: 
+  request_headers: 
+    accept: 
+    - "*/*"
+    connection: 
+    - close
+    host: 
+    - example.com
 - !ruby/struct:VCR::RecordedResponse 
   method: :get
   uri: http://example.com:80/
@@ -106,3 +122,11 @@
     message: OK
     read: true
     socket: 
+  request_body: 
+  request_headers: 
+    accept: 
+    - "*/*"
+    connection: 
+    - close
+    host: 
+    - example.com
diff --git a/spec/fixtures/1.8.7/cassette_spec/example.yml b/spec/fixtures/1.8.7/cassette_spec/example.yml
@@ -44,6 +44,14 @@
     message: OK
     read: true
     socket: 
+  request_body: 
+  request_headers: 
+    accept: 
+    - "*/*"
+    connection: 
+    - close
+    host: 
+    - example.com
 - !ruby/struct:VCR::RecordedResponse 
   method: :get
   uri: http://example.com:80/foo
@@ -76,6 +84,14 @@
     message: Not Found
     read: true
     socket: 
+  request_body: 
+  request_headers: 
+    accept: 
+    - "*/*"
+    connection: 
+    - close
+    host: 
+    - example.com
 - !ruby/struct:VCR::RecordedResponse 
   method: :get
   uri: http://example.com:80/
@@ -106,3 +122,11 @@
     message: OK
     read: true
     socket: 
+  request_body: 
+  request_headers: 
+    accept: 
+    - "*/*"
+    connection: 
+    - close
+    host: 
+    - example.com
diff --git a/spec/fixtures/1.9.1/cassette_spec/example.yml b/spec/fixtures/1.9.1/cassette_spec/example.yml
@@ -43,6 +43,14 @@
     message: OK
     read: true
     socket: 
+  :request_body: 
+  :request_headers: 
+    accept: 
+    - "*/*"
+    connection: 
+    - close
+    host: 
+    - example.com
 - !ruby/struct:VCR::RecordedResponse 
   :method: :get
   :uri: http://example.com:80/foo
@@ -75,6 +83,14 @@
     message: Not Found
     read: true
     socket: 
+  :request_body: 
+  :request_headers: 
+    accept: 
+    - "*/*"
+    connection: 
+    - close
+    host: 
+    - example.com
 - !ruby/struct:VCR::RecordedResponse 
   :method: :get
   :uri: http://example.com:80/
@@ -105,3 +121,11 @@
     message: OK
     read: true
     socket: 
+  :request_body: 
+  :request_headers: 
+    accept: 
+    - "*/*"
+    connection: 
+    - close
+    host: 
+    - example.com