webmock 1.5.0 → 1.6.0

data/test/test_helper.rb

@@ -11,6 +11,10 @@ class Test::Unit::TestCase
   AssertionFailedError =  Test::Unit::AssertionFailedError rescue MiniTest::Assertion
   def assert_fail(message, &block)
     e = assert_raise(AssertionFailedError, &block)
-    assert_equal(message, e.message)
+    if message.is_a?(Regexp)
+      assert_match(message, e.message)
+    else
+      assert_equal(message, e.message)
+    end
   end
 end

data/test/test_webmock.rb

@@ -46,7 +46,9 @@ class TestWebMock < Test::Unit::TestCase
   end
 
   def test_verification_that_expected_request_didnt_occur
-    assert_fail("The request GET http://www.example.com/ was expected to execute 1 time but it executed 0 times") do
+    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============================================================"
+    assert_fail(expected_message) do
       assert_requested(:get, "http://www.example.com")
     end
   end
@@ -59,7 +61,8 @@ class TestWebMock < Test::Unit::TestCase
   end
 
   def test_verification_that_non_expected_request_didnt_occur
-    assert_fail("The request GET http://www.example.com/ was expected to execute 0 times but it executed 1 time") do
+    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
       http_request(:get, "http://www.example.com/")
       assert_not_requested(:get, "http://www.example.com")
     end

