webmock 2.0.3 → 2.1.0

data/spec/acceptance/net_http/net_http_spec_helper.rb

@@ -37,10 +37,10 @@ module NetHTTPSpecHelper
     headers = {}
     response.each_header {|name, value| headers[name] = value}
     OpenStruct.new({
-      :body => response.body,
-      :headers => WebMock::Util::Headers.normalize_headers(headers),
-      :status => response.code,
-      :message => response.message
+      body: response.body,
+      headers: WebMock::Util::Headers.normalize_headers(headers),
+      status: response.code,
+      message: response.message
     })
   end
 

data/spec/acceptance/net_http/real_net_http_spec.rb

@@ -6,7 +6,7 @@ require 'stringio'
 require 'acceptance/net_http/net_http_shared'
 require 'support/webmock_server'
 
-describe "Real Net:HTTP without webmock", :without_webmock => true do
+describe "Real Net:HTTP without webmock", without_webmock: true do
   before(:all) do
     raise "WebMock has no access here!!!" if defined?(WebMock::NetHTTPUtility)
     WebMockServer.instance.start

data/spec/acceptance/patron/patron_spec.rb

@@ -32,7 +32,7 @@ unless RUBY_PLATFORM =~ /java/
         end
 
         it "should work with get_file" do
-          stub_request(:get, "www.example.com").to_return(:body => "abc")
+          stub_request(:get, "www.example.com").to_return(body: "abc")
           @sess.get_file("/", @file_path)
           expect(File.read(@file_path)).to eq("abc")
         end
@@ -53,18 +53,18 @@ unless RUBY_PLATFORM =~ /java/
 
         it "should work with put_file" do
           File.open(@file_path, "w") {|f| f.write "abc"}
-          stub_request(:put, "www.example.com").with(:body => "abc")
+          stub_request(:put, "www.example.com").with(body: "abc")
           @sess.put_file("/", @file_path)
         end
 
         it "should work with post_file" do
           File.open(@file_path, "w") {|f| f.write "abc"}
-          stub_request(:post, "www.example.com").with(:body => "abc")
+          stub_request(:post, "www.example.com").with(body: "abc")
           @sess.post_file("/", @file_path)
         end
 
         it "should raise same error as Patron if file is not readable for post request" do
-          stub_request(:post, "www.example.com").with(:body => "abc")
+          stub_request(:post, "www.example.com").with(body: "abc")
           expect {
             @sess.post_file("/", "/path/to/non/existing/file")
           }.to raise_error(ArgumentError, "Unable to open specified file.")
@@ -82,7 +82,7 @@ unless RUBY_PLATFORM =~ /java/
       end
 
       it "should work with WebDAV copy request" do
-        stub_request(:copy, "www.example.com/abc").with(:headers => {'Destination' => "/def"})
+        stub_request(:copy, "www.example.com/abc").with(headers: {'Destination' => "/def"})
         @sess.copy("/abc", "/def")
       end
 
@@ -97,22 +97,22 @@ unless RUBY_PLATFORM =~ /java/
 
           it "should encode body with default encoding" do
             stub_request(:get, "www.example.com").
-              to_return(:body => "Øl")
+              to_return(body: "Øl")
 
             expect(@sess.get("").body.encoding).to eq(Encoding::UTF_8)
           end
 
           it "should encode body to default internal" do
             stub_request(:get, "www.example.com").
-              to_return(:headers => {'Content-Type' => 'text/html; charset=iso-8859-1'},
-                        :body => "Øl".encode("iso-8859-1"))
+              to_return(headers: {'Content-Type' => 'text/html; charset=iso-8859-1'},
+                        body: "Øl".encode("iso-8859-1"))
 
             expect(@sess.get("").body.encoding).to eq(Encoding.default_internal)
           end
 
           it "should encode body based on encoding-attribute in body" do
             stub_request(:get, "www.example.com").
-              to_return(:body => "<?xml encoding=\"iso-8859-1\">Øl</xml>".encode("iso-8859-1"))
+              to_return(body: "<?xml encoding=\"iso-8859-1\">Øl</xml>".encode("iso-8859-1"))
 
             expect(@sess.get("").body.encoding).to eq(Encoding::ISO_8859_1)
           end
@@ -120,7 +120,7 @@ unless RUBY_PLATFORM =~ /java/
 
           it "should encode body based on Session#default_response_charset" do
             stub_request(:get, "www.example.com").
