webmock 1.0.0 → 1.1.0

data/spec/patron_spec_helper.rb

@@ -12,10 +12,16 @@ module PatronSpecHelper
     response = sess.request(method, "#{uri.path}#{uri.query ? '?' : ''}#{uri.query}", options[:headers] || {}, {
       :data => options[:body]
     })
-
+    headers = {}
+    if response.headers
+      response.headers.each do |k,v|
+        v = v.join(", ") if v.is_a?(Array)
+        headers[k] = v 
+      end
+    end
     OpenStruct.new({
       :body => response.body,
-      :headers => WebMock::Util::Headers.normalize_headers(response.headers),
+      :headers => WebMock::Util::Headers.normalize_headers(headers),
       :status => response.status.to_s,
       :message => response.status_line
     })

data/spec/response_spec.rb

@@ -126,7 +126,8 @@ describe Response do
           "Date"=>"Sat, 23 Jan 2010 01:01:05 GMT",
           "Content-Type"=>"text/html; charset=UTF-8",
           "Content-Length"=>"438",
-          "Connection"=>"Keep-Alive"
+          "Connection"=>"Keep-Alive",
+          "Accept"=>"image/jpeg, image/png"
           }
       end
 
@@ -155,7 +156,8 @@ describe Response do
           "Date"=>"Sat, 23 Jan 2010 01:01:05 GMT",
           "Content-Type"=>"text/html; charset=UTF-8",
           "Content-Length"=>"438",
-          "Connection"=>"Keep-Alive"
+          "Connection"=>"Keep-Alive",          
+          "Accept"=>"image/jpeg, image/png"
           }
       end
 

data/spec/util/headers_spec.rb

@@ -8,4 +8,21 @@ describe WebMock::Util::Headers do
     userinfo.should == "username:secret"
   end
 
+  describe "sorted_headers_string" do
+    
+    it "should return nice string for hash with string values" do
+      Util::Headers.sorted_headers_string({"a" => "b"}).should == "{'A'=>'b'}"
+    end
+    
+    it "should return nice string for hash with array values" do
+      Util::Headers.sorted_headers_string({"a" => ["b", "c"]}).should == "{'A'=>['b', 'c']}"
+    end
+  
+    it "should return nice string for hash with array values and string values" do
+      Util::Headers.sorted_headers_string({"a" => ["b", "c"], "d" => "e"}).should == "{'A'=>['b', 'c'], 'D'=>'e'}"
+    end
+    
+  
+  end
+
 end

data/spec/webmock_spec.rb

@@ -8,6 +8,14 @@ end
 
 class MyException < StandardError; end;
 
+describe "WebMock version" do
+  
+  it "should report version" do
+    WebMock.version.should == open(File.join(File.dirname(__FILE__), "..", "VERSION")).read.strip
+  end
+  
+end
+
 describe "WebMock", :shared => true do
   before(:each) do
     WebMock.disable_net_connect!
@@ -56,7 +64,7 @@ describe "WebMock", :shared => true do
       it "should raise exception if request was not stubbed" do
         lambda {
           http_request(:get, "http://www.example.com/")
-        }.should fail_with(client_specific_request_string("Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/"))
+        }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string("Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/"))
       end
     end
 
@@ -73,7 +81,7 @@ describe "WebMock", :shared => true do
       it "should raise exception if request was not stubbed" do
         lambda {
           http_request(:get, "http://www.example.com/")
-        }.should fail_with(client_specific_request_string("Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/"))
+        }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string("Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/"))
       end
 
       it "should allow a real request localhost" do
@@ -117,7 +125,7 @@ describe "WebMock", :shared => true do
         http_request(:get, "http://www.example.com/").status.should == "200"
         lambda {
           http_request(:delete, "http://www.example.com/")
-        }.should fail_with(client_specific_request_string(
+        }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string(
         "Real HTTP connections are disabled. Unregistered request: DELETE http://www.example.com/")
         )
       end
@@ -144,7 +152,7 @@ describe "WebMock", :shared => true do
         stub_http_request(:post, "www.example.com").with(:body => "abc")
         lambda {
           http_request(:post, "http://www.example.com/", :body => "def")
-        }.should fail_with(client_specific_request_string(
+        }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string(
         "Real HTTP connections are disabled. Unregistered request: POST http://www.example.com/ with body 'def'"))
       end
 
@@ -161,7 +169,7 @@ describe "WebMock", :shared => true do
           stub_http_request(:post, "www.example.com").with(:body => /^abc/)
           lambda {
             http_request(:post, "http://www.example.com/", :body => "xabc")
-          }.should fail_with(client_specific_request_string(
+          }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string(
           "Real HTTP connections are disabled. Unregistered request: POST http://www.example.com/ with body 'xabc'"))
         end
 
