webmock 1.20.3 → 1.20.4

data/spec/unit/stub_registry_spec.rb

@@ -12,9 +12,9 @@ describe WebMock::StubRegistry do
   describe "remove_request_stub" do
     it "should remove stub from registry" do
       WebMock::StubRegistry.instance.register_request_stub(@request_stub)
-      WebMock::StubRegistry.instance.registered_request?(@request_signature).should == @request_stub
+      expect(WebMock::StubRegistry.instance.registered_request?(@request_signature)).to eq(@request_stub)
       WebMock::StubRegistry.instance.remove_request_stub(@request_stub)
-      WebMock::StubRegistry.instance.registered_request?(@request_signature).should == nil
+      expect(WebMock::StubRegistry.instance.registered_request?(@request_signature)).to eq(nil)
     end
   end
 
@@ -24,25 +24,25 @@ describe WebMock::StubRegistry do
     end
 
     it "should clean request stubs" do
-      WebMock::StubRegistry.instance.registered_request?(@request_signature).should == @request_stub
+      expect(WebMock::StubRegistry.instance.registered_request?(@request_signature)).to eq(@request_stub)
       WebMock::StubRegistry.instance.reset!
-      WebMock::StubRegistry.instance.registered_request?(@request_signature).should == nil
+      expect(WebMock::StubRegistry.instance.registered_request?(@request_signature)).to eq(nil)
     end
   end
 
   describe "registering and reporting registered requests" do
 
     it "should return registered stub" do
-      WebMock::StubRegistry.instance.register_request_stub(@request_stub).should == @request_stub
+      expect(WebMock::StubRegistry.instance.register_request_stub(@request_stub)).to eq(@request_stub)
     end
 
     it "should report if request stub is not registered" do
-      WebMock::StubRegistry.instance.registered_request?(@request_signature).should == nil
+      expect(WebMock::StubRegistry.instance.registered_request?(@request_signature)).to eq(nil)
     end
 
     it "should register and report registered stib" do
       WebMock::StubRegistry.instance.register_request_stub(@request_stub)
-      WebMock::StubRegistry.instance.registered_request?(@request_signature).should == @request_stub
+      expect(WebMock::StubRegistry.instance.registered_request?(@request_signature)).to eq(@request_stub)
     end
 
 
@@ -53,15 +53,15 @@ describe WebMock::StubRegistry do
     it "should report registered evaluated response for request pattern" do
       @request_stub.to_return(:body => "abc")
       WebMock::StubRegistry.instance.register_request_stub(@request_stub)
-      WebMock::StubRegistry.instance.response_for_request(@request_signature).
-        should == WebMock::Response.new(:body => "abc")
+      expect(WebMock::StubRegistry.instance.response_for_request(@request_signature)).
+        to eq(WebMock::Response.new(:body => "abc"))
     end
 
     it "should report evaluated response" do
       @request_stub.to_return {|request| {:body => request.method.to_s} }
       WebMock::StubRegistry.instance.register_request_stub(@request_stub)
       response1 = WebMock::StubRegistry.instance.response_for_request(@request_signature)
-      response1.should == WebMock::Response.new(:body => "get")
+      expect(response1).to eq(WebMock::Response.new(:body => "get"))
     end
 
     it "should report clone of the response" do
@@ -69,7 +69,7 @@ describe WebMock::StubRegistry do
       WebMock::StubRegistry.instance.register_request_stub(@request_stub)
       response1 = WebMock::StubRegistry.instance.response_for_request(@request_signature)
       response2 = WebMock::StubRegistry.instance.response_for_request(@request_signature)
-      response1.should_not be(response2)
+      expect(response1).not_to be(response2)
     end
 
     it "should report clone of the dynamic response" do
@@ -77,11 +77,11 @@ describe WebMock::StubRegistry do
       WebMock::StubRegistry.instance.register_request_stub(@request_stub)
       response1 = WebMock::StubRegistry.instance.response_for_request(@request_signature)
       response2 = WebMock::StubRegistry.instance.response_for_request(@request_signature)
-      response1.should_not be(response2)
+      expect(response1).not_to be(response2)
     end
 
     it "should report nothing if no response for request is registered" do
-      WebMock::StubRegistry.instance.response_for_request(@request_signature).should == nil
+      expect(WebMock::StubRegistry.instance.response_for_request(@request_signature)).to eq(nil)
     end
 
     it "should always return last registered matching response" do