-              to_return(:body => "Øl".encode("iso-8859-1"))
+              to_return(body: "Øl".encode("iso-8859-1"))
 
             @sess.default_response_charset = "iso-8859-1"
 

data/spec/acceptance/patron/patron_spec_helper.rb

@@ -18,7 +18,7 @@ module PatronSpecHelper
     uri = "#{uri.path}#{uri.query ? '?' : ''}#{uri.query}"
     uri.gsub!(' ','%20')
     response = sess.request(method, uri, options[:headers] || {}, {
-      :data => options[:body]
+      data: options[:body]
     })
     headers = {}
     if response.headers
@@ -32,10 +32,10 @@ module PatronSpecHelper
     message = response.status_line.match(status_line_pattern)[3] || ""
 
     OpenStruct.new({
-      :body => response.body,
-      :headers => WebMock::Util::Headers.normalize_headers(headers),
-      :status => response.status.to_s,
-      :message => message
+      body: response.body,
+      headers: WebMock::Util::Headers.normalize_headers(headers),
+      status: response.status.to_s,
+      message: message
     })
   end
 

data/spec/acceptance/shared/allowing_and_disabling_net_connect.rb

@@ -1,6 +1,6 @@
 shared_context "allowing and disabling net connect" do |*adapter_info|
   describe "when net connect" do
-    describe "is allowed", :net_connect => true do
+    describe "is allowed", net_connect: true do
       before(:each) do
         WebMock.allow_net_connect!
       end
@@ -16,9 +16,9 @@ shared_context "allowing and disabling net connect" do |*adapter_info|
             result = result.encode(
               'UTF-8',
               'binary',
-              :invalid => :replace,
-              :undef   => :replace,
-              :replace => ''
+              invalid: :replace,
+              undef: :replace,
+              replace: ''
             )
           end
           expect(result).to match(/.*google.*/)
@@ -26,7 +26,7 @@ shared_context "allowing and disabling net connect" do |*adapter_info|
       end
 
       it "should return stubbed response if request was stubbed" do
-        stub_request(:get, "www.example.com").to_return(:body => "abc")
+        stub_request(:get, "www.example.com").to_return(body: "abc")
         expect(http_request(:get, "http://www.example.com/").body).to eq("abc")
       end
     end
@@ -37,12 +37,12 @@ shared_context "allowing and disabling net connect" do |*adapter_info|
       end
 
       it "should return stubbed response if request was stubbed" do
-        stub_request(:get, "www.example.com").to_return(:body => "abc")
+        stub_request(:get, "www.example.com").to_return(body: "abc")
         expect(http_request(:get, "http://www.example.com/").body).to eq("abc")
       end
 
       it "should return stubbed response if request with path was stubbed" do
-        stub_request(:get, "www.example.com/hello_world").to_return(:body => "abc")
+        stub_request(:get, "www.example.com/hello_world").to_return(body: "abc")
         expect(http_request(:get, "http://www.example.com/hello_world").body).to eq("abc")
       end
 
@@ -55,11 +55,11 @@ shared_context "allowing and disabling net connect" do |*adapter_info|
 
     describe "is not allowed with exception for localhost" do
       before(:each) do
-        WebMock.disable_net_connect!(:allow_localhost => true)
+        WebMock.disable_net_connect!(allow_localhost: true)
       end
 
       it "should return stubbed response if request was stubbed" do
-        stub_request(:get, "www.example.com").to_return(:body => "abc")
+        stub_request(:get, "www.example.com").to_return(body: "abc")
         expect(http_request(:get, "http://www.example.com/").body).to eq("abc")
       end
 
@@ -91,12 +91,12 @@ shared_context "allowing and disabling net connect" do |*adapter_info|
     describe "is not allowed, with exceptions" do
       describe "allowing by host string" do
         before :each do
-          WebMock.disable_net_connect!(:allow => 'httpstat.us')
+          WebMock.disable_net_connect!(allow: 'httpstat.us')
         end
 
         context "when the host is not allowed" do
           it "should return stubbed response if request was stubbed" do
-            stub_request(:get, 'disallowed.example.com/foo').to_return(:body => "abc")
+            stub_request(:get, 'disallowed.example.com/foo').to_return(body: "abc")
             expect(http_request(:get, 'http://disallowed.example.com/foo').body).to eq("abc")
           end
 
