request_spec.rb in metainspector-4.3.1

- old
+ new

@@ -4,43 +4,49 @@
 
   describe "read" do
     it "should return the content of the page" do
       page_request = MetaInspector::Request.new(url('http://pagerankalert.com'))
 
-      page_request.read[0..14].should == "<!DOCTYPE html>"
+      expect(page_request.read[0..14]).to eq("<!DOCTYPE html>")
     end
   end
 
   describe "response" do
     it "contains the response status" do
       page_request = MetaInspector::Request.new(url('http://example.com'))
-      page_request.response.status.should == 200
+      expect(page_request.response.status).to eq(200)
     end
 
     it "contains the response headers" do
       page_request = MetaInspector::Request.new(url('http://example.com'))
-      page_request.response.headers
-        .should == {"server"=>"nginx/0.7.67", "date"=>"Fri, 18 Nov 2011 21:46:46 GMT",
+      expect(page_request.response.headers)
+        .to eq({"server"=>"nginx/0.7.67", "date"=>"Fri, 18 Nov 2011 21:46:46 GMT",
                     "content-type"=>"text/html", "connection"=>"keep-alive",
                     "last-modified"=>"Mon, 14 Nov 2011 16:53:18 GMT",
                     "content-length"=>"4987", "x-varnish"=>"2000423390",
-                    "age"=>"0", "via"=>"1.1 varnish"}
+                    "age"=>"0", "via"=>"1.1 varnish"})
     end
   end
 
   describe "content_type" do
     it "should return the correct content type of the url for html pages" do
       page_request = MetaInspector::Request.new(url('http://pagerankalert.com'))
 
-      page_request.content_type.should == "text/html"
+      expect(page_request.content_type).to eq("text/html")
     end
 
     it "should return the correct content type of the url for non html pages" do
       image_request = MetaInspector::Request.new(url('http://pagerankalert.com/image.png'))
 
-      image_request.content_type.should == "image/png"
+      expect(image_request.content_type).to eq("image/png")
     end
+
+    it "should return nil if there is not content type present" do
+      request = MetaInspector::Request.new(url('http://example.com/no-content-type'))
+
+      expect(request.content_type).to be(nil)
+    end
   end
 
   describe 'exception handling' do
     let(:logger) { MetaInspector::ExceptionLog.new }
 
@@ -51,11 +57,11 @@
     after(:each) do
       FakeWeb.allow_net_connect = false
     end
 
     it "should handle socket errors" do
-      TCPSocket.stub(:open).and_raise(SocketError)
-      logger.should receive(:<<).with(an_instance_of(Faraday::Error::ConnectionFailed))
+      allow(TCPSocket).to receive(:open).and_raise(SocketError)
+      expect(logger).to receive(:<<).with(an_instance_of(Faraday::Error::ConnectionFailed))
 
       MetaInspector::Request.new(url('http://caca232dsdsaer3sdsd-asd343.org'), exception_log: logger)
     end
   end
 