spec/http_stubs.rb in cobweb-1.0.12 vs spec/http_stubs.rb in cobweb-1.0.15
- old
+ new
@@ -19,77 +19,77 @@
:"Transfer-Encoding" => "chunked",
:"Server" => "gws",
:"X-XSS-Protection" => "1; mode=block"}
- @mock_http_client = mock(Net::HTTP)
- @mock_http_request = mock(Net::HTTPRequest)
- @mock_http_robot_request = mock(Net::HTTPRequest)
- @mock_http_redirect_request = mock(Net::HTTPRequest)
- @mock_http_redirect_request2 = mock(Net::HTTPRequest)
+ @mock_http_client = double(Net::HTTP)
+ @mock_http_request = double(Net::HTTPRequest)
+ @mock_http_robot_request = double(Net::HTTPRequest)
+ @mock_http_redirect_request = double(Net::HTTPRequest)
+ @mock_http_redirect_request2 = double(Net::HTTPRequest)
- @mock_http_response = mock(Net::HTTPResponse)
- @mock_http_robot_response = mock(Net::HTTPResponse)
- @mock_http_redirect_response = mock(Net::HTTPRedirection)
- @mock_http_redirect_response2 = mock(Net::HTTPRedirection)
- @mock_http_get = mock(Net::HTTP::Get)
+ @mock_http_response = double(Net::HTTPResponse)
+ @mock_http_robot_response = double(Net::HTTPResponse)
+ @mock_http_redirect_response = double(Net::HTTPRedirection)
+ @mock_http_redirect_response2 = double(Net::HTTPRedirection)
+ @mock_http_get = double(Net::HTTP::Get)
- Net::HTTP.stub!(:new).and_return(@mock_http_client)
- Net::HTTP::Get.stub!(:new).and_return(@mock_http_request)
- Net::HTTP::Get.stub!(:new).with("/redirect.html", an_instance_of(Hash)).and_return(@mock_http_redirect_request)
- Net::HTTP::Get.stub!(:new).with("/robots.txt", an_instance_of(Hash)).and_return(@mock_http_robot_request)
- Net::HTTP::Get.stub!(:new).with("/redirect2.html", an_instance_of(Hash)).and_return(@mock_http_redirect_request2)
- Net::HTTP::Get.stub!(:new).with("/redirected.html", an_instance_of(Hash)).and_return(@mock_http_request)
+ Net::HTTP.stub(:new).and_return(@mock_http_client)
+ Net::HTTP::Get.stub(:new).and_return(@mock_http_request)
+ Net::HTTP::Get.stub(:new).with("/redirect.html", an_instance_of(Hash)).and_return(@mock_http_redirect_request)
+ Net::HTTP::Get.stub(:new).with("/robots.txt", an_instance_of(Hash)).and_return(@mock_http_robot_request)
+ Net::HTTP::Get.stub(:new).with("/redirect2.html", an_instance_of(Hash)).and_return(@mock_http_redirect_request2)
+ Net::HTTP::Get.stub(:new).with("/redirected.html", an_instance_of(Hash)).and_return(@mock_http_request)
- Net::HTTP::Head.stub!(:new).and_return(@mock_http_request)
+ Net::HTTP::Head.stub(:new).and_return(@mock_http_request)
- @mock_http_client.stub!(:request).with(@mock_http_request).and_return(@mock_http_response)
- @mock_http_client.stub!(:request).with(@mock_http_robot_request).and_return(@mock_http_robot_response)
- @mock_http_client.stub!(:request).with(@mock_http_redirect_request).and_return(@mock_http_redirect_response)
- @mock_http_client.stub!(:request).with(@mock_http_redirect_request2).and_return(@mock_http_redirect_response2)
- @mock_http_client.stub!(:read_timeout=).and_return(nil)
- @mock_http_client.stub!(:open_timeout=).and_return(nil)
- @mock_http_client.stub!(:start).and_return(@mock_http_response)
- @mock_http_client.stub!(:address).and_return("www.baseurl.com")
- @mock_http_client.stub!(:port).and_return("80")
+ @mock_http_client.stub(:request).with(@mock_http_request).and_return(@mock_http_response)
+ @mock_http_client.stub(:request).with(@mock_http_robot_request).and_return(@mock_http_robot_response)
+ @mock_http_client.stub(:request).with(@mock_http_redirect_request).and_return(@mock_http_redirect_response)
+ @mock_http_client.stub(:request).with(@mock_http_redirect_request2).and_return(@mock_http_redirect_response2)
+ @mock_http_client.stub(:read_timeout=).and_return(nil)
+ @mock_http_client.stub(:open_timeout=).and_return(nil)
+ @mock_http_client.stub(:start).and_return(@mock_http_response)
+ @mock_http_client.stub(:address).and_return("www.baseurl.com")
+ @mock_http_client.stub(:port).and_return("80")
- @mock_http_robot_response.stub!(:code).and_return(200)
- @mock_http_robot_response.stub!(:body).and_return(File.open(File.dirname(__FILE__) + '/../spec/samples/robots.txt', "r").read)
- @mock_http_robot_response.stub!(:content_type).and_return("text/plain")
- @mock_http_robot_response.stub!(:[]).with("Content-Type").and_return(@default_headers["Content-Type"])
- @mock_http_robot_response.stub!(:[]).with("location").and_return(@default_headers["location"])
- @mock_http_robot_response.stub!(:[]).with("Content-Encoding").and_return(@default_headers["Content-Encoding"])
- @mock_http_robot_response.stub!(:content_length).and_return(1024)
- @mock_http_robot_response.stub!(:get_fields).with('set-cookie').and_return(["session=al98axx; expires=Fri, 31-Dec-1999 23:58:23", "query=rubyscript; expires=Fri, 31-Dec-1999 23:58:23"])
- @mock_http_robot_response.stub!(:to_hash).and_return(@default_headers)
+ @mock_http_robot_response.stub(:code).and_return(200)
+ @mock_http_robot_response.stub(:body).and_return(File.open(File.dirname(__FILE__) + '/../spec/samples/robots.txt', "r").read)
+ @mock_http_robot_response.stub(:content_type).and_return("text/plain")
+ @mock_http_robot_response.stub(:[]).with("Content-Type").and_return(@default_headers["Content-Type"])
+ @mock_http_robot_response.stub(:[]).with("location").and_return(@default_headers["location"])
+ @mock_http_robot_response.stub(:[]).with("Content-Encoding").and_return(@default_headers["Content-Encoding"])
+ @mock_http_robot_response.stub(:content_length).and_return(1024)
+ @mock_http_robot_response.stub(:get_fields).with('set-cookie').and_return(["session=al98axx; expires=Fri, 31-Dec-1999 23:58:23", "query=rubyscript; expires=Fri, 31-Dec-1999 23:58:23"])
+ @mock_http_robot_response.stub(:to_hash).and_return(@default_headers)
- @mock_http_response.stub!(:code).and_return(200)
- @mock_http_response.stub!(:content_type).and_return("text/html")
- @mock_http_response.stub!(:[]).with("Content-Type").and_return(@default_headers["Content-Type"])
- @mock_http_response.stub!(:[]).with("location").and_return(@default_headers["location"])
- @mock_http_response.stub!(:[]).with("Content-Encoding").and_return(@default_headers["Content-Encoding"])
- @mock_http_response.stub!(:content_length).and_return(1024)
- @mock_http_response.stub!(:body).and_return("asdf")
- @mock_http_response.stub!(:get_fields).with('set-cookie').and_return(["session=al98axx; expires=Fri, 31-Dec-1999 23:58:23", "query=rubyscript; expires=Fri, 31-Dec-1999 23:58:23"])
- @mock_http_response.stub!(:to_hash).and_return(@default_headers)
+ @mock_http_response.stub(:code).and_return(200)
+ @mock_http_response.stub(:content_type).and_return("text/html")
+ @mock_http_response.stub(:[]).with("Content-Type").and_return(@default_headers["Content-Type"])
+ @mock_http_response.stub(:[]).with("location").and_return(@default_headers["location"])
+ @mock_http_response.stub(:[]).with("Content-Encoding").and_return(@default_headers["Content-Encoding"])
+ @mock_http_response.stub(:content_length).and_return(1024)
+ @mock_http_response.stub(:body).and_return("asdf")
+ @mock_http_response.stub(:get_fields).with('set-cookie').and_return(["session=al98axx; expires=Fri, 31-Dec-1999 23:58:23", "query=rubyscript; expires=Fri, 31-Dec-1999 23:58:23"])
+ @mock_http_response.stub(:to_hash).and_return(@default_headers)
- @mock_http_redirect_response.stub!(:code).and_return(301)
- @mock_http_redirect_response.stub!(:content_type).and_return("text/html")
- @mock_http_redirect_response.stub!(:[]).with("Content-Type").and_return(@default_headers["Content-Type"])
- @mock_http_redirect_response.stub!(:[]).with("location").and_return("http://redirected-to.com/redirect2.html")
- @mock_http_redirect_response.stub!(:[]).with("Content-Encoding").and_return(@default_headers["Content-Encoding"])
- @mock_http_redirect_response.stub!(:content_length).and_return(2048)
- @mock_http_redirect_response.stub!(:body).and_return("redirected body")
- @mock_http_redirect_response.stub!(:get_fields).with('set-cookie').and_return(["session=al98axx; expires=Fri, 31-Dec-1999 23:58:23", "query=rubyscript; expires=Fri, 31-Dec-1999 23:58:23"])
- @mock_http_redirect_response.stub!(:to_hash).and_return(@default_headers)
+ @mock_http_redirect_response.stub(:code).and_return(301)
+ @mock_http_redirect_response.stub(:content_type).and_return("text/html")
+ @mock_http_redirect_response.stub(:[]).with("Content-Type").and_return(@default_headers["Content-Type"])
+ @mock_http_redirect_response.stub(:[]).with("location").and_return("http://redirected-to.com/redirect2.html")
+ @mock_http_redirect_response.stub(:[]).with("Content-Encoding").and_return(@default_headers["Content-Encoding"])
+ @mock_http_redirect_response.stub(:content_length).and_return(2048)
+ @mock_http_redirect_response.stub(:body).and_return("redirected body")
+ @mock_http_redirect_response.stub(:get_fields).with('set-cookie').and_return(["session=al98axx; expires=Fri, 31-Dec-1999 23:58:23", "query=rubyscript; expires=Fri, 31-Dec-1999 23:58:23"])
+ @mock_http_redirect_response.stub(:to_hash).and_return(@default_headers)
- @mock_http_redirect_response2.stub!(:code).and_return(301)
- @mock_http_redirect_response2.stub!(:content_type).and_return("text/html")
- @mock_http_redirect_response2.stub!(:[]).with("Content-Type").and_return(@default_headers["Content-Type"])
- @mock_http_redirect_response2.stub!(:[]).with("location").and_return("http://redirected-to.com/redirected.html")
- @mock_http_redirect_response2.stub!(:[]).with("Content-Encoding").and_return(@default_headers["Content-Encoding"])
- @mock_http_redirect_response2.stub!(:content_length).and_return(2048)
- @mock_http_redirect_response2.stub!(:body).and_return("redirected body")
- @mock_http_redirect_response2.stub!(:get_fields).with('set-cookie').and_return(["session=al98axx; expires=Fri, 31-Dec-1999 23:58:23", "query=rubyscript; expires=Fri, 31-Dec-1999 23:58:23"])
- @mock_http_redirect_response2.stub!(:to_hash).and_return(@default_headers)
+ @mock_http_redirect_response2.stub(:code).and_return(301)
+ @mock_http_redirect_response2.stub(:content_type).and_return("text/html")
+ @mock_http_redirect_response2.stub(:[]).with("Content-Type").and_return(@default_headers["Content-Type"])
+ @mock_http_redirect_response2.stub(:[]).with("location").and_return("http://redirected-to.com/redirected.html")
+ @mock_http_redirect_response2.stub(:[]).with("Content-Encoding").and_return(@default_headers["Content-Encoding"])
+ @mock_http_redirect_response2.stub(:content_length).and_return(2048)
+ @mock_http_redirect_response2.stub(:body).and_return("redirected body")
+ @mock_http_redirect_response2.stub(:get_fields).with('set-cookie').and_return(["session=al98axx; expires=Fri, 31-Dec-1999 23:58:23", "query=rubyscript; expires=Fri, 31-Dec-1999 23:58:23"])
+ @mock_http_redirect_response2.stub(:to_hash).and_return(@default_headers)
end
end
\ No newline at end of file