@@ -109,12 +109,12 @@ shared_context "allowing and disabling net connect" do |*adapter_info|
 
         context "when the host is allowed" do
           it "should return stubbed response if request was stubbed" do
-            stub_request(:get, 'httpstat.us/200').to_return(:body => "abc")
+            stub_request(:get, 'httpstat.us/200').to_return(body: "abc")
             expect(http_request(:get, "http://httpstat.us/200").body).to eq("abc")
           end
 
           # WARNING: this makes a real HTTP request!
-          it "should make a real request to allowed host", :net_connect => true do
+          it "should make a real request to allowed host", net_connect: true do
             expect(http_request(:get, "http://httpstat.us/200").status).to eq('200')
           end
         end
@@ -129,13 +129,13 @@ shared_context "allowing and disabling net connect" do |*adapter_info|
         let(:disallowed_host_with_port) { replace_with_different_port(allowed_host_with_port) }
 
         before :each do
-          WebMock.disable_net_connect!(:allow => allowed_host_with_port)
+          WebMock.disable_net_connect!(allow: allowed_host_with_port)
         end
 
         context "when the host is not allowed" do
           it "should return stubbed response if request was stubbed" do
             request_url = "http://#{disallowed_host_with_port}/foo"
-            stub_request(:get, request_url).to_return(:body => "abc")
+            stub_request(:get, request_url).to_return(body: "abc")
             expect(http_request(:get, request_url).body).to eq("abc")
           end
 
@@ -150,11 +150,11 @@ shared_context "allowing and disabling net connect" do |*adapter_info|
         context "when the host is allowed" do
           it "should return stubbed response if request was stubbed" do
             request_url = "http://#{allowed_host_with_port}/foo"
-            stub_request(:get, request_url).to_return(:body => "abc")
+            stub_request(:get, request_url).to_return(body: "abc")
             expect(http_request(:get, request_url).body).to eq('abc')
           end
 
-          it "should make a real request to allowed host", :net_connect => true do
+          it "should make a real request to allowed host", net_connect: true do
             request_url = "http://#{allowed_host_with_port}/foo"
             expect(http_request(:get, request_url).status).to eq('200')
           end
@@ -163,12 +163,12 @@ shared_context "allowing and disabling net connect" do |*adapter_info|
 
       describe "allowing by scheme:host string" do
         before :each do
-          WebMock.disable_net_connect!(:allow => 'https://www.google.pl')
+          WebMock.disable_net_connect!(allow: 'https://www.google.pl')
         end
 
         context "when the host and scheme is not allowed" do
           it "should return stubbed response if request was stubbed" do
-            stub_request(:get, 'https://disallowed.example.com/foo').to_return(:body => "abc")
+            stub_request(:get, 'https://disallowed.example.com/foo').to_return(body: "abc")
             expect(http_request(:get, 'https://disallowed.example.com/foo').body).to eq("abc")
           end
 
@@ -193,16 +193,16 @@ shared_context "allowing and disabling net connect" do |*adapter_info|
 
         context "when the host is allowed" do
           it "should return stubbed response if request was stubbed" do
-            stub_request(:get, 'https://www.google.pl').to_return(:body => "abc")
+            stub_request(:get, 'https://www.google.pl').to_return(body: "abc")
             expect(http_request(:get, "https://www.google.pl/").body).to eq("abc")
           end
 
-          it "should make a real request to allowed host with scheme", :net_connect => true do
+          it "should make a real request to allowed host with scheme", net_connect: true do
             method = http_library == :httpclient ? :head : :get #https://github.com/nahi/httpclient/issues/299
             expect(http_request(method, "https://www.google.pl/").status).to eq('200')
           end
 
-          it "should make a real request to allowed host with scheme and port", :net_connect => true do
+          it "should make a real request to allowed host with scheme and port", net_connect: true do
             method = http_library == :httpclient ? :head : :get
             expect(http_request(method, "https://www.google.pl:443/").status).to eq('200')
           end
@@ -211,12 +211,12 @@ shared_context "allowing and disabling net connect" do |*adapter_info|
 
       describe "allowing by regular expression" do
         before :each do
-          WebMock.disable_net_connect!(:allow => %r{httpstat})
+          WebMock.disable_net_connect!(allow: %r{httpstat})
         end
 
         context "when the host is not allowed" do
           it "should return stubbed response if request was stubbed" do
-            stub_request(:get, 'disallowed.example.com/foo').to_return(:body => "abc")
+            stub_request(:get, 'disallowed.example.com/foo').to_return(body: "abc")
             expect(http_request(:get, 'http://disallowed.example.com/foo').body).to eq("abc")
           end
 
@@ -229,17 +229,17 @@ shared_context "allowing and disabling net connect" do |*adapter_info|
 
         context "when the host is allowed" do
           it "should return stubbed response if request was stubbed" do
-            stub_request(:get, 'httpstat.us/200').to_return(:body => "abc")
+            stub_request(:get, 'httpstat.us/200').to_return(body: "abc")
             expect(http_request(:get, "http://httpstat.us/200").body).to eq("abc")
           end
 
           # WARNING: this makes a real HTTP request!
-          it "should make a real request to allowed host", :net_connect => true do
+          it "should make a real request to allowed host", net_connect: true do
             expect(http_request(:get, "http://httpstat.us/200").status).to eq('200')
           end
 
-          it "should make a real request if request is allowed by path regexp and url contains default port", :net_connect => true do
-            WebMock.disable_net_connect!(:allow => %r{www.google.pl/webhp})
+          it "should make a real request if request is allowed by path regexp and url contains default port", net_connect: true do
+            WebMock.disable_net_connect!(allow: %r{www.google.pl/webhp})
             method = http_library == :httpclient ? :head : :get
             expect(http_request(method, 'https://www.google.pl:443/webhp').status).to eq('200')
           end
@@ -248,12 +248,12 @@ shared_context "allowing and disabling net connect" do |*adapter_info|
 
       describe "allowing by a callable" do
         before :each do
-          WebMock.disable_net_connect!(:allow => lambda{|url| url.to_str.include?('httpstat') })
+          WebMock.disable_net_connect!(allow: lambda{|url| url.to_str.include?('httpstat') })
         end
 
         context "when the host is not allowed" do
           it "should return stubbed response if request was stubbed" do
-            stub_request(:get, 'disallowed.example.com/foo').to_return(:body => "abc")
+            stub_request(:get, 'disallowed.example.com/foo').to_return(body: "abc")
             expect(http_request(:get, 'http://disallowed.example.com/foo').body).to eq("abc")
           end
 
@@ -266,12 +266,12 @@ shared_context "allowing and disabling net connect" do |*adapter_info|
 
         context "when the host is allowed" do
           it "should return stubbed response if request was stubbed" do
-            stub_request(:get, 'httpstat.us/200').to_return(:body => "abc")
+            stub_request(:get, 'httpstat.us/200').to_return(body: "abc")
             expect(http_request(:get, "http://httpstat.us/200").body).to eq("abc")
           end
 
           # WARNING: this makes a real HTTP request!
-          it "should make a real request to allowed host", :net_connect => true do
+          it "should make a real request to allowed host", net_connect: true do
             expect(http_request(:get, "http://httpstat.us/200").status).to eq('200')
           end
         end
@@ -279,12 +279,12 @@ shared_context "allowing and disabling net connect" do |*adapter_info|
 
       describe "allowing by a list of the above" do
         before :each do
-          WebMock.disable_net_connect!(:allow => [lambda{|_| false }, %r{foobar}, 'httpstat.us'])
+          WebMock.disable_net_connect!(allow: [lambda{|_| false }, %r{foobar}, 'httpstat.us'])
         end
 
         context "when the host is not allowed" do
           it "should return stubbed response if request was stubbed" do
-            stub_request(:get, 'disallowed.example.com/foo').to_return(:body => "abc")
+            stub_request(:get, 'disallowed.example.com/foo').to_return(body: "abc")
             expect(http_request(:get, 'http://disallowed.example.com/foo').body).to eq("abc")
           end
 
@@ -297,12 +297,12 @@ shared_context "allowing and disabling net connect" do |*adapter_info|
 
         context "when the host is allowed" do
           it "should return stubbed response if request was stubbed" do
-            stub_request(:get, 'httpstat.us/200').to_return(:body => "abc")
+            stub_request(:get, 'httpstat.us/200').to_return(body: "abc")
             expect(http_request(:get, "http://httpstat.us/200").body).to eq("abc")
           end
 
           # WARNING: this makes a real HTTP request!
-          it "should make a real request to allowed host", :net_connect => true do
+          it "should make a real request to allowed host", net_connect: true do
             expect(http_request(:get, "http://httpstat.us/200").status).to eq('200')
           end
         end

