webmock 2.0.3 → 2.1.0

data/spec/unit/stub_request_snippet_spec.rb

@@ -4,7 +4,7 @@ describe WebMock::StubRequestSnippet do
   describe "to_s" do
     describe "GET" do
       before(:each) do
-        @request_signature = WebMock::RequestSignature.new(:get, "www.example.com/?a=b&c=d", :headers => {})
+        @request_signature = WebMock::RequestSignature.new(:get, "www.example.com/?a=b&c=d", headers: {})
       end
 
       it "should print stub request snippet with url with params and method and empty successful response" do
@@ -53,7 +53,7 @@ describe WebMock::StubRequestSnippet do
       it "should not print to_return part if not wanted" do
         expected = 'stub_request(:get, "http://www.example.com/").'+
         "\n  with(:body => \"abcdef\")"
-        stub = WebMock::RequestStub.new(:get, "www.example.com").with(:body => "abcdef").to_return(:body => "hello")
+        stub = WebMock::RequestStub.new(:get, "www.example.com").with(body: "abcdef").to_return(body: "hello")
         expect(WebMock::StubRequestSnippet.new(stub).to_s(false)).to eq(expected)
       end
     end
@@ -63,8 +63,8 @@ describe WebMock::StubRequestSnippet do
       let(:multipart_form_body) { 'complicated stuff--ABC123--goes here' }
       it "should print stub request snippet with body as a hash using rails conventions on form posts" do
         @request_signature = WebMock::RequestSignature.new(:post, "www.example.com",
-                   :headers => {'Content-Type' => 'application/x-www-form-urlencoded'},
-                   :body => form_body)
+                   headers: {'Content-Type' => 'application/x-www-form-urlencoded'},
+                   body: form_body)
         @request_stub = WebMock::RequestStub.from_request_signature(@request_signature)
         expected = <<-STUB
 stub_request(:post, "http://www.example.com/").
@@ -77,8 +77,8 @@ stub_request(:post, "http://www.example.com/").
 
       it "should print stub request snippet leaving body as string when not a urlencoded form" do
         @request_signature = WebMock::RequestSignature.new(:post, "www.example.com",
-                   :headers => {'Content-Type' => 'multipart/form-data; boundary=ABC123'},
-                   :body => multipart_form_body)
+                   headers: {'Content-Type' => 'multipart/form-data; boundary=ABC123'},
+                   body: multipart_form_body)
         @request_stub = WebMock::RequestStub.from_request_signature(@request_signature)
         expected = <<-STUB
 stub_request(:post, "http://www.example.com/").

data/spec/unit/util/hash_keys_stringifier_spec.rb

@@ -4,10 +4,10 @@ describe WebMock::Util::HashKeysStringifier do
 
   it "should recursively stringify all symbol keys" do
     hash = {
-      :a => {
-        :b => [
+      a: {
+        b: [
           {
-            :c => [{:d => "1"}]
+            c: [{d: "1"}]
           }
         ]
       }
@@ -21,7 +21,7 @@ describe WebMock::Util::HashKeysStringifier do
         ]
       }
     }
-    expect(WebMock::Util::HashKeysStringifier.stringify_keys!(hash, :deep => true)).to eq(stringified)
+    expect(WebMock::Util::HashKeysStringifier.stringify_keys!(hash, deep: true)).to eq(stringified)
   end
 
 end

data/spec/unit/util/query_mapper_spec.rb

@@ -6,7 +6,7 @@ describe WebMock::Util::QueryMapper do
   context '#query_to_values' do
     it 'should raise on invalid notation' do
       query = 'a=&b=c'
-      expect { subject.query_to_values(query, {:notation => 'foo'}) }.to raise_error(
+      expect { subject.query_to_values(query, {notation: 'foo'}) }.to raise_error(
         ArgumentError,
         'Invalid notation. Must be one of: [:flat, :dot, :subscript, :flat_array].'
       )
@@ -77,7 +77,7 @@ describe WebMock::Util::QueryMapper do
       expect(subject.to_query('a', {'key' => 'value'})).to eq('a[key]=value')
     end
     it 'should transform hash value with keys that are symbols' do
-      expect(subject.to_query('a', {:key => 'value'})).to eq('a[key]=value')
+      expect(subject.to_query('a', {key: 'value'})).to eq('a[key]=value')
     end
     it 'should transform array value' do
       expect(subject.to_query('a', ['b', 'c'])).to eq('a[0]=b&a[1]=c')

data/spec/unit/util/uri_spec.rb

@@ -206,7 +206,7 @@ describe WebMock::Util::URI do
       it "should successfully handle repeated paramters" do
         uri_string = "http://www.example.com:80/path?target=host1&target=host2"
         uri = WebMock::Util::URI.normalize_uri(uri_string)
-        expect(WebMock::Util::QueryMapper.query_to_values(uri.query, :notation => WebMock::Config.instance.query_values_notation)).to eq([['target', 'host1'], ['target', 'host2']])
+        expect(WebMock::Util::QueryMapper.query_to_values(uri.query, notation: WebMock::Config.instance.query_values_notation)).to eq([['target', 'host1'], ['target', 'host2']])
       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

@@ -30,13 +30,13 @@ 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
 
@@ -58,16 +58,16 @@ 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_non_expected_request_didnt_occur

data/webmock.gemspec

@@ -31,9 +31,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'typhoeus',        '>= 0.5.0' unless RUBY_PLATFORM =~ /java/
   s.add_development_dependency 'manticore',       '>= 0.5.1' if RUBY_PLATFORM =~ /java/
   s.add_development_dependency 'excon',           '>= 0.27.5'
-  s.add_development_dependency 'minitest',        '~> 5.0.0'
-  s.add_development_dependency 'rdoc',            '>3.5.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 'rack'
+  s.add_development_dependency 'simplecov'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webmock
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Bartosz Blimke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-20 00:00:00.000000000 Z
+date: 2016-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -182,16 +182,30 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +234,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: WebMock allows stubbing HTTP requests and setting expectations on HTTP
   requests.
 email: