webmock 0.7.3 → 0.8.0

data/test/test_webmock.rb

@@ -1,9 +1,9 @@
 require File.join(File.dirname(__FILE__), "test_helper")
 
-require 'ostruct' 
- 
+require 'ostruct'
+
 class TestWebMock < Test::Unit::TestCase
-    
+
   def http_request(method, uri, options = {})
     begin
       uri = URI.parse(uri)
@@ -25,36 +25,42 @@ class TestWebMock < Test::Unit::TestCase
       :status => response.code })
   end
 
-  
+
   def setup
     super
-    stub_http_request(:any, "http://www.google.com")
-    stub_http_request(:any, "https://www.google.com")
+    stub_http_request(:any, "http://www.example.com")
+    stub_http_request(:any, "https://www.example.com")
   end
-    
+
+  def test_error_on_non_stubbed_request
+    assert_fail("Real HTTP connections are disabled. Unregistered request: GET http://www.example.net/") do
+      http_request(:get, "http://www.example.net/")
+    end
+  end
+
   def test_verification_that_expected_request_occured
-    http_request(:get, "http://www.google.com/")
-    assert_requested(:get, "http://www.google.com", :times => 1)
-    assert_requested(:get, "http://www.google.com")
+    http_request(:get, "http://www.example.com/")
+    assert_requested(:get, "http://www.example.com", :times => 1)
+    assert_requested(:get, "http://www.example.com")
   end
-  
+
   def test_verification_that_expected_request_didnt_occur
-    assert_fail("The request GET http://www.google.com/ was expected to execute 1 time but it executed 0 times") do
-      assert_requested(:get, "http://www.google.com")
+    assert_fail("The request GET http://www.example.com/ was expected to execute 1 time but it executed 0 times") do
+      assert_requested(:get, "http://www.example.com")
     end
-  end  
+  end
 
   def test_verification_that_expected_request_occured_with_body_and_headers
-    http_request(:get, "http://www.google.com/",
+    http_request(:get, "http://www.example.com/",
       :body => "abc", :headers => {'A' => 'a'})
-    assert_requested(:get, "http://www.google.com",
+    assert_requested(:get, "http://www.example.com",
       :body => "abc", :headers => {'A' => 'a'})
   end
 
   def test_verification_that_non_expected_request_didnt_occur
-    assert_fail("The request GET http://www.google.com/ was expected to execute 0 times but it executed 1 time") do
-      http_request(:get, "http://www.google.com/")
-      assert_not_requested(:get, "http://www.google.com")
+    assert_fail("The request GET http://www.example.com/ was expected to execute 0 times but it executed 1 time") do
+      http_request(:get, "http://www.example.com/")
+      assert_not_requested(:get, "http://www.example.com")
     end
   end
 

data/webmock.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webmock}
-  s.version = "0.7.3"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bartosz Blimke"]
-  s.date = %q{2009-11-24}
+  s.date = %q{2009-12-11}
   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 = [
@@ -31,7 +31,9 @@ Gem::Specification.new do |s|
      "lib/webmock/adapters/test_unit.rb",
      "lib/webmock/config.rb",
      "lib/webmock/errors.rb",
+     "lib/webmock/http_lib_adapters/httpclient.rb",
      "lib/webmock/http_lib_adapters/net_http.rb",
+     "lib/webmock/request.rb",
      "lib/webmock/request_execution_verifier.rb",
      "lib/webmock/request_profile.rb",
      "lib/webmock/request_registry.rb",
@@ -44,7 +46,10 @@ Gem::Specification.new do |s|
      "lib/webmock/util/headers.rb",
      "lib/webmock/util/uri.rb",
      "lib/webmock/webmock.rb",
+     "spec/httpclient_spec.rb",
+     "spec/httpclient_spec_helper.rb",
      "spec/net_http_spec.rb",
+     "spec/net_http_spec_helper.rb",
      "spec/other_net_http_libs_spec.rb",
      "spec/request_execution_verifier_spec.rb",
      "spec/request_profile_spec.rb",
@@ -91,7 +96,10 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Library for stubbing HTTP requests in Ruby.}
   s.test_files = [
-    "spec/net_http_spec.rb",
+    "spec/httpclient_spec.rb",
+     "spec/httpclient_spec_helper.rb",
+     "spec/net_http_spec.rb",
+     "spec/net_http_spec_helper.rb",
      "spec/other_net_http_libs_spec.rb",
      "spec/request_execution_verifier_spec.rb",
      "spec/request_profile_spec.rb",
@@ -127,13 +135,16 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<addressable>, [">= 2.1.1"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<httpclient>, [">= 2.1.5.2"])
     else
       s.add_dependency(%q<addressable>, [">= 2.1.1"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<httpclient>, [">= 2.1.5.2"])
     end
   else
     s.add_dependency(%q<addressable>, [">= 2.1.1"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<httpclient>, [">= 2.1.5.2"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-24 00:00:00 +00:00
+date: 2009-12-11 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.9
     version: 
+- !ruby/object:Gem::Dependency 
+  name: httpclient
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.1.5.2
+    version: 
 description: WebMock allows stubbing HTTP requests and setting expectations on HTTP requests.
 email: bartosz.blimke@gmail.com
 executables: []
@@ -56,7 +66,9 @@ files:
 - lib/webmock/adapters/test_unit.rb
 - lib/webmock/config.rb
 - lib/webmock/errors.rb
+- lib/webmock/http_lib_adapters/httpclient.rb
 - lib/webmock/http_lib_adapters/net_http.rb
+- lib/webmock/request.rb
 - lib/webmock/request_execution_verifier.rb
 - lib/webmock/request_profile.rb
 - lib/webmock/request_registry.rb
@@ -69,7 +81,10 @@ files:
 - lib/webmock/util/headers.rb
 - lib/webmock/util/uri.rb
 - lib/webmock/webmock.rb
+- spec/httpclient_spec.rb
+- spec/httpclient_spec_helper.rb
 - spec/net_http_spec.rb
+- spec/net_http_spec_helper.rb
 - spec/other_net_http_libs_spec.rb
 - spec/request_execution_verifier_spec.rb
 - spec/request_profile_spec.rb
@@ -138,7 +153,10 @@ signing_key:
 specification_version: 3
 summary: Library for stubbing HTTP requests in Ruby.
 test_files: 
+- spec/httpclient_spec.rb
+- spec/httpclient_spec_helper.rb
 - spec/net_http_spec.rb
+- spec/net_http_spec_helper.rb
 - spec/other_net_http_libs_spec.rb
 - spec/request_execution_verifier_spec.rb
 - spec/request_profile_spec.rb