data/webmock.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webmock}
-  s.version = "1.5.0"
+  s.version = "1.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bartosz Blimke"]
-  s.date = %q{2010-11-02}
+  s.date = %q{2010-11-12}
   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 = [
@@ -24,15 +24,11 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "lib/webmock.rb",
-     "lib/webmock/adapters/rspec.rb",
-     "lib/webmock/adapters/rspec/matchers.rb",
-     "lib/webmock/adapters/rspec/request_pattern_matcher.rb",
-     "lib/webmock/adapters/rspec/webmock_matcher.rb",
-     "lib/webmock/adapters/test_unit.rb",
      "lib/webmock/api.rb",
      "lib/webmock/assertion_failure.rb",
      "lib/webmock/callback_registry.rb",
      "lib/webmock/config.rb",
+     "lib/webmock/cucumber.rb",
      "lib/webmock/deprecation.rb",
      "lib/webmock/errors.rb",
      "lib/webmock/http_lib_adapters/curb.rb",
@@ -49,8 +45,14 @@ Gem::Specification.new do |s|
      "lib/webmock/response.rb",
      "lib/webmock/responses_sequence.rb",
      "lib/webmock/rspec.rb",
+     "lib/webmock/rspec/matchers.rb",
+     "lib/webmock/rspec/matchers/request_pattern_matcher.rb",
+     "lib/webmock/rspec/matchers/webmock_matcher.rb",
+     "lib/webmock/stub_registry.rb",
+     "lib/webmock/stub_request_snippet.rb",
      "lib/webmock/test_unit.rb",
      "lib/webmock/util/hash_counter.rb",
+     "lib/webmock/util/hash_keys_stringifier.rb",
      "lib/webmock/util/headers.rb",
      "lib/webmock/util/uri.rb",
      "lib/webmock/webmock.rb",
@@ -58,6 +60,7 @@ Gem::Specification.new do |s|
      "spec/curb_spec_helper.rb",
      "spec/em_http_request_spec.rb",
      "spec/em_http_request_spec_helper.rb",
+     "spec/errors_spec.rb",
      "spec/example_curl_output.txt",
      "spec/httpclient_spec.rb",
      "spec/httpclient_spec_helper.rb",
@@ -74,7 +77,10 @@ Gem::Specification.new do |s|
      "spec/request_stub_spec.rb",
      "spec/response_spec.rb",
      "spec/spec_helper.rb",
+     "spec/stub_registry_spec.rb",
+     "spec/stub_request_snippet_spec.rb",
      "spec/util/hash_counter_spec.rb",
+     "spec/util/hash_keys_stringifier_spec.rb",
      "spec/util/headers_spec.rb",
      "spec/util/uri_spec.rb",
      "spec/vendor/addressable/lib/addressable/uri.rb",
@@ -102,6 +108,7 @@ Gem::Specification.new do |s|
      "spec/curb_spec_helper.rb",
      "spec/em_http_request_spec.rb",
      "spec/em_http_request_spec_helper.rb",
+     "spec/errors_spec.rb",
      "spec/httpclient_spec.rb",
      "spec/httpclient_spec_helper.rb",
      "spec/net_http_spec.rb",
@@ -117,7 +124,10 @@ Gem::Specification.new do |s|
      "spec/request_stub_spec.rb",
      "spec/response_spec.rb",
      "spec/spec_helper.rb",
+     "spec/stub_registry_spec.rb",
+     "spec/stub_request_snippet_spec.rb",
      "spec/util/hash_counter_spec.rb",
+     "spec/util/hash_keys_stringifier_spec.rb",
      "spec/util/headers_spec.rb",
      "spec/util/uri_spec.rb",
      "spec/vendor/addressable/lib/addressable/uri.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 15
   prerelease: false
   segments: 
   - 1
-  - 5
+  - 6
   - 0
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-02 00:00:00 +00:00
+date: 2010-11-12 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -148,15 +148,11 @@ files:
 - Rakefile
 - VERSION
 - lib/webmock.rb
-- lib/webmock/adapters/rspec.rb
-- lib/webmock/adapters/rspec/matchers.rb
-- lib/webmock/adapters/rspec/request_pattern_matcher.rb
-- lib/webmock/adapters/rspec/webmock_matcher.rb
-- lib/webmock/adapters/test_unit.rb
 - lib/webmock/api.rb
 - lib/webmock/assertion_failure.rb
 - lib/webmock/callback_registry.rb
 - lib/webmock/config.rb
+- lib/webmock/cucumber.rb
 - lib/webmock/deprecation.rb
 - lib/webmock/errors.rb
 - lib/webmock/http_lib_adapters/curb.rb
@@ -173,8 +169,14 @@ files:
 - lib/webmock/response.rb
 - lib/webmock/responses_sequence.rb
 - lib/webmock/rspec.rb
+- lib/webmock/rspec/matchers.rb
+- lib/webmock/rspec/matchers/request_pattern_matcher.rb
+- lib/webmock/rspec/matchers/webmock_matcher.rb
+- lib/webmock/stub_registry.rb
+- lib/webmock/stub_request_snippet.rb
 - lib/webmock/test_unit.rb
 - lib/webmock/util/hash_counter.rb
+- lib/webmock/util/hash_keys_stringifier.rb
 - lib/webmock/util/headers.rb
 - lib/webmock/util/uri.rb
 - lib/webmock/webmock.rb
@@ -182,6 +184,7 @@ files:
 - spec/curb_spec_helper.rb
 - spec/em_http_request_spec.rb
 - spec/em_http_request_spec_helper.rb
+- spec/errors_spec.rb
 - spec/example_curl_output.txt
 - spec/httpclient_spec.rb
 - spec/httpclient_spec_helper.rb
@@ -198,7 +201,10 @@ files:
 - spec/request_stub_spec.rb
 - spec/response_spec.rb
 - spec/spec_helper.rb
+- spec/stub_registry_spec.rb
+- spec/stub_request_snippet_spec.rb
 - spec/util/hash_counter_spec.rb
+- spec/util/hash_keys_stringifier_spec.rb
 - spec/util/headers_spec.rb
 - spec/util/uri_spec.rb
 - spec/vendor/addressable/lib/addressable/uri.rb
@@ -254,6 +260,7 @@ test_files:
 - spec/curb_spec_helper.rb
 - spec/em_http_request_spec.rb
 - spec/em_http_request_spec_helper.rb
+- spec/errors_spec.rb
 - spec/httpclient_spec.rb
 - spec/httpclient_spec_helper.rb
 - spec/net_http_spec.rb
@@ -269,7 +276,10 @@ test_files:
 - spec/request_stub_spec.rb
 - spec/response_spec.rb
 - spec/spec_helper.rb
+- spec/stub_registry_spec.rb
+- spec/stub_request_snippet_spec.rb
 - spec/util/hash_counter_spec.rb
+- spec/util/hash_keys_stringifier_spec.rb
 - spec/util/headers_spec.rb
 - spec/util/uri_spec.rb
 - spec/vendor/addressable/lib/addressable/uri.rb

data/lib/webmock/adapters/rspec.rb

@@ -1,33 +0,0 @@
-require 'webmock'
-
-# RSpec 1.x and 2.x compatibility
-if defined?(RSpec)
-  RSPEC_NAMESPACE = RSPEC_CONFIGURER = RSpec
-elsif defined?(Spec)
-  RSPEC_NAMESPACE = Spec
-  RSPEC_CONFIGURER = Spec::Runner
-else  
-  begin
-    require 'rspec'
-    RSPEC_NAMESPACE = RSPEC_CONFIGURER = RSpec
-  rescue LoadError
-    require 'spec'
-    RSPEC_NAMESPACE = Spec
-    RSPEC_CONFIGURER = Spec::Runner
-  end
-end
-
-require 'webmock/adapters/rspec/request_pattern_matcher'
-require 'webmock/adapters/rspec/webmock_matcher'
-require 'webmock/adapters/rspec/matchers'
-  
-RSPEC_CONFIGURER.configure { |config|
-
-  config.include WebMock::Matchers
-
-  config.before :each do
-    WebMock.reset_webmock
-  end
-}
-
-WebMock::AssertionFailure.error_class = RSPEC_NAMESPACE::Expectations::ExpectationNotMetError

data/lib/webmock/adapters/test_unit.rb

@@ -1,19 +0,0 @@
-require 'test/unit'
-require 'webmock'
-
-class Test::Unit::TestCase
-  alias setup_without_webmock setup
-  def setup
-    WebMock.reset_webmock
-    @original_allow_net_connect = WebMock.net_connect_allowed?
-    WebMock.disable_net_connect!
-  end
-
-  alias teardown_without_webmock teardown
-  def teardown
-    @original_allow_net_connect ? WebMock.allow_net_connect! : WebMock.disable_net_connect!
-  end
-end
-
-
-WebMock::AssertionFailure.error_class = Test::Unit::AssertionFailedError rescue MiniTest::Assertion # ruby1.9 compat