webmock 1.15.0 → 1.15.2

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.15.2
+
+*  Fixed `hash_including` to accept a splat of solitary keys.
+
+   Thanks to [Tamir Duberstein](https://github.com/tamird) and [https://github.com/strongriley](https://github.com/strongriley)
+
 ## 1.15.0
 
 * Excon >= 0.27.5 compatibility.

data/README.md

@@ -862,6 +862,8 @@ People who submitted patches and new features or suggested improvements. Many th
 * Florian Dütsch
 * Manuel Meurer
 * Brian D. Burns
+* Riley Strong
+* Tamir Duberstein
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/lib/webmock/api.rb

@@ -17,7 +17,6 @@ module WebMock
       alias :request :a_request
     end
 
-
     def assert_requested(*args, &block)
       if not args[0].is_a?(WebMock::RequestStub)
         args = convert_uri_method_and_options_to_request_and_options(*args, &block)
@@ -36,11 +35,9 @@ module WebMock
       assert_request_not_requested(*args)
     end
 
-    def hash_including(expected)
-      if defined?(::RSpec::Mocks::ArgumentMatchers::HashIncludingMatcher)
-        RSpec::Mocks::ArgumentMatchers::HashIncludingMatcher.new(expected)
-      elsif defined?(::Spec::Mocks::ArgumentMatchers::HashIncludingMatcher)
-        Spec::Mocks::ArgumentMatchers::HashIncludingMatcher.new(expected)
+    def hash_including(*expected)
+      if defined?(super)
+        super
       else
         WebMock::Matchers::HashIncludingMatcher.new(expected)
       end

data/lib/webmock/version.rb

@@ -1,3 +1,3 @@
 module WebMock
-  VERSION = '1.15.0' unless defined?(::WebMock::VERSION)
+  VERSION = '1.15.2' unless defined?(::WebMock::VERSION)
 end

data/spec/unit/errors_spec.rb

@@ -29,11 +29,11 @@ describe "errors" do
       end
 
       it "should not be caught by a rescue block without arguments" do
-        request_signature = mock(:to_s => "aaa")
-        request_stub = mock
-        WebMock::RequestStub.stub!(:from_request_signature).and_return(request_stub)
-        WebMock::StubRequestSnippet.stub!(:new).
-          with(request_stub).and_return(mock(:to_s => "bbb"))
+        request_signature = double(:to_s => "aaa")
+        request_stub = double
+        WebMock::RequestStub.stub(:from_request_signature).and_return(request_stub)
+        WebMock::StubRequestSnippet.stub(:new).
+          with(request_stub).and_return(double(:to_s => "bbb"))
 
         exception = WebMock::NetConnectNotAllowedError.new(request_signature)
 

data/spec/unit/include_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe WebMock::API do
+  describe '#hash_including' do
+    subject { klass.new.hash_including(*args) }
+
+    let(:args) { %w(foo bar) }
+
+    context 'when mixed into a class that does not define `hash_including`' do
+      let(:klass) do
+        Class.new do
+          include WebMock::API
+        end
+      end
+
+      it 'uses WebMock::Matchers::HashIncludingMatcher' do
+        expect(subject).to be_a(WebMock::Matchers::HashIncludingMatcher)
+      end
+    end
+
+    context 'when mixed into a class with a parent that defines `hash_including`' do
+      let(:klass) do
+        Class.new(
+          Class.new do
+            def hash_including(*args)
+              args
+            end
+          end
+        ) { include WebMock::API }
+      end
+
+      it 'uses super and passes the args untampered' do
+        expect(subject).to eq(args)
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 47
   prerelease: 
   segments: 
   - 1
   - 15
-  - 0
-  version: 1.15.0
+  - 2
+  version: 1.15.2
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-10-15 00:00:00 Z
+date: 2013-10-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable
@@ -294,6 +294,7 @@ files:
 - spec/unit/errors_spec.rb
 - spec/unit/http_lib_adapters/http_lib_adapter_registry_spec.rb
 - spec/unit/http_lib_adapters/http_lib_adapter_spec.rb
+- spec/unit/include_spec.rb
 - spec/unit/rack_response_spec.rb
 - spec/unit/request_execution_verifier_spec.rb
 - spec/unit/request_pattern_spec.rb
@@ -383,6 +384,7 @@ test_files:
 - spec/unit/errors_spec.rb
 - spec/unit/http_lib_adapters/http_lib_adapter_registry_spec.rb
 - spec/unit/http_lib_adapters/http_lib_adapter_spec.rb
+- spec/unit/include_spec.rb
 - spec/unit/rack_response_spec.rb
 - spec/unit/request_execution_verifier_spec.rb
 - spec/unit/request_pattern_spec.rb