webmock 1.8.6 → 3.14.0

data/spec/unit/util/version_checker_spec.rb

@@ -4,55 +4,61 @@ module WebMock
   describe VersionChecker do
     it 'prints a warning if the major version is too low' do
       checker = VersionChecker.new('foo', '0.7.3', '1.0.0', '1.1')
-      Kernel.should_receive(:warn).with("\e[31mYou are using foo 0.7.3. WebMock supports version >= 1.0.0, < 1.2.\e[0m")
+      expect(Kernel).to receive(:warn).with("\e[31mYou are using foo 0.7.3. WebMock supports version >= 1.0.0, < 1.2.\e[0m")
       checker.check_version!
     end
 
     it 'prints a warning if the minor version is too low' do
       checker = VersionChecker.new('foo', '1.0.99', '1.1.3', '1.2')
-      Kernel.should_receive(:warn).with("\e[31mYou are using foo 1.0.99. WebMock supports version >= 1.1.3, < 1.3.\e[0m")
+      expect(Kernel).to receive(:warn).with("\e[31mYou are using foo 1.0.99. WebMock supports version >= 1.1.3, < 1.3.\e[0m")
       checker.check_version!
     end
 
     it 'prints a warning if the patch version is too low' do
       checker = VersionChecker.new('foo', '1.0.8', '1.0.10', '1.2')
-      Kernel.should_receive(:warn).with("\e[31mYou are using foo 1.0.8. WebMock supports version >= 1.0.10, < 1.3.\e[0m")
+      expect(Kernel).to receive(:warn).with("\e[31mYou are using foo 1.0.8. WebMock supports version >= 1.0.10, < 1.3.\e[0m")
       checker.check_version!
     end
 
     it 'prints a warning if the patch version is too low and max version is not specified' do
       checker = VersionChecker.new('foo', '1.0.8', '1.0.10')
-      Kernel.should_receive(:warn).with("\e[31mYou are using foo 1.0.8. WebMock supports version >= 1.0.10.\e[0m")
+      expect(Kernel).to receive(:warn).with("\e[31mYou are using foo 1.0.8. WebMock supports version >= 1.0.10.\e[0m")
       checker.check_version!
     end
 
     it 'prints a warning if the major version is too high' do
       checker = VersionChecker.new('foo', '2.0.0', '1.0.0', '1.1')
-      Kernel.should_receive(:warn).with(/may not work with this version/)
+      expect(Kernel).to receive(:warn).with(/may not work with this version/)
       checker.check_version!
     end
 
     it 'prints a warning if the minor version is too high' do
       checker = VersionChecker.new('foo', '1.2.0', '1.0.0', '1.1')
-      Kernel.should_receive(:warn).with(/may not work with this version/)
+      expect(Kernel).to receive(:warn).with(/may not work with this version/)
       checker.check_version!
     end
 
     it 'does not raise an error or print a warning when the major version is between the min and max' do
       checker = VersionChecker.new('foo', '2.0.0', '1.0.0', '3.0')
-      Kernel.should_not_receive(:warn)
+      expect(Kernel).not_to receive(:warn)
       checker.check_version!
     end
 
     it 'does not raise an error or print a warning when the min_patch is 0.6.5, the max_minor is 0.7 and the version is 0.7.3' do
       checker = VersionChecker.new('foo', '0.7.3', '0.6.5', '0.7')
-      Kernel.should_not_receive(:warn)
+      expect(Kernel).not_to receive(:warn)
       checker.check_version!
     end
 
     it 'does not raise an error or print a warning when the min_patch is 0.6.5, the max_minor is not specified and the version is 0.8.3' do
       checker = VersionChecker.new('foo', '0.8.3', '0.6.5')
-      Kernel.should_not_receive(:warn)
+      expect(Kernel).not_to receive(:warn)
+      checker.check_version!
+    end
+
+    it "prints warning if version is unsupported" do
+      checker = VersionChecker.new('foo', '2.0.0', '1.0.0', '3.0', ['2.0.0'])
+      expect(Kernel).to receive(:warn).with(%r{You are using foo 2.0.0. WebMock does not support this version. WebMock supports versions >= 1.0.0, < 3.1, except versions 2.0.0.})
       checker.check_version!
     end
   end

data/spec/unit/webmock_spec.rb

@@ -1,7 +1,60 @@
 require 'spec_helper'
 