@@ -94,8 +94,8 @@ describe WebMock::StubRegistry do
       WebMock::StubRegistry.instance.register_request_stub(@request_stub1)
       WebMock::StubRegistry.instance.register_request_stub(@request_stub2)
       WebMock::StubRegistry.instance.register_request_stub(@request_stub3)
-      WebMock::StubRegistry.instance.response_for_request(@request_signature).
-        should == WebMock::Response.new(:body => "def")
+      expect(WebMock::StubRegistry.instance.response_for_request(@request_signature)).
+        to eq(WebMock::Response.new(:body => "def"))
     end
 
   end

data/spec/unit/stub_request_snippet_spec.rb

@@ -10,7 +10,7 @@ describe WebMock::StubRequestSnippet do
       it "should print stub request snippet with url with params and method and empty successful response" do
         expected = %Q(stub_request(:get, "http://www.example.com/?a=b&c=d").\n  to_return(:status => 200, :body => "", :headers => {}))
         @request_stub = WebMock::RequestStub.from_request_signature(@request_signature)
-        WebMock::StubRequestSnippet.new(@request_stub).to_s.should == expected
+        expect(WebMock::StubRequestSnippet.new(@request_stub).to_s).to eq(expected)
       end
 
       it "should print stub request snippet with body if available" do
@@ -19,7 +19,7 @@ describe WebMock::StubRequestSnippet do
         "\n  with(:body => \"abcdef\")." +
         "\n  to_return(:status => 200, :body => \"\", :headers => {})"
         @request_stub = WebMock::RequestStub.from_request_signature(@request_signature)
-        WebMock::StubRequestSnippet.new(@request_stub).to_s.should == expected
+        expect(WebMock::StubRequestSnippet.new(@request_stub).to_s).to eq(expected)
       end
 
       it "should print stub request snippet with multiline body" do
@@ -28,7 +28,7 @@ describe WebMock::StubRequestSnippet do
         "\n  with(:body => \"abc\\ndef\")." +
         "\n  to_return(:status => 200, :body => \"\", :headers => {})"
         @request_stub = WebMock::RequestStub.from_request_signature(@request_signature)
-        WebMock::StubRequestSnippet.new(@request_stub).to_s.should == expected
+        expect(WebMock::StubRequestSnippet.new(@request_stub).to_s).to eq(expected)
       end
 
       it "should print stub request snippet with headers if any" do
@@ -37,7 +37,7 @@ describe WebMock::StubRequestSnippet do
         "\n  with(:headers => {\'A\'=>\'a\', \'B\'=>\'b\'})." +
         "\n  to_return(:status => 200, :body => \"\", :headers => {})"
         @request_stub = WebMock::RequestStub.from_request_signature(@request_signature)
-        WebMock::StubRequestSnippet.new(@request_stub).to_s.should == expected
+        expect(WebMock::StubRequestSnippet.new(@request_stub).to_s).to eq(expected)
       end
 
       it "should print stub request snippet with body and headers" do
@@ -47,14 +47,14 @@ describe WebMock::StubRequestSnippet do
         "\n  with(:body => \"abcdef\",\n       :headers => {\'A\'=>\'a\', \'B\'=>\'b\'})." +
         "\n  to_return(:status => 200, :body => \"\", :headers => {})"
         @request_stub = WebMock::RequestStub.from_request_signature(@request_signature)
-        WebMock::StubRequestSnippet.new(@request_stub).to_s.should == expected
+        expect(WebMock::StubRequestSnippet.new(@request_stub).to_s).to eq(expected)
       end
 
       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")
-        WebMock::StubRequestSnippet.new(stub).to_s(false).should == expected
+        expect(WebMock::StubRequestSnippet.new(stub).to_s(false)).to eq(expected)
       end
     end
 
@@ -72,7 +72,7 @@ stub_request(:post, "http://www.example.com/").
        :headers => {'Content-Type'=>'application/x-www-form-urlencoded'}).
   to_return(:status => 200, :body => \"\", :headers => {})
         STUB
-        WebMock::StubRequestSnippet.new(@request_stub).to_s.should == expected.strip
+        expect(WebMock::StubRequestSnippet.new(@request_stub).to_s).to eq(expected.strip)
       end
 
       it "should print stub request snippet leaving body as string when not a urlencoded form" do
@@ -86,7 +86,7 @@ stub_request(:post, "http://www.example.com/").
        :headers => {'Content-Type'=>'multipart/form-data; boundary=ABC123'}).
   to_return(:status => 200, :body => \"\", :headers => {})
         STUB
-        WebMock::StubRequestSnippet.new(@request_stub).to_s.should == expected.strip
+        expect(WebMock::StubRequestSnippet.new(@request_stub).to_s).to eq(expected.strip)
       end
     end
 

data/spec/unit/util/hash_counter_spec.rb

@@ -3,22 +3,22 @@ require 'spec_helper'
 describe WebMock::Util::HashCounter do
 
   it "should return 0 for non existing key" do
-    WebMock::Util::HashCounter.new.get(:abc).should == 0
+    expect(WebMock::Util::HashCounter.new.get(:abc)).to eq(0)
   end
 
   it "should increase the returned value on every put with the same key" do
     counter = WebMock::Util::HashCounter.new
     counter.put(:abc)
-    counter.get(:abc).should == 1
+    expect(counter.get(:abc)).to eq(1)
     counter.put(:abc)
-    counter.get(:abc).should == 2
+    expect(counter.get(:abc)).to eq(2)
   end
 
   it "should only increase value for given key provided to put" do
     counter = WebMock::Util::HashCounter.new
     counter.put(:abc)
-    counter.get(:abc).should == 1
-    counter.get(:def).should == 0
+    expect(counter.get(:abc)).to eq(1)
+    expect(counter.get(:def)).to eq(0)
   end
 
   describe "each" do
@@ -33,7 +33,7 @@ describe WebMock::Util::HashCounter do
 
       elements = []
       counter.each {|k,v| elements << [k,v]}
-      elements.should == [[:c, 1], [:b, 2], [:a, 2], [:d, 1]]
+      expect(elements).to eq([[:c, 1], [:b, 2], [:a, 2], [:d, 1]])
     end
   end
 end

data/spec/unit/util/hash_keys_stringifier_spec.rb

@@ -21,7 +21,7 @@ describe WebMock::Util::HashKeysStringifier do
         ]
       }
     }
-    WebMock::Util::HashKeysStringifier.stringify_keys!(hash, :deep => true).should == stringified
+    expect(WebMock::Util::HashKeysStringifier.stringify_keys!(hash, :deep => true)).to eq(stringified)
   end
 
 end

data/spec/unit/util/headers_spec.rb

@@ -5,21 +5,21 @@ describe WebMock::Util::Headers do
   it "should decode_userinfo_from_header handles basic auth" do
     authorization_header = "Basic dXNlcm5hbWU6c2VjcmV0"
     userinfo = WebMock::Util::Headers.decode_userinfo_from_header(authorization_header)
-    userinfo.should == "username:secret"
+    expect(userinfo).to eq("username:secret")
   end
 
   describe "sorted_headers_string" do
 
     it "should return nice string for hash with string values" do
-      WebMock::Util::Headers.sorted_headers_string({"a" => "b"}).should == "{'A'=>'b'}"
+      expect(WebMock::Util::Headers.sorted_headers_string({"a" => "b"})).to eq("{'A'=>'b'}")
     end
 
     it "should return nice string for hash with array values" do
-      WebMock::Util::Headers.sorted_headers_string({"a" => ["b", "c"]}).should == "{'A'=>['b', 'c']}"
+      expect(WebMock::Util::Headers.sorted_headers_string({"a" => ["b", "c"]})).to eq("{'A'=>['b', 'c']}")
     end
 
     it "should return nice string for hash with array values and string values" do
-      WebMock::Util::Headers.sorted_headers_string({"a" => ["b", "c"], "d" => "e"}).should == "{'A'=>['b', 'c'], 'D'=>'e'}"
+      expect(WebMock::Util::Headers.sorted_headers_string({"a" => ["b", "c"], "d" => "e"})).to eq("{'A'=>['b', 'c'], 'D'=>'e'}")
     end
 
 

data/spec/unit/util/json_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 describe WebMock::Util::JSON do
   it "should parse json without parsing dates" do
-    WebMock::Util::JSON.parse("\"a\":\"2011-01-01\"").should == {"a" => "2011-01-01"}
+    expect(WebMock::Util::JSON.parse("\"a\":\"2011-01-01\"")).to eq({"a" => "2011-01-01"})
   end
 end

data/spec/unit/util/uri_spec.rb

@@ -81,37 +81,37 @@ describe WebMock::Util::URI do
 
     it "should find all variations of the same uri for all variations of uri with params and path" do
       URIS_WITH_PATH_AND_PARAMS.each do |uri|
-        WebMock::Util::URI.variations_of_uri_as_strings(uri).sort.should == URIS_WITH_PATH_AND_PARAMS
+        expect(WebMock::Util::URI.variations_of_uri_as_strings(uri).sort).to eq(URIS_WITH_PATH_AND_PARAMS)
       end
     end
 
     it "should find all variations of the same uri for all variations of uri with params but without path" do
       URIS_WITHOUT_PATH_BUT_WITH_PARAMS.each do |uri|
-        WebMock::Util::URI.variations_of_uri_as_strings(uri).sort.should == URIS_WITHOUT_PATH_BUT_WITH_PARAMS
+        expect(WebMock::Util::URI.variations_of_uri_as_strings(uri).sort).to eq(URIS_WITHOUT_PATH_BUT_WITH_PARAMS)
       end
     end
 
     it "should find all variations of the same uri for all variations of uri without params or path" do
       URIS_WITHOUT_PATH_OR_PARAMS.each do |uri|
-        WebMock::Util::URI.variations_of_uri_as_strings(uri).sort.should == URIS_WITHOUT_PATH_OR_PARAMS
+        expect(WebMock::Util::URI.variations_of_uri_as_strings(uri).sort).to eq(URIS_WITHOUT_PATH_OR_PARAMS)
       end
     end
 
     it "should find all variations of the same uri for all variations of uri with auth" do
       URIS_WITH_AUTH.each do |uri|
-        WebMock::Util::URI.variations_of_uri_as_strings(uri).sort.should == URIS_WITH_AUTH
+        expect(WebMock::Util::URI.variations_of_uri_as_strings(uri).sort).to eq(URIS_WITH_AUTH)
       end
     end
 
     it "should find all variations of the same uri for all variations of uri with different port" do
       URIS_WITH_DIFFERENT_PORT.each do |uri|
-        WebMock::Util::URI.variations_of_uri_as_strings(uri).sort.should == URIS_WITH_DIFFERENT_PORT
+        expect(WebMock::Util::URI.variations_of_uri_as_strings(uri).sort).to eq(URIS_WITH_DIFFERENT_PORT)
       end
     end
 
     it "should find all variations of the same uri for all variations of https uris" do
       URIS_FOR_HTTPS.each do |uri|
-        WebMock::Util::URI.variations_of_uri_as_strings(uri).sort.should == URIS_FOR_HTTPS
+        expect(WebMock::Util::URI.variations_of_uri_as_strings(uri).sort).to eq(URIS_FOR_HTTPS)
       end
     end
 
@@ -122,7 +122,7 @@ describe WebMock::Util::URI do
     it "should successfully compare all variations of the same uri with path and params" do
       URIS_WITH_PATH_AND_PARAMS.each do |uri_a|
         URIS_WITH_PATH_AND_PARAMS.each do |uri_b|
-          WebMock::Util::URI.normalize_uri(uri_a).should ===  WebMock::Util::URI.normalize_uri(uri_b)
+          expect(WebMock::Util::URI.normalize_uri(uri_a)).to be ===  WebMock::Util::URI.normalize_uri(uri_b)
         end
       end
     end
@@ -130,7 +130,7 @@ describe WebMock::Util::URI do
     it "should successfully compare all variations of the same uri with path but with params" do
       URIS_WITHOUT_PATH_BUT_WITH_PARAMS.each do |uri_a|
         URIS_WITHOUT_PATH_BUT_WITH_PARAMS.each do |uri_b|
-          WebMock::Util::URI.normalize_uri(uri_a).should ===  WebMock::Util::URI.normalize_uri(uri_b)
+          expect(WebMock::Util::URI.normalize_uri(uri_a)).to be ===  WebMock::Util::URI.normalize_uri(uri_b)
         end
       end
     end
@@ -138,7 +138,7 @@ describe WebMock::Util::URI do
     it "should successfully compare all variations of the same uri without path or params" do
       URIS_WITHOUT_PATH_OR_PARAMS.each do |uri_a|
         URIS_WITHOUT_PATH_OR_PARAMS.each do |uri_b|
-          WebMock::Util::URI.normalize_uri(uri_a).should ===  WebMock::Util::URI.normalize_uri(uri_b)
+          expect(WebMock::Util::URI.normalize_uri(uri_a)).to be ===  WebMock::Util::URI.normalize_uri(uri_b)
         end
       end
     end
@@ -146,7 +146,7 @@ describe WebMock::Util::URI do
     it "should successfully compare all variations of the same uri with authority" do
       URIS_WITH_AUTH.each do |uri_a|
         URIS_WITH_AUTH.each do |uri_b|