@@ -177,6 +185,42 @@ describe "WebMock", :shared => true do
           :get, "http://www.example.com/",
           :headers => SAMPLE_HEADERS).status.should == "200"
       end
+      
+      it "should match requests if headers are the same and declared as array" do
+        stub_http_request(:get, "www.example.com").with(:headers => {"a" => ["b"]} )
+        http_request(
+          :get, "http://www.example.com/",
+          :headers => {"a" => "b"}).status.should == "200"
+      end
+      
+      describe "when multiple headers with the same key are used" do
+      
+        it "should match requests if headers are the same" do
+          stub_http_request(:get, "www.example.com").with(:headers => {"a" => ["b", "c"]} )
+          http_request(
+            :get, "http://www.example.com/",
+            :headers => {"a" => ["b", "c"]}).status.should == "200"
+        end
+      
+        it "should match requests if headers are the same  but in different order" do
+          stub_http_request(:get, "www.example.com").with(:headers => {"a" => ["b", "c"]} )
+          http_request(
+            :get, "http://www.example.com/",
+            :headers => {"a" => ["c", "b"]}).status.should == "200"
+        end
+        
+        it "should not match requests if headers are different" do
+          stub_http_request(:get, "www.example.com").with(:headers => {"a" => ["b", "c"]})
+
+          lambda {
+            http_request(
+              :get, "http://www.example.com/",
+            :headers => {"a" => ["b", "d"]})
+          }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string(
+            %q(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/ with headers {'A'=>['b', 'd']})))
+        end
+      
+      end
 
       it "should match requests if request headers are not stubbed" do
         stub_http_request(:get, "www.example.com")
@@ -192,7 +236,7 @@ describe "WebMock", :shared => true do
           http_request(
             :get, "http://www.example.com/",
           :headers => { 'Content-Length' => '9999'})
-        }.should fail_with(client_specific_request_string(
+        }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string(
           %q(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/ with headers {'Content-Length'=>'9999'})))
       end
 
@@ -203,7 +247,7 @@ describe "WebMock", :shared => true do
           http_request(
             :get, "http://www.example.com/",
           :headers => { 'Accept' => 'application/xml'})
-        }.should fail_with(client_specific_request_string(
+        }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string(
         %q(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/ with headers {'Accept'=>'application/xml'})))
       end
 
@@ -223,7 +267,7 @@ describe "WebMock", :shared => true do
             http_request(
               :get, "http://www.example.com/",
             :headers => { 'user-agent' => 'xMyAppName' })
-          }.should fail_with(client_specific_request_string(
+          }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string(
           %q(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/ with headers {'User-Agent'=>'xMyAppName'})))
         end
 
