webmock 1.7.10 → 1.8.0

data/spec/unit/request_signature_spec.rb

@@ -71,40 +71,42 @@ describe WebMock::RequestSignature do
   end
 
 
-  describe "eql?" do
-    it "should be true for two signatures with the same values" do
-      signature1 = WebMock::RequestSignature.new(:get, "www.example.com",
-        :body => "abc", :headers => {'A' => 'a', 'B' => 'b'})
-      signature2 = WebMock::RequestSignature.new(:get, "www.example.com",
-        :body => "abc", :headers => {'A' => 'a', 'B' => 'b'})
-
-      signature1.should eql(signature2)
-    end
-
-    it "should be false for two signatures with different method" do
-      signature1 = WebMock::RequestSignature.new(:get, "www.example.com")
-      signature2 = WebMock::RequestSignature.new(:put, "www.example.com")
-      signature1.should_not eql(signature2)
-    end
-
-    it "should be false for two signatures with different uri" do
-      signature1 = WebMock::RequestSignature.new(:get, "www.example.com")
-      signature2 = WebMock::RequestSignature.new(:get, "www.example.org")
-      signature1.should_not eql(signature2)
-    end
-
-    it "should be false for two signatures with different body" do
-      signature1 = WebMock::RequestSignature.new(:get, "www.example.com", :body => "abc")
-      signature2 = WebMock::RequestSignature.new(:get, "www.example.com", :body => "def")
-      signature1.should_not eql(signature2)
-    end
-
-    it "should be false for two signatures with different headers" do
-      signature1 = WebMock::RequestSignature.new(:get, "www.example.com",
-        :headers => {'A' => 'a'})
-      signature2 = WebMock::RequestSignature.new(:get, "www.example.com",
-        :headers => {'A' => 'A'})
-      signature1.should_not eql(signature2)
+  [:==, :eql?].each do |method|
+    describe method do
+      it "should be true for two signatures with the same values" do
+        signature1 = WebMock::RequestSignature.new(:get, "www.example.com",
+          :body => "abc", :headers => {'A' => 'a', 'B' => 'b'})
+        signature2 = WebMock::RequestSignature.new(:get, "www.example.com",
+          :body => "abc", :headers => {'A' => 'a', 'B' => 'b'})
+
+        signature1.send(method, signature2).should be_true
+      end
+
+      it "should be false for two signatures with different method" do
+        signature1 = WebMock::RequestSignature.new(:get, "www.example.com")
+        signature2 = WebMock::RequestSignature.new(:put, "www.example.com")
+        signature1.send(method, signature2).should be_false
+      end
+
+      it "should be false for two signatures with different uri" do
+        signature1 = WebMock::RequestSignature.new(:get, "www.example.com")
+        signature2 = WebMock::RequestSignature.new(:get, "www.example.org")
+        signature1.send(method, signature2).should be_false
+      end
+
+      it "should be false for two signatures with different body" do
+        signature1 = WebMock::RequestSignature.new(:get, "www.example.com", :body => "abc")
+        signature2 = WebMock::RequestSignature.new(:get, "www.example.com", :body => "def")
+        signature1.send(method, signature2).should be_false
+      end
+
+      it "should be false for two signatures with different headers" do
+        signature1 = WebMock::RequestSignature.new(:get, "www.example.com",
+          :headers => {'A' => 'a'})
+        signature2 = WebMock::RequestSignature.new(:get, "www.example.com",
+          :headers => {'A' => 'A'})
+        signature1.send(method, signature2).should be_false
+      end
     end
   end
 

data/spec/unit/util/uri_spec.rb

@@ -168,10 +168,22 @@ describe WebMock::Util::URI do
     end
 
     it "should successfully handle array parameters" do
-      uri = 'http://www.example.com:80/path?a[]=b&a[]=c'
-      lambda { WebMock::Util::URI.normalize_uri(uri) }.should_not raise_error(ArgumentError)
+      uri_string = 'http://www.example.com:80/path?a[]=b&a[]=c'
+      uri = WebMock::Util::URI.normalize_uri(uri_string)
+      uri.query_values.should == {"a"=>["b", "c"]}
     end
 
+    it "should successfully handle hash parameters" do
+      uri_string = 'http://www.example.com:80/path?a[d]=b&a[e]=c&a[b][c]=1'
+      uri = WebMock::Util::URI.normalize_uri(uri_string)
+      uri.query_values.should == {"a"=>{"d"=>"b", "e"=>"c", "b"=>{"c"=>"1"}}}
+    end
+
+    it "should successfully handle nested hash parameters" do
+      uri_string = 'http://www.example.com:80/path?one[two][three][]=four&one[two][three][]=five'
+      uri = WebMock::Util::URI.normalize_uri(uri_string)
+      uri.query_values.should == {"one"=>{"two"=>{"three" => ["four", "five"]}}}
+    end
   end
 
   describe "stripping default port" do

data/test/shared_test.rb

@@ -5,8 +5,8 @@ module SharedTest
 
   def setup
     super
-    stub_http_request(:any, "http://www.example.com")
-    stub_http_request(:any, "https://www.example.com")
+    @stub_http = stub_http_request(:any, "http://www.example.com")
+    @stub_https = stub_http_request(:any, "https://www.example.com")
   end
 
   def test_error_on_non_stubbed_request
@@ -22,6 +22,12 @@ module SharedTest
     assert_requested(:get, "http://www.example.com")
   end
 
+  def test_verification_that_expected_stub_occured
+    http_request(:get, "http://www.example.com/")
+    assert_requested(@stub_http, :times => 1)
+    assert_requested(@stub_http)
+  end
+
   def test_verification_that_expected_request_didnt_occur
     expected_message = "The request GET http://www.example.com/ was expected to execute 1 time but it executed 0 times"
     expected_message << "\n\nThe following requests were made:\n\nNo requests were made.\n============================================================"
@@ -30,6 +36,14 @@ module SharedTest
     end
   end
 
+  def test_verification_that_expected_request_didnt_occur
+    expected_message = "The request ANY http://www.example.com/ was expected to execute 1 time but it executed 0 times"
+    expected_message << "\n\nThe following requests were made:\n\nNo requests were made.\n============================================================"
+    assert_fail(expected_message) do
+      assert_requested(@stub_http)
+    end
+  end
+
   def test_verification_that_expected_request_occured_with_body_and_headers
     http_request(:get, "http://www.example.com/",
       :body => "abc", :headers => {'A' => 'a'})
@@ -37,6 +51,13 @@ module SharedTest
       :body => "abc", :headers => {'A' => 'a'})
   end
 
