webmock 1.17.2 → 1.17.3

data/.travis.yml

@@ -3,13 +3,15 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
+  - ruby-head
   - ree
-  - jruby-19mode
   - jruby-18mode
-  - rbx-18mode
-  - rbx-19mode
+  - jruby-19mode
+  - jruby
+  - jruby-head
 matrix:
   allow_failures:
-    - rvm: rbx-18mode
-    - rvm: rbx-19mode
     - rvm: jruby-18mode
+    - rvm: jruby-head
+    - rvm: ruby-head

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.17.3
+
+* Fixed issue with Rack response removing 'Content-Type' header
+
+  Thanks to [Bo Jeanes](https://github.com/bjeanes) and [Matthew Conway](https://github.com/mattonrails)
+
 ## 1.17.2
 
 * Support for chunked responses in Curb

data/README.md

@@ -879,6 +879,8 @@ People who submitted patches and new features or suggested improvements. Many th
 * Jon Rowe
 * Aleksey V. Zapparov
 * Praveen Arimbrathodiyil
+* Bo Jeanes
+* Matthew Conway
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/lib/webmock/rack_response.rb

@@ -25,7 +25,7 @@ module WebMock
 
     def build_rack_env(request)
       uri = request.uri
-      headers = request.headers || {}
+      headers = (request.headers || {}).dup
       body = request.body || ''
 
       env = {

data/lib/webmock/version.rb

@@ -1,3 +1,3 @@
 module WebMock
-  VERSION = '1.17.2' unless defined?(::WebMock::VERSION)
+  VERSION = '1.17.3' unless defined?(::WebMock::VERSION)
 end

data/spec/acceptance/shared/returning_declared_responses.rb

@@ -255,6 +255,19 @@ shared_context "declared responses" do |*adapter_info|
         stub_request(:get, "http://www.example.com/compute").to_rack(MyRackApp)
         http_request(:get, "http://www.example.com/compute").status.should == "200"
       end
+
+      it "preserves content-type header when proxying to a rack app" do
+        stub_request(:any, //).to_rack(lambda {|req| [200, {}, ["OK"]] })
+
+        url = "https://google.com/hi/there"
+        headers = {
+          "Accept"       => "application/json",
+          "Content-Type" => "application/json"
+        }
+
+        http_request(:get, url, :headers => headers)
+        WebMock.should have_requested(:get, url).with(:headers => headers)
+      end
     end
 
     describe "when sequences of responses are declared" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 87
+  hash: 85
   prerelease: 
   segments: 
   - 1
   - 17
-  - 2
-  version: 1.17.2
+  - 3
+  version: 1.17.3
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-02-02 00:00:00 +01:00
+date: 2014-02-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency