httpi 2.1.1 → 2.2.0

data/spec/httpi/response_spec.rb

@@ -8,36 +8,36 @@ describe HTTPI::Response do
 
     describe "#error?" do
       it "returns false" do
-        response.should_not be_an_error
+        expect(response).not_to be_an_error
       end
     end
 
     describe "#headers" do
       it "returns the HTTP response headers" do
-        response.headers.should == {}
+        expect(response.headers).to eq({})
       end
     end
 
     describe "#code" do
       it "returns the HTTP response code" do
-        response.code.should == 200
+        expect(response.code).to eq(200)
       end
 
       it "always returns an Integer" do
         response = HTTPI::Response.new "200", {}, ""
-        response.code.should == 200
+        expect(response.code).to eq(200)
       end
     end
 
     describe "#multipart" do
       it "returns false" do
-        response.should_not be_multipart
+        expect(response).not_to be_multipart
       end
     end
 
     describe "#cookies" do
       it "returns an empty list" do
-        response.cookies.should == []
+        expect(response.cookies).to eq([])
       end
     end
   end
@@ -48,7 +48,7 @@ describe HTTPI::Response do
     describe "#cookies" do
       it "returns a list of cookies" do
         cookie = response.cookies.first
-        cookie.should be_a(HTTPI::Cookie)
+        expect(cookie).to be_a(HTTPI::Cookie)
       end
     end
   end
@@ -58,7 +58,7 @@ describe HTTPI::Response do
 
     describe "#body" do
       it "returns an empty String" do
-        response.body.should == ""
+        expect(response.body).to eq("")
       end
     end
   end
@@ -68,7 +68,7 @@ describe HTTPI::Response do
 
     describe "#multipart" do
       it "returns true" do
-        response.should be_multipart
+        expect(response).to be_multipart
       end
     end
   end
@@ -78,7 +78,7 @@ describe HTTPI::Response do
 
     describe "#error?" do
       it "returns true" do
-        response.should be_an_error
+        expect(response).to be_an_error
       end
     end
   end
@@ -88,13 +88,13 @@ describe HTTPI::Response do
 
     describe "#headers" do
       it "returns the HTTP response headers" do
-        response.headers.should == { "Content-Encoding" => "gzip" }
+        expect(response.headers).to eq({ "Content-Encoding" => "gzip" })
       end
     end
 
     describe "#body" do
       it "returns the (gzip decoded) HTTP response body" do
-        response.body.should == Fixture.xml
+        expect(response.body).to eq(Fixture.xml)
       end
 
       it "bubbles Zlib errors" do
@@ -106,7 +106,7 @@ describe HTTPI::Response do
 
     describe "#raw_body" do
       it "returns the raw HTML response body" do
-        response.raw_body.should == Fixture.gzip
+        expect(response.raw_body).to eq(Fixture.gzip)
       end
     end
   end
@@ -116,19 +116,19 @@ describe HTTPI::Response do
 
     describe "#headers" do
       it "returns the HTTP response headers" do
-        response.headers.should == { "Content-Type" => "application/dime" }
+        expect(response.headers).to eq({ "Content-Type" => "application/dime" })
       end
     end
 
     describe "#body" do
       it "returns the (dime decoded) HTTP response body" do
-        response.body.should == Fixture.xml_dime
+        expect(response.body).to eq(Fixture.xml_dime)
       end
     end
 
     describe "#raw_body" do
       it "returns the raw HTML response body" do
-        response.raw_body.should == Fixture.dime
+        expect(response.raw_body).to eq(Fixture.dime)
       end
     end
 

data/spec/integration/curb_spec.rb

@@ -22,7 +22,7 @@ describe HTTPI::Adapter::Curb do
         request.headers["X-Header"] = "HTTPI"
 
         response = HTTPI.get(request, adapter)
-        response.body.should include("HTTPI")
+        expect(response.body).to include("HTTPI")
       end
 
       it "it supports headers with multiple values" do
@@ -30,37 +30,37 @@ describe HTTPI::Adapter::Curb do
 
         response = HTTPI.get(request, adapter)
         cookies = ["cookie1=chip1; path=/", "cookie2=chip2; path=/"]
-        response.headers["Set-Cookie"].should eq(cookies)
+        expect(response.headers["Set-Cookie"]).to eq(cookies)
       end
 
       it "executes GET requests" do
         response = HTTPI.get(@server.url, adapter)
-        response.body.should eq("get")
-        response.headers["Content-Type"].should eq("text/plain")
+        expect(response.body).to eq("get")
+        expect(response.headers["Content-Type"]).to eq("text/plain")
       end
 
       it "executes POST requests" do
         response = HTTPI.post(@server.url, "<some>xml</some>", adapter)
-        response.body.should eq("post")
-        response.headers["Content-Type"].should eq("text/plain")
+        expect(response.body).to eq("post")
+        expect(response.headers["Content-Type"]).to eq("text/plain")
       end
 
       it "executes HEAD requests" do
         response = HTTPI.head(@server.url, adapter)
-        response.code.should == 200
-        response.headers["Content-Type"].should eq("text/plain")
+        expect(response.code).to eq(200)
+        expect(response.headers["Content-Type"]).to eq("text/plain")
       end
 
       it "executes PUT requests" do
         response = HTTPI.put(@server.url, "<some>xml</some>", adapter)
-        response.body.should eq("put")
-        response.headers["Content-Type"].should eq("text/plain")
+        expect(response.body).to eq("put")
+        expect(response.headers["Content-Type"]).to eq("text/plain")
       end
 
       it "executes DELETE requests" do
         response = HTTPI.delete(@server.url, adapter)
-        response.body.should eq("delete")
-        response.headers["Content-Type"].should eq("text/plain")
+        expect(response.body).to eq("delete")
+        expect(response.headers["Content-Type"]).to eq("text/plain")
       end
 
       it "supports basic authentication" do
@@ -68,7 +68,7 @@ describe HTTPI::Adapter::Curb do
         request.auth.basic("admin", "secret")
 
         response = HTTPI.get(request, adapter)
-        response.body.should eq("basic-auth")
+        expect(response.body).to eq("basic-auth")
       end
 
       it "supports digest authentication" do
@@ -76,7 +76,7 @@ describe HTTPI::Adapter::Curb do
         request.auth.digest("admin", "secret")
 
         response = HTTPI.get(request, adapter)
-        response.body.should eq("digest-auth")
+        expect(response.body).to eq("digest-auth")
       end
 
       it "supports chunked response" do
@@ -86,8 +86,8 @@ describe HTTPI::Adapter::Curb do
           res += body
         end
         response = HTTPI.post(request, adapter)
-        res.should eq("post")
-        response.body.should eq("")
+        expect(res).to eq("post")
+        expect(response.body).to eq("")
       end
 
     end

data/spec/integration/em_http_spec.rb

@@ -31,7 +31,7 @@ describe HTTPI::Adapter::EmHttpRequest do
         request.headers["X-Header"] = "HTTPI"
 
         response = HTTPI.get(request, adapter)
-        response.body.should include("HTTPI")
+        expect(response.body).to include("HTTPI")
       end
 
       it "it supports headers with multiple values" do
@@ -39,37 +39,37 @@ describe HTTPI::Adapter::EmHttpRequest do
 
         response = HTTPI.get(request, adapter)
         cookies = ["cookie1=chip1; path=/", "cookie2=chip2; path=/"]
-        response.headers["Set-Cookie"].should eq(cookies)
+        expect(response.headers["Set-Cookie"]).to eq(cookies)
       end
 
       it "executes GET requests" do
         response = HTTPI.get(@server.url, adapter)
-        response.body.should eq("get")
-        response.headers["Content-Type"].should eq("text/plain")
+        expect(response.body).to eq("get")
+        expect(response.headers["Content-Type"]).to eq("text/plain")
       end
 
       it "executes POST requests" do
         response = HTTPI.post(@server.url, "<some>xml</some>", adapter)
-        response.body.should eq("post")
-        response.headers["Content-Type"].should eq("text/plain")
+        expect(response.body).to eq("post")
+        expect(response.headers["Content-Type"]).to eq("text/plain")
       end
 
       it "executes HEAD requests" do
         response = HTTPI.head(@server.url, adapter)
-        response.code.should == 200
-        response.headers["Content-Type"].should eq("text/plain")
+        expect(response.code).to eq(200)
+        expect(response.headers["Content-Type"]).to eq("text/plain")
       end
 
       it "executes PUT requests" do
         response = HTTPI.put(@server.url, "<some>xml</some>", adapter)