+  def test_verification_that_expected_request_occured_with_query_params
+    stub_request(:any, "http://www.example.com").with(:query => hash_including({"a" => ["b", "c"]}))
+    http_request(:get, "http://www.example.com/?a[]=b&a[]=c&x=1")
+    assert_requested(:get, "http://www.example.com",
+      :query => hash_including({"a" => ["b", "c"]}))
+  end
+
   def test_verification_that_non_expected_request_didnt_occur
     expected_message = %r(The request GET http://www.example.com/ was expected to execute 0 times but it executed 1 time\n\nThe following requests were made:\n\nGET http://www.example.com/ with headers .+ was made 1 time\n\n============================================================)
     assert_fail(expected_message) do
@@ -44,4 +65,12 @@ module SharedTest
       assert_not_requested(:get, "http://www.example.com")
     end
   end
+
+  def test_verification_that_non_expected_stub_didnt_occur
+    expected_message = %r(The request ANY http://www.example.com/ was expected to execute 0 times but it executed 1 time\n\nThe following requests were made:\n\nGET http://www.example.com/ with headers .+ was made 1 time\n\n============================================================)
+    assert_fail(expected_message) do
+      http_request(:get, "http://www.example.com/")
+      assert_not_requested(@stub_http)
+    end
+  end
 end

data/webmock.gemspec

@@ -14,15 +14,17 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = 'webmock'
 
-  s.add_dependency 'addressable', '~> 2.2', '> 2.2.5'
+  s.add_dependency 'addressable', '>= 2.2.7'
   s.add_dependency 'crack', '>=0.1.7'
 
-  s.add_development_dependency 'rspec',           '>= 2.0.0'
-  s.add_development_dependency 'httpclient',      '>= 2.1.5.2'
-  s.add_development_dependency 'patron',          '>= 0.4.15'
-  s.add_development_dependency 'em-http-request', '~> 0.3.0'
-  s.add_development_dependency 'curb',            '0.7.15'
-  s.add_development_dependency 'typhoeus',        '>= 0.2.4'
+  s.add_development_dependency 'rspec',           '~> 2.8'
+  s.add_development_dependency 'httpclient',      '>= 2.2.4'
+  s.add_development_dependency 'patron',          '>= 0.4.17' unless RUBY_PLATFORM =~ /java/
+  s.add_development_dependency 'em-http-request', '>= 1.0.0'
+  s.add_development_dependency 'em-synchrony',    '>= 1.0.0' if RUBY_VERSION >= "1.9"
+  s.add_development_dependency 'curb',            '>= 0.8.0' unless RUBY_PLATFORM =~ /java/
+  s.add_development_dependency 'typhoeus',        '>= 0.3.0' unless RUBY_PLATFORM =~ /java/
+  s.add_development_dependency 'excon',           '>= 0.9.5'
   s.add_development_dependency 'minitest',        '>= 2.2.2'
   s.add_development_dependency 'rdoc',            ((RUBY_VERSION == '1.8.6') ? '<= 3.5.0' : '>3.5.0')
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 55
   prerelease: 
   segments: 
   - 1
-  - 7
-  - 10
-  version: 1.7.10
+  - 8
+  - 0
+  version: 1.8.0
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,35 +15,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-04 00:00:00 +01:00
-default_executable: 
+date: 2012-02-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        version: "2.2"
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 9
         segments: 
         - 2
         - 2
-        - 5
-        version: 2.2.5
+        - 7
+        version: 2.2.7
+  prerelease: false
+  requirement: *id001
   type: :runtime
   name: addressable
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -54,109 +45,123 @@ dependencies:
         - 1
         - 7
         version: 0.1.7
+  prerelease: false
+  requirement: *id002
   type: :runtime
   name: crack
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 19
         segments: 
         - 2
-        - 0
-        - 0
-        version: 2.0.0
+        - 8
+        version: "2.8"
+  prerelease: false
+  requirement: *id003
   type: :development
   name: rspec
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 119
+        hash: 15
         segments: 
         - 2
-        - 1
-        - 5
         - 2
-        version: 2.1.5.2
+        - 4
+        version: 2.2.4
+  prerelease: false
+  requirement: *id004
   type: :development
   name: httpclient
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 45
         segments: 
         - 0
         - 4
-        - 15
-        version: 0.4.15
+        - 17
+        version: 0.4.17
+  prerelease: false
+  requirement: *id005
   type: :development
   name: patron
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 23
         segments: 
+        - 1
         - 0
-        - 3
         - 0
-        version: 0.3.0
+        version: 1.0.0
+  prerelease: false
+  requirement: *id006
   type: :development
   name: em-http-request
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 63
         segments: 
         - 0
-        - 7
-        - 15
-        version: 0.7.15
+        - 8
+        - 0
+        version: 0.8.0
+  prerelease: false
+  requirement: *id007
   type: :development
   name: curb
-  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 19
         segments: 
         - 0
-        - 2
-        - 4
-        version: 0.2.4
+        - 3
+        - 0
+        version: 0.3.0
+  prerelease: false
+  requirement: *id008
   type: :development
   name: typhoeus
-  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 9
+        - 5
+        version: 0.9.5
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: *id009
+  type: :development
+  name: excon
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -167,12 +172,12 @@ dependencies:
         - 2
         - 2
         version: 2.2.2
+  prerelease: false
+  requirement: *id010
   type: :development
   name: minitest
-  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -183,9 +188,10 @@ dependencies:
         - 5
         - 0
         version: 3.5.0
+  prerelease: false
+  requirement: *id011
   type: :development
   name: rdoc
-  version_requirements: *id010
 description: WebMock allows stubbing HTTP requests and setting expectations on HTTP requests.
 email: 
 - bartosz.blimke@gmail.com
@@ -219,6 +225,7 @@ files:
 - lib/webmock/http_lib_adapters/em_http_request/em_http_request_0_x.rb
 - lib/webmock/http_lib_adapters/em_http_request/em_http_request_1_x.rb
 - lib/webmock/http_lib_adapters/em_http_request_adapter.rb
+- lib/webmock/http_lib_adapters/excon_adapter.rb
 - lib/webmock/http_lib_adapters/http_lib_adapter.rb
 - lib/webmock/http_lib_adapters/http_lib_adapter_registry.rb
 - lib/webmock/http_lib_adapters/httpclient_adapter.rb
@@ -226,6 +233,7 @@ files:
 - lib/webmock/http_lib_adapters/net_http_response.rb
 - lib/webmock/http_lib_adapters/patron_adapter.rb
 - lib/webmock/http_lib_adapters/typhoeus_hydra_adapter.rb
+- lib/webmock/matchers/hash_including_matcher.rb
 - lib/webmock/minitest.rb
 - lib/webmock/rack_response.rb
 - lib/webmock/request_execution_verifier.rb
@@ -256,6 +264,8 @@ files:
 - spec/acceptance/curb/curb_spec_helper.rb
 - spec/acceptance/em_http_request/em_http_request_spec.rb
 - spec/acceptance/em_http_request/em_http_request_spec_helper.rb
+- spec/acceptance/excon/excon_spec.rb
+- spec/acceptance/excon/excon_spec_helper.rb
 - spec/acceptance/httpclient/httpclient_spec.rb
 - spec/acceptance/httpclient/httpclient_spec_helper.rb
 - spec/acceptance/net_http/net_http_shared.rb
@@ -266,6 +276,7 @@ files:
 - spec/acceptance/patron/patron_spec_helper.rb
 - spec/acceptance/shared/allowing_and_disabling_net_connect.rb
 - spec/acceptance/shared/callbacks.rb
+- spec/acceptance/shared/complex_cross_concern_behaviors.rb
 - spec/acceptance/shared/enabling_and_disabling_webmock.rb
 - spec/acceptance/shared/precedence_of_stubs.rb
 - spec/acceptance/shared/request_expectations.rb
@@ -303,7 +314,6 @@ files:
 - test/test_helper.rb
 - test/test_webmock.rb
 - webmock.gemspec
-has_rdoc: true
 homepage: http://github.com/bblimke/webmock
 licenses: []
 
@@ -333,7 +343,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: webmock
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Library for stubbing HTTP requests in Ruby.
@@ -342,6 +352,8 @@ test_files:
 - spec/acceptance/curb/curb_spec_helper.rb
 - spec/acceptance/em_http_request/em_http_request_spec.rb
 - spec/acceptance/em_http_request/em_http_request_spec_helper.rb
+- spec/acceptance/excon/excon_spec.rb
+- spec/acceptance/excon/excon_spec_helper.rb
 - spec/acceptance/httpclient/httpclient_spec.rb
 - spec/acceptance/httpclient/httpclient_spec_helper.rb
 - spec/acceptance/net_http/net_http_shared.rb
@@ -352,6 +364,7 @@ test_files:
 - spec/acceptance/patron/patron_spec_helper.rb
 - spec/acceptance/shared/allowing_and_disabling_net_connect.rb
 - spec/acceptance/shared/callbacks.rb
+- spec/acceptance/shared/complex_cross_concern_behaviors.rb
 - spec/acceptance/shared/enabling_and_disabling_webmock.rb
 - spec/acceptance/shared/precedence_of_stubs.rb
 - spec/acceptance/shared/request_expectations.rb