@@ -241,7 +285,7 @@ describe "WebMock", :shared => true do
         stub_http_request(:get, "user:pass@www.example.com")
         lambda {
           http_request(:get, "http://user:pazz@www.example.com/").status.should == "200"
-        }.should fail_with(client_specific_request_string(
+        }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string(
         %q(Real HTTP connections are disabled. Unregistered request: GET http://user:pazz@www.example.com/)))
       end
 
@@ -249,7 +293,7 @@ describe "WebMock", :shared => true do
         stub_http_request(:get, "user:pass@www.example.com")
         lambda {
           http_request(:get, "http://www.example.com/").status.should == "200"
-        }.should fail_with(client_specific_request_string(
+        }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string(
         %q(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/)))
       end
 
@@ -257,7 +301,7 @@ describe "WebMock", :shared => true do
         stub_http_request(:get, "www.example.com")
         lambda {
           http_request(:get, "http://user:pazz@www.example.com/").status.should == "200"
-        }.should fail_with(client_specific_request_string(
+        }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string(
         %q(Real HTTP connections are disabled. Unregistered request: GET http://user:pazz@www.example.com/)))
       end
 
@@ -274,7 +318,7 @@ describe "WebMock", :shared => true do
         stub_http_request(:get, "www.example.com").with { |request| false }
         lambda {
           http_request(:get, "http://www.example.com/")
-        }.should fail_with(client_specific_request_string(
+        }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string(
         "Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/"))
       end
 
@@ -285,7 +329,7 @@ describe "WebMock", :shared => true do
           :body => "wadus").status.should == "200"
         lambda {
           http_request(:post, "http://www.example.com/", :body => "jander")
-        }.should fail_with(client_specific_request_string(
+        }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string(
         "Real HTTP connections are disabled. Unregistered request: POST http://www.example.com/ with body 'jander'"))
       end
 
@@ -344,6 +388,12 @@ describe "WebMock", :shared => true do
           response = http_request(:get, "http://www.example.com/")
           response.headers["Content-Length"].should == "8888"
         end
+        
+        it "should return declared headers when there are multiple headers with the same key" do
+          stub_http_request(:get, "www.example.com").to_return(:headers => {"a" => ["b", "c"]})
+          response = http_request(:get, "http://www.example.com/")
+          response.headers["A"].should == "b, c"
+        end
 
         it "should return declared status code" do
           stub_http_request(:get, "www.example.com").to_return(:status => 500)
@@ -446,7 +496,8 @@ describe "WebMock", :shared => true do
               "Date"=>"Sat, 23 Jan 2010 01:01:05 GMT",
               "Content-Type"=>"text/html; charset=UTF-8",
               "Content-Length"=>"438",
-              "Connection"=>"Keep-Alive"
+              "Connection"=>"Keep-Alive",
+              "Accept"=>"image/jpeg, image/png"
               }
           end
 
@@ -481,7 +532,8 @@ describe "WebMock", :shared => true do
               "Date"=>"Sat, 23 Jan 2010 01:01:05 GMT",
               "Content-Type"=>"text/html; charset=UTF-8",
               "Content-Length"=>"438",
-              "Connection"=>"Keep-Alive"
+              "Connection"=>"Keep-Alive",
+              "Accept"=>"image/jpeg, image/png"
               }
           end
 
@@ -806,6 +858,42 @@ describe "WebMock", :shared => true do
                   request(:get, "www.example.com").
                   with(:headers => SAMPLE_HEADERS).should have_been_made
                 }.should_not raise_error
+              end
+              
+               it "should succeed if request was executed with the same headers with value declared as array" do
+                  lambda {
+                    http_request(:get, "http://www.example.com/", :headers => {"a" => "b"})
+                    request(:get, "www.example.com").
+                    with(:headers => {"a" => ["b"]}).should have_been_made
+                  }.should_not raise_error
+                end
+              
+              describe "when multiple headers with the same key are passed" do
+                
+                it "should succeed if request was executed with the same headers" do
+                  lambda {
+                    http_request(:get, "http://www.example.com/", :headers => {"a" => ["b", "c"]})
+                    request(:get, "www.example.com").
+                    with(:headers =>  {"a" => ["b", "c"]}).should have_been_made
+                  }.should_not raise_error
+                end
+                
+                it "should succeed if request was executed with the same headers but different order" do
+                  lambda {
+                    http_request(:get, "http://www.example.com/", :headers => {"a" => ["b", "c"]})
+                    request(:get, "www.example.com").
+                    with(:headers =>  {"a" => ["c", "b"]}).should have_been_made
+                  }.should_not raise_error
+                end
+                
+                it "should fail if request was executed with different headers" do
+                  lambda {
+                    http_request(:get, "http://www.example.com/", :headers => {"a" => ["b", "c"]})
+                    request(:get, "www.example.com").
+                    with(:headers => {"a" => ["b", "d"]}).should have_been_made
+                  }.should fail_with("The request GET http://www.example.com/ with headers {'A'=>['b', 'd']} was expected to execute 1 time but it executed 0 times")
+                end
+                
               end
 
               it "should fail if request was executed with different headers" do

data/test/test_webmock.rb

@@ -34,7 +34,7 @@ class TestWebMock < Test::Unit::TestCase
 
   def test_error_on_non_stubbed_request
     default_ruby_headers = (RUBY_VERSION >= "1.9.1") ? "{'Accept'=>'*/*', 'User-Agent'=>'Ruby'}" : "{'Accept'=>'*/*'}"
-    assert_fail("Real HTTP connections are disabled. Unregistered request: GET http://www.example.net/ with headers #{default_ruby_headers}") do
+    assert_raise(WebMock::NetConnectNotAllowedError, "Real HTTP connections are disabled. Unregistered request: GET http://www.example.net/ with headers #{default_ruby_headers}") do
       http_request(:get, "http://www.example.net/")
     end
   end

data/webmock.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webmock}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bartosz Blimke"]
-  s.date = %q{2010-04-12}
+  s.date = %q{2010-04-28}
   s.description = %q{WebMock allows stubbing HTTP requests and setting expectations on HTTP requests.}
   s.email = %q{bartosz.blimke@gmail.com}
   s.extra_rdoc_files = [
@@ -75,20 +75,6 @@ Gem::Specification.new do |s|
      "spec/vendor/right_http_connection-1.2.4/lib/net_fix.rb",
      "spec/vendor/right_http_connection-1.2.4/lib/right_http_connection.rb",
      "spec/vendor/right_http_connection-1.2.4/setup.rb",
-     "spec/vendor/samuel-0.2.1/.document",
-     "spec/vendor/samuel-0.2.1/.gitignore",
-     "spec/vendor/samuel-0.2.1/LICENSE",
-     "spec/vendor/samuel-0.2.1/README.rdoc",
-     "spec/vendor/samuel-0.2.1/Rakefile",
-     "spec/vendor/samuel-0.2.1/VERSION",
-     "spec/vendor/samuel-0.2.1/lib/samuel.rb",
-     "spec/vendor/samuel-0.2.1/lib/samuel/net_http.rb",
-     "spec/vendor/samuel-0.2.1/lib/samuel/request.rb",
-     "spec/vendor/samuel-0.2.1/samuel.gemspec",
-     "spec/vendor/samuel-0.2.1/test/request_test.rb",
-     "spec/vendor/samuel-0.2.1/test/samuel_test.rb",
-     "spec/vendor/samuel-0.2.1/test/test_helper.rb",
-     "spec/vendor/samuel-0.2.1/test/thread_test.rb",
      "spec/webmock_spec.rb",
      "test/test_helper.rb",
      "test/test_webmock.rb",
@@ -122,13 +108,6 @@ Gem::Specification.new do |s|
      "spec/vendor/right_http_connection-1.2.4/lib/net_fix.rb",
      "spec/vendor/right_http_connection-1.2.4/lib/right_http_connection.rb",
      "spec/vendor/right_http_connection-1.2.4/setup.rb",
-     "spec/vendor/samuel-0.2.1/lib/samuel/net_http.rb",
-     "spec/vendor/samuel-0.2.1/lib/samuel/request.rb",
-     "spec/vendor/samuel-0.2.1/lib/samuel.rb",
-     "spec/vendor/samuel-0.2.1/test/request_test.rb",
-     "spec/vendor/samuel-0.2.1/test/samuel_test.rb",
-     "spec/vendor/samuel-0.2.1/test/test_helper.rb",
-     "spec/vendor/samuel-0.2.1/test/thread_test.rb",
      "spec/webmock_spec.rb",
      "test/test_helper.rb",
      "test/test_webmock.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-12 00:00:00 +01:00
+date: 2010-04-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -120,20 +120,6 @@ files:
 - spec/vendor/right_http_connection-1.2.4/lib/net_fix.rb
 - spec/vendor/right_http_connection-1.2.4/lib/right_http_connection.rb
 - spec/vendor/right_http_connection-1.2.4/setup.rb
-- spec/vendor/samuel-0.2.1/.document
-- spec/vendor/samuel-0.2.1/.gitignore
-- spec/vendor/samuel-0.2.1/LICENSE
-- spec/vendor/samuel-0.2.1/README.rdoc
-- spec/vendor/samuel-0.2.1/Rakefile
-- spec/vendor/samuel-0.2.1/VERSION
-- spec/vendor/samuel-0.2.1/lib/samuel.rb
-- spec/vendor/samuel-0.2.1/lib/samuel/net_http.rb
-- spec/vendor/samuel-0.2.1/lib/samuel/request.rb
-- spec/vendor/samuel-0.2.1/samuel.gemspec
-- spec/vendor/samuel-0.2.1/test/request_test.rb
-- spec/vendor/samuel-0.2.1/test/samuel_test.rb
-- spec/vendor/samuel-0.2.1/test/test_helper.rb
-- spec/vendor/samuel-0.2.1/test/thread_test.rb
 - spec/webmock_spec.rb
 - test/test_helper.rb
 - test/test_webmock.rb
@@ -189,13 +175,6 @@ test_files:
 - spec/vendor/right_http_connection-1.2.4/lib/net_fix.rb
 - spec/vendor/right_http_connection-1.2.4/lib/right_http_connection.rb
 - spec/vendor/right_http_connection-1.2.4/setup.rb
-- spec/vendor/samuel-0.2.1/lib/samuel/net_http.rb
-- spec/vendor/samuel-0.2.1/lib/samuel/request.rb
-- spec/vendor/samuel-0.2.1/lib/samuel.rb
-- spec/vendor/samuel-0.2.1/test/request_test.rb
-- spec/vendor/samuel-0.2.1/test/samuel_test.rb
-- spec/vendor/samuel-0.2.1/test/test_helper.rb
-- spec/vendor/samuel-0.2.1/test/thread_test.rb
 - spec/webmock_spec.rb
 - test/test_helper.rb
 - test/test_webmock.rb

data/spec/vendor/samuel-0.2.1/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/spec/vendor/samuel-0.2.1/.gitignore

@@ -1,5 +0,0 @@
-.DS_Store
-.yardoc
-/coverage
-/doc
-/pkg

data/spec/vendor/samuel-0.2.1/LICENSE

@@ -1,20 +0,0 @@
-Copyright 2009 Chris Kampmeier
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.