-        response.body.should eq("put")
-        response.headers["Content-Type"].should eq("text/plain")
+        expect(response.body).to eq("put")
+        expect(response.headers["Content-Type"]).to eq("text/plain")
       end
 
       it "executes DELETE requests" do
         response = HTTPI.delete(@server.url, adapter)
-        response.body.should eq("delete")
-        response.headers["Content-Type"].should eq("text/plain")
+        expect(response.body).to eq("delete")
+        expect(response.headers["Content-Type"]).to eq("text/plain")
       end
 
       it "supports basic authentication" do
@@ -77,7 +77,7 @@ describe HTTPI::Adapter::EmHttpRequest do
         request.auth.basic("admin", "secret")
 
         response = HTTPI.get(request, adapter)
-        response.body.should eq("basic-auth")
+        expect(response.body).to eq("basic-auth")
       end
 
       # it does not support digest authentication

data/spec/integration/httpclient_spec.rb

@@ -19,7 +19,7 @@ describe HTTPI::Adapter::HTTPClient do
       request.headers["X-Header"] = "HTTPI"
 
       response = HTTPI.get(request, adapter)
-      response.body.should include("HTTPI")
+      expect(response.body).to include("HTTPI")
     end
 
     it "it supports headers with multiple values" do
@@ -27,37 +27,37 @@ describe HTTPI::Adapter::HTTPClient do
 
       response = HTTPI.get(request, adapter)
       cookies = ["cookie1=chip1; path=/", "cookie2=chip2; path=/"]
-      response.headers["Set-Cookie"].should eq(cookies)
+      expect(response.headers["Set-Cookie"]).to eq(cookies)
     end
 
     it "executes GET requests" do
       response = HTTPI.get(@server.url, adapter)
-      response.body.should eq("get")
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.body).to eq("get")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "executes POST requests" do
       response = HTTPI.post(@server.url, "<some>xml</some>", adapter)
-      response.body.should eq("post")
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.body).to eq("post")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "executes HEAD requests" do
       response = HTTPI.head(@server.url, adapter)
-      response.code.should == 200
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.code).to eq(200)
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "executes PUT requests" do
       response = HTTPI.put(@server.url, "<some>xml</some>", adapter)
-      response.body.should eq("put")
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.body).to eq("put")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "executes DELETE requests" do
       response = HTTPI.delete(@server.url, adapter)
-      response.body.should eq("delete")
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.body).to eq("delete")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "supports basic authentication" do
@@ -65,7 +65,7 @@ describe HTTPI::Adapter::HTTPClient do
       request.auth.basic("admin", "secret")
 
       response = HTTPI.get(request, adapter)
-      response.body.should eq("basic-auth")
+      expect(response.body).to eq("basic-auth")
     end
 
     it "supports digest authentication" do
@@ -73,7 +73,7 @@ describe HTTPI::Adapter::HTTPClient do
       request.auth.digest("admin", "secret")
 
       response = HTTPI.get(request, adapter)
-      response.body.should eq("digest-auth")
+      expect(response.body).to eq("digest-auth")
     end
 
     it "supports chunked response" do
@@ -83,8 +83,8 @@ describe HTTPI::Adapter::HTTPClient do
         res += body
       end
       response = HTTPI.post(request, adapter)
-      res.should eq("post")
-      response.body.should eq("")
+      expect(res).to eq("post")
+      expect(response.body).to eq("")
     end
   end
 

data/spec/integration/net_http_persistent_spec.rb

@@ -19,7 +19,7 @@ describe HTTPI::Adapter::NetHTTP do
       request.headers["X-Header"] = "HTTPI"
 
       response = HTTPI.get(request, adapter)
-      response.body.should include("HTTPI")
+      expect(response.body).to include("HTTPI")
     end
 
     it "it supports headers with multiple values" do
@@ -27,37 +27,37 @@ describe HTTPI::Adapter::NetHTTP do
 
       response = HTTPI.get(request, adapter)
       cookies = ["cookie1=chip1; path=/", "cookie2=chip2; path=/"]
-      response.headers["Set-Cookie"].should eq(cookies)
+      expect(response.headers["Set-Cookie"]).to eq(cookies)
     end
 
     it "executes GET requests" do
       response = HTTPI.get(@server.url, adapter)
-      response.body.should eq("get")
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.body).to eq("get")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "executes POST requests" do
       response = HTTPI.post(@server.url, "<some>xml</some>", adapter)
-      response.body.should eq("post")
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.body).to eq("post")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "executes HEAD requests" do
       response = HTTPI.head(@server.url, adapter)
-      response.code.should == 200
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.code).to eq(200)
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "executes PUT requests" do
       response = HTTPI.put(@server.url, "<some>xml</some>", adapter)
-      response.body.should eq("put")
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.body).to eq("put")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "executes DELETE requests" do
       response = HTTPI.delete(@server.url, adapter)
-      response.body.should eq("delete")
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.body).to eq("delete")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "supports basic authentication" do
@@ -65,7 +65,7 @@ describe HTTPI::Adapter::NetHTTP do
       request.auth.basic("admin", "secret")
 
       response = HTTPI.get(request, adapter)
-      response.body.should eq("basic-auth")
+      expect(response.body).to eq("basic-auth")
     end
 
     # it does not support digest authentication
@@ -77,8 +77,8 @@ describe HTTPI::Adapter::NetHTTP do
         res += body
       end
       response = HTTPI.post(request, adapter)
-      res.should eq("post")
-      response.body.to_s.should eq("")
+      expect(res).to eq("post")
+      expect(response.body.to_s).to eq("")
     end
   end
 
@@ -128,7 +128,7 @@ describe HTTPI::Adapter::NetHTTP do
         request.auth.ntlm(user,pass)
         response = HTTPI.get(request, adapter)
         expect(response.code).to eq(200)
-        response.body.should match(/iis-8\.png/)
+        expect(response.body).to match(/iis-8\.png/)
 
         puts "EXTERNAL NTLM INTEGRATION TEST, response body:"
         puts response.body

data/spec/integration/net_http_spec.rb

@@ -19,7 +19,7 @@ describe HTTPI::Adapter::NetHTTP do
       request.headers["X-Header"] = "HTTPI"
 
       response = HTTPI.get(request, adapter)
-      response.body.should include("HTTPI")
+      expect(response.body).to include("HTTPI")
     end
 
     it "it supports headers with multiple values" do
@@ -27,37 +27,37 @@ describe HTTPI::Adapter::NetHTTP do
 
       response = HTTPI.get(request, adapter)
       cookies = ["cookie1=chip1; path=/", "cookie2=chip2; path=/"]
-      response.headers["Set-Cookie"].should eq(cookies)
+      expect(response.headers["Set-Cookie"]).to eq(cookies)
     end
 
     it "executes GET requests" do
       response = HTTPI.get(@server.url, adapter)
-      response.body.should eq("get")
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.body).to eq("get")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "executes POST requests" do
       response = HTTPI.post(@server.url, "<some>xml</some>", adapter)
-      response.body.should eq("post")
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.body).to eq("post")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "executes HEAD requests" do
       response = HTTPI.head(@server.url, adapter)
-      response.code.should == 200
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.code).to eq(200)
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "executes PUT requests" do
       response = HTTPI.put(@server.url, "<some>xml</some>", adapter)
-      response.body.should eq("put")
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.body).to eq("put")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "executes DELETE requests" do
       response = HTTPI.delete(@server.url, adapter)
-      response.body.should eq("delete")
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.body).to eq("delete")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "supports basic authentication" do
@@ -65,7 +65,7 @@ describe HTTPI::Adapter::NetHTTP do
       request.auth.basic("admin", "secret")
 
       response = HTTPI.get(request, adapter)
-      response.body.should eq("basic-auth")
+      expect(response.body).to eq("basic-auth")
     end
 
     # it does not support digest authentication
@@ -77,8 +77,8 @@ describe HTTPI::Adapter::NetHTTP do
         res += body
       end
       response = HTTPI.post(request, adapter)
-      res.should eq("post")
-      response.body.to_s.should eq("")
+      expect(res).to eq("post")
+      expect(response.body.to_s).to eq("")
     end
   end
 
@@ -128,7 +128,7 @@ describe HTTPI::Adapter::NetHTTP do
         request.auth.ntlm(user,pass)
         response = HTTPI.get(request, adapter)
         expect(response.code).to eq(200)
-        response.body.should match(/iis-8\.png/)
+        expect(response.body).to match(/iis-8\.png/)
 
         puts "EXTERNAL NTLM INTEGRATION TEST, response body:"
         puts response.body