data/spec/acceptance/shared/callbacks.rb

@@ -22,7 +22,7 @@ shared_context "callbacks" do |*adapter_info|
     end
 
     it "should not invoke a callback if this http library should be ignored" do
-      WebMock.after_request(:except => [http_library()]) {
+      WebMock.after_request(except: [http_library()]) {
         @called = true
       }
       http_request(:get, "http://www.example.com/")
@@ -30,7 +30,7 @@ shared_context "callbacks" do |*adapter_info|
     end
 
     it "should invoke a callback even if other http libraries should be ignored" do
-      WebMock.after_request(:except => [:other_lib]) {
+      WebMock.after_request(except: [:other_lib]) {
         @called = true
       }
       http_request(:get, "http://www.example.com/")
@@ -38,7 +38,7 @@ shared_context "callbacks" do |*adapter_info|
     end
 
     it "should pass request signature to the callback" do
-      WebMock.after_request(:except => [:other_lib])  do |request_signature, _|
+      WebMock.after_request(except: [:other_lib])  do |request_signature, _|
         @request_signature = request_signature
       end
       http_request(:get, "http://www.example.com/")
@@ -69,11 +69,11 @@ shared_context "callbacks" do |*adapter_info|
         before(:each) do
           stub_request(:get, "http://www.example.com").
           to_return(
-            :status => [200, "hello"],
-            :headers => {'Content-Length' => '666', 'Hello' => 'World'},
-            :body => "foo bar"
+            status: [200, "hello"],
+            headers: {'Content-Length' => '666', 'Hello' => 'World'},
+            body: "foo bar"
           )
-          WebMock.after_request(:except => [:other_lib])  do |_, response|
+          WebMock.after_request(except: [:other_lib])  do |_, response|
             @response = response
           end
           http_request(:get, "http://www.example.com/")
@@ -95,11 +95,11 @@ shared_context "callbacks" do |*adapter_info|
         end
       end
 
-      describe "when request is not stubbed", :net_connect => true do
+      describe "when request is not stubbed", net_connect: true do
         before(:each) do
           WebMock.reset!
           WebMock.allow_net_connect!
-          WebMock.after_request(:except => [:other_lib])  do |_, response|
+          WebMock.after_request(except: [:other_lib])  do |_, response|
             @response = response
           end
           http_request(:get, "http://httpstat.us/201")
@@ -127,8 +127,8 @@ shared_context "callbacks" do |*adapter_info|
       expect(@called).to eq(2)
     end
 
-    it "should invoke callbacks only for real requests if requested", :net_connect => true do
-      WebMock.after_request(:real_requests_only => true) { @called = true }
+    it "should invoke callbacks only for real requests if requested", net_connect: true do
+      WebMock.after_request(real_requests_only: true) { @called = true }
       http_request(:get, "http://www.example.com/")
       expect(@called).to eq(nil)
       WebMock.allow_net_connect!

data/spec/acceptance/shared/complex_cross_concern_behaviors.rb

@@ -7,9 +7,9 @@ shared_context "complex cross-concern behaviors" do |*adapter_info|
     real_response = http_request(:get, webmock_server_url)
 
     stub_request(:get, webmock_server_url).to_return(
-      :status => recorded_response.status,
-      :body => recorded_response.body,
-      :headers => recorded_response.headers
+      status: recorded_response.status,
+      body: recorded_response.body,
+      headers: recorded_response.headers
     )
 
     played_back_response = http_request(:get, webmock_server_url)
@@ -20,12 +20,12 @@ shared_context "complex cross-concern behaviors" do |*adapter_info|
 
   let(:no_content_url) { 'http://httpstat.us/204' }
   [nil, ''].each do |stub_val|
-    it "returns the same value (nil or "") for a request stubbed as #{stub_val.inspect} that a real empty response has", :net_connect => true do
+    it "returns the same value (nil or "") for a request stubbed as #{stub_val.inspect} that a real empty response has", net_connect: true do
       unless http_library == :curb
         WebMock.allow_net_connect!
 
         real_response = http_request(:get, no_content_url)
-        stub_request(:get, no_content_url).to_return(:status => 204, :body => stub_val)
+        stub_request(:get, no_content_url).to_return(status: 204, body: stub_val)
         stubbed_response = http_request(:get, no_content_url)
 
         expect(stubbed_response.body).to eq(real_response.body)