-describe "WebMock version" do
-  it "should report version" do
-    WebMock.version.should == WebMock::VERSION
+describe "WebMock" do
+
+  describe ".version" do
+    it "should report version" do
+      expect(WebMock.version).to eq(WebMock::VERSION)
+    end
+
+    it "should not require safe_yaml" do
+      expect(defined?SafeYAML).to eq(nil)
+    end
+
+    it "should alias enable_net_connect! to allow_net_connect!" do
+      expect(WebMock.method(:enable_net_connect!)).to eq(WebMock.method(:allow_net_connect!))
+    end
+
+    it "should alias disallow_net_connect! to disable_net_connect!" do
+      expect(WebMock.method(:disallow_net_connect!)).to eq(WebMock.method(:disable_net_connect!))
+    end
+  end
+
+  describe ".net_connect_allowed?" do
+    context 'enabled globally' do
+      before do
+        WebMock.enable_net_connect!
+      end
+
+      context 'without arguments' do
+        it 'returns WebMock::Config.instance.allow_net_connect' do
+          expect(WebMock.net_connect_allowed?).to eql(true)
+        end
+      end
+    end
+
+    context 'disabled with allowed remote string' do
+      before do
+        WebMock.disable_net_connect!(allow: "http://192.168.64.2:20031")
+      end
+
+      context 'without arguments' do
+        it 'returns WebMock::Config.instance.allow_net_connect' do
+          expect(WebMock.net_connect_allowed?).to eql(false)
+        end
+      end
+    end
+
+    context 'disabled globally' do
+      before do
+        WebMock.disable_net_connect!
+      end
+
+      context 'without arguments' do
+        it 'returns WebMock::Config.instance.allow_net_connect' do
+          expect(WebMock.net_connect_allowed?).to eql(false)
+        end
+      end
+    end
   end
-end
+end

data/test/http_request.rb

@@ -17,8 +17,8 @@ module HttpRequestTestHelper
       http.request(req, options[:body])
     }
     OpenStruct.new({
-      :body => response.body,
-      :headers => response,
-      :status => response.code })
+      body: response.body,
+      headers: response,
+      status: response.code })
   end
 end

data/test/shared_test.rb

@@ -9,8 +9,19 @@ module SharedTest
     @stub_https = stub_http_request(:any, "https://www.example.com")
   end
 
+  def test_assert_requested_with_stub_and_block_raises_error
+    assert_raises ArgumentError do
+      assert_requested(@stub_http) {}
+    end
+  end
+
+  def test_assert_not_requested_with_stub_and_block_raises_error
+    assert_raises ArgumentError do
+      assert_not_requested(@stub_http) {}
+    end
+  end
+
   def test_error_on_non_stubbed_request
-    default_ruby_headers = (RUBY_VERSION >= "1.9.1") ? "{'Accept'=>'*/*', 'User-Agent'=>'Ruby'}" : "{'Accept'=>'*/*'}"
     assert_raise_with_message(WebMock::NetConnectNotAllowedError, %r{Real HTTP connections are disabled. Unregistered request: GET http://www.example.net/ with headers}) do
       http_request(:get, "http://www.example.net/")
     end
@@ -18,27 +29,27 @@ module SharedTest
 
   def test_verification_that_expected_request_occured
     http_request(:get, "http://www.example.com/")
-    assert_requested(:get, "http://www.example.com", :times => 1)
+    assert_requested(:get, "http://www.example.com", times: 1)
     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, 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============================================================"
+    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
 
-  def test_verification_that_expected_request_didnt_occur
+  def test_verification_that_expected_stub_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============================================================"
+    expected_message += "\n\nThe following requests were made:\n\nNo requests were made.\n============================================================"
     assert_fail(expected_message) do
       assert_requested(@stub_http)
     end
@@ -46,31 +57,52 @@ module SharedTest
 
   def test_verification_that_expected_request_occured_with_body_and_headers
     http_request(:get, "http://www.example.com/",
-      :body => "abc", :headers => {'A' => 'a'})
+      body: "abc", headers: {'A' => 'a'})
     assert_requested(:get, "http://www.example.com",
-      :body => "abc", :headers => {'A' => 'a'})
+      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"]}))
+    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"]}))
+      query: hash_including({"a" => ["b", "c"]}))
+  end
+
+  def test_verification_that_expected_request_not_occured_with_query_params
+    stub_request(:any, 'http://www.example.com').with(query: hash_including(a: ['b', 'c']))
+    stub_request(:any, 'http://www.example.com').with(query: hash_excluding(a: ['b', 'c']))
+    http_request(:get, 'http://www.example.com/?a[]=b&a[]=c&x=1')
+    assert_not_requested(:get, 'http://www.example.com', query: hash_excluding('a' => ['b', 'c']))
+  end
+
+  def test_verification_that_expected_request_occured_with_excluding_query_params
+    stub_request(:any, 'http://www.example.com').with(query: hash_excluding('a' => ['b', 'c']))
+    http_request(:get, 'http://www.example.com/?a[]=x&a[]=y&x=1')
+    assert_requested(:get, 'http://www.example.com', query: hash_excluding('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============================================================)
+    expected_message = %r(The request GET http://www.example.com/ was not expected to execute 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
   end
 
+  def test_refute_requested_alias
+    expected_message = %r(The request GET http://www.example.com/ was not expected to execute 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/")
+      refute_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============================================================)
+    expected_message = %r(The request ANY http://www.example.com/ was not expected to execute 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
+end

data/test/test_helper.rb

@@ -9,7 +9,7 @@ require 'test/unit'
 class Test::Unit::TestCase
   AssertionFailedError =  Test::Unit::AssertionFailedError rescue MiniTest::Assertion
   def assert_raise_with_message(e, message, &block)
-    e = assert_raise(e, &block)
+    e = assert_raises(e, &block)
     if message.is_a?(Regexp)
       assert_match(message, e.message)
     else

data/test/test_webmock.rb

@@ -3,4 +3,10 @@ require File.expand_path(File.dirname(__FILE__) + '/shared_test')
 
 class TestWebMock < Test::Unit::TestCase
   include SharedTest
+
+  def teardown
+    # Ensure global Test::Unit teardown was called
+    assert_empty WebMock::RequestRegistry.instance.requested_signatures.hash
+    assert_empty WebMock::StubRegistry.instance.request_stubs
+  end
 end

data/webmock.gemspec

@@ -11,22 +11,41 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://github.com/bblimke/webmock'
   s.summary     = %q{Library for stubbing HTTP requests in Ruby.}
   s.description = %q{WebMock allows stubbing HTTP requests and setting expectations on HTTP requests.}
+  s.license     = "MIT"
 
-  s.rubyforge_project = 'webmock'
+  s.metadata = {
+    'bug_tracker_uri'   => 'https://github.com/bblimke/webmock/issues',
+    'changelog_uri'     => "https://github.com/bblimke/webmock/blob/v#{s.version}/CHANGELOG.md",
+    'documentation_uri' => "https://www.rubydoc.info/gems/webmock/#{s.version}",
+    'source_code_uri'   => "https://github.com/bblimke/webmock/tree/v#{s.version}",
+    'wiki_uri'          => 'https://github.com/bblimke/webmock/wiki'
+  }
 
-  s.add_dependency 'addressable', '>= 2.2.7'
-  s.add_dependency 'crack', '>=0.1.7'
+  s.required_ruby_version = '>= 2.0'
 
-  s.add_development_dependency 'rspec',           '~> 2.8'
+  s.add_dependency 'addressable', '>= 2.8.0'
+  s.add_dependency 'crack', '>= 0.3.2'
+  s.add_dependency 'hashdiff', ['>= 0.4.0', '< 2.0.0']
+
+  unless RUBY_PLATFORM =~ /java/
+    s.add_development_dependency 'patron',   '>= 0.4.18'
+    s.add_development_dependency 'curb',     '>= 0.7.16'
+    s.add_development_dependency 'typhoeus', '>= 0.5.0'
+  end
+
+  s.add_development_dependency 'http',            '>= 0.8.0'
+  s.add_development_dependency 'manticore',       '>= 0.5.1' if RUBY_PLATFORM =~ /java/
+  s.add_development_dependency 'rack',            ((RUBY_VERSION < '2.2.2') ? '1.6.0' : '> 1.6')
+  s.add_development_dependency 'rspec',           '>= 3.1.0'
   s.add_development_dependency 'httpclient',      '>= 2.2.4'
-  s.add_development_dependency 'patron',          '>= 0.4.18' unless RUBY_PLATFORM =~ /java/
   s.add_development_dependency 'em-http-request', '>= 1.0.2'
-  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.3' unless RUBY_PLATFORM =~ /java/
-  s.add_development_dependency 'excon',           '>= 0.11.0'
-  s.add_development_dependency 'minitest',        '>= 2.2.2'
-  s.add_development_dependency 'rdoc',            ((RUBY_VERSION == '1.8.6') ? '<= 3.5.0' : '>3.5.0')
+  s.add_development_dependency 'em-synchrony',    '>= 1.0.0'
+  s.add_development_dependency 'excon',           '>= 0.27.5'
+  s.add_development_dependency 'async-http',      '>= 0.48.0'
+  s.add_development_dependency 'minitest',        '>= 5.0.0'
+  s.add_development_dependency 'test-unit',       '>= 3.0.0'
+  s.add_development_dependency 'rdoc',            '>  3.5.0'
+  s.add_development_dependency 'webrick'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")