-          WebMock::Util::URI.normalize_uri(uri_a).should ===  WebMock::Util::URI.normalize_uri(uri_b)
+          expect(WebMock::Util::URI.normalize_uri(uri_a)).to be ===  WebMock::Util::URI.normalize_uri(uri_b)
         end
       end
     end
@@ -154,7 +154,7 @@ describe WebMock::Util::URI do
     it "should successfully compare all variations of the same uri custom port" do
       URIS_WITH_DIFFERENT_PORT.each do |uri_a|
         URIS_WITH_DIFFERENT_PORT.each do |uri_b|
-          WebMock::Util::URI.normalize_uri(uri_a).should ===  WebMock::Util::URI.normalize_uri(uri_b)
+          expect(WebMock::Util::URI.normalize_uri(uri_a)).to be ===  WebMock::Util::URI.normalize_uri(uri_b)
         end
       end
     end
@@ -162,7 +162,7 @@ describe WebMock::Util::URI do
     it "should successfully compare all variations of the same https uri" do
       URIS_FOR_HTTPS.each do |uri_a|
         URIS_FOR_HTTPS.each do |uri_b|
-          WebMock::Util::URI.normalize_uri(uri_a).should ===  WebMock::Util::URI.normalize_uri(uri_b)
+          expect(WebMock::Util::URI.normalize_uri(uri_a)).to be ===  WebMock::Util::URI.normalize_uri(uri_b)
         end
       end
     end
@@ -170,19 +170,19 @@ describe WebMock::Util::URI do
     it "should successfully handle array parameters" do
       uri_string = 'http://www.example.com:80/path?a[]=b&a[]=c'
       uri = WebMock::Util::URI.normalize_uri(uri_string)
-      WebMock::Util::QueryMapper.query_to_values(uri.query).should == {"a"=>["b", "c"]}
+      expect(WebMock::Util::QueryMapper.query_to_values(uri.query)).to eq({"a"=>["b", "c"]})
     end
 
     it "should successfully handle hash parameters" do
       uri_string = 'http://www.example.com:80/path?a[d]=b&a[e]=c&a[b][c]=1'
       uri = WebMock::Util::URI.normalize_uri(uri_string)
-      WebMock::Util::QueryMapper.query_to_values(uri.query).should == {"a"=>{"d"=>"b", "e"=>"c", "b"=>{"c"=>"1"}}}
+      expect(WebMock::Util::QueryMapper.query_to_values(uri.query)).to eq({"a"=>{"d"=>"b", "e"=>"c", "b"=>{"c"=>"1"}}})
     end
 
     it "should successfully handle nested hash parameters" do
       uri_string = 'http://www.example.com:80/path?one[two][three][]=four&one[two][three][]=five'
       uri = WebMock::Util::URI.normalize_uri(uri_string)
-      WebMock::Util::QueryMapper.query_to_values(uri.query).should == {"one"=>{"two"=>{"three" => ["four", "five"]}}}
+      expect(WebMock::Util::QueryMapper.query_to_values(uri.query)).to eq({"one"=>{"two"=>{"three" => ["four", "five"]}}})
     end
 
     it "should successfully handle mixed array and hash parameters" do
@@ -195,7 +195,7 @@ describe WebMock::Util::URI do
       # }
       uri_string = "http://www.example.com:80/path?load[include][][staff]=email&load[include][]=business_name"
       uri = WebMock::Util::URI.normalize_uri(uri_string)
-      WebMock::Util::QueryMapper.query_to_values(uri.query).should == {"load"=>{"include"=>[{"staff"=>"email"},"business_name"]}}
+      expect(WebMock::Util::QueryMapper.query_to_values(uri.query)).to eq({"load"=>{"include"=>[{"staff"=>"email"},"business_name"]}})
     end
 
     context "when query notation is set to :flat_array" do
@@ -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)
-        WebMock::Util::QueryMapper.query_to_values(uri.query, :notation => WebMock::Config.instance.query_values_notation).should == [['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
@@ -216,14 +216,14 @@ describe WebMock::Util::URI do
     context "when query values is a Hash" do
       it "returns an alphabetically sorted hash" do
         sorted_query = WebMock::Util::URI.sort_query_values({"b"=>"one", "a"=>"two"})
-        sorted_query.should == {"a"=>"two", "b"=>"one"}
+        expect(sorted_query).to eq({"a"=>"two", "b"=>"one"})
       end
     end
 
     context "when query values is an Array" do
       it "returns an alphabetically sorted array" do
         sorted_query = WebMock::Util::URI.sort_query_values([["b","two"],["a","one_b"],["a","one_a"]])
-        sorted_query.should == [["a","one_a"],["a","one_b"],["b","two"]]
+        expect(sorted_query).to eq([["a","one_a"],["a","one_b"],["b","two"]])
       end
     end
   end
@@ -233,45 +233,45 @@ describe WebMock::Util::URI do
     it "should strip_default_port_from_uri strips 80 from http with path" do
       uri = "http://example.com:80/foo/bar"
       stripped_uri = WebMock::Util::URI.strip_default_port_from_uri_string(uri)
-      stripped_uri.should ==  "http://example.com/foo/bar"
+      expect(stripped_uri).to eq("http://example.com/foo/bar")
     end
 
     it "should strip_default_port_from_uri strips 80 from http without path" do
       uri = "http://example.com:80"
       stripped_uri = WebMock::Util::URI.strip_default_port_from_uri_string(uri)
-      stripped_uri.should ==  "http://example.com"
+      expect(stripped_uri).to eq("http://example.com")
     end
 
     it "should strip_default_port_from_uri strips 443 from https without path" do
       uri = "https://example.com:443"
       stripped_uri = WebMock::Util::URI.strip_default_port_from_uri_string(uri)
-      stripped_uri.should ==  "https://example.com"
+      expect(stripped_uri).to eq("https://example.com")
     end
 
     it "should strip_default_port_from_uri strips 443 from https" do
       uri = "https://example.com:443/foo/bar"
       stripped_uri = WebMock::Util::URI.strip_default_port_from_uri_string(uri)
-      stripped_uri.should == "https://example.com/foo/bar"
+      expect(stripped_uri).to eq("https://example.com/foo/bar")
     end
 
     it "should strip_default_port_from_uri does not strip 8080 from http" do
       uri = "http://example.com:8080/foo/bar"
-      WebMock::Util::URI.strip_default_port_from_uri_string(uri).should == uri
+      expect(WebMock::Util::URI.strip_default_port_from_uri_string(uri)).to eq(uri)
     end
 
     it "should strip_default_port_from_uri does not strip 443 from http" do
       uri = "http://example.com:443/foo/bar"
-      WebMock::Util::URI.strip_default_port_from_uri_string(uri).should == uri
+      expect(WebMock::Util::URI.strip_default_port_from_uri_string(uri)).to eq(uri)
     end
 
     it "should strip_default_port_from_uri does not strip 80 from query string" do
       uri = "http://example.com/?a=:80&b=c"
-      WebMock::Util::URI.strip_default_port_from_uri_string(uri).should == uri
+      expect(WebMock::Util::URI.strip_default_port_from_uri_string(uri)).to eq(uri)
     end
 
     it "should strip_default_port_from_uri does not modify strings that do not start with http or https" do
       uri = "httpz://example.com:80/"
-      WebMock::Util::URI.strip_default_port_from_uri_string(uri).should == uri
+      expect(WebMock::Util::URI.strip_default_port_from_uri_string(uri)).to eq(uri)
     end
 
   end
@@ -281,17 +281,17 @@ describe WebMock::Util::URI do
 
     it "should encode unsafe chars in userinfo does not encode userinfo safe punctuation" do
       userinfo = "user;&=+$,:secret"
-      WebMock::Util::URI.encode_unsafe_chars_in_userinfo(userinfo).should == userinfo
+      expect(WebMock::Util::URI.encode_unsafe_chars_in_userinfo(userinfo)).to eq(userinfo)
     end
 
     it "should encode unsafe chars in userinfo does not encode rfc 3986 unreserved characters" do
       userinfo = "-.!~*'()abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:secret"
-      WebMock::Util::URI.encode_unsafe_chars_in_userinfo(userinfo).should == userinfo
+      expect(WebMock::Util::URI.encode_unsafe_chars_in_userinfo(userinfo)).to eq(userinfo)
     end
 
     it "should encode unsafe chars in userinfo does encode other characters" do
       userinfo, safe_userinfo = 'us#rn@me:sec//ret?"', 'us%23rn%40me:sec%2F%2Fret%3F%22'
-      WebMock::Util::URI.encode_unsafe_chars_in_userinfo(userinfo).should == safe_userinfo
+      expect(WebMock::Util::URI.encode_unsafe_chars_in_userinfo(userinfo)).to eq(safe_userinfo)
     end
 
   end