All error and format handling works over REST except searching.

Searching operates on multiple instances, and I have not
yet figured out how we should handle converting multiple
instances to a given format -- we can't use the instance
method (e.g., to_yaml), because it would be on Array
instead of the class we're operating on.  That would work
for yaml, but not, for instance, for xml.

2 files changed, 23 insertions, 4 deletions

diff --git a/spec/unit/network/http/handler.rb b/spec/unit/network/http/handler.rb
index 36e566624..0f60b9b10 100755
--- a/spec/unit/network/http/handler.rb
+++ b/spec/unit/network/http/handler.rb
@@ -212,6 +212,11 @@ describe Puppet::Network::HTTP::Handler do
             @handler.process(@request, @response)
         end
 
+        it "should set the format to text/plain when serializing an exception" do
+            @handler.expects(:set_content_type).with(@response, "text/plain")
+            @handler.do_exception(@response, "A test", 404)
+        end
+
         describe "when finding a model instance" do
             before do
                 @handler.stubs(:http_method).returns('GET')
@@ -262,6 +267,13 @@ describe Puppet::Network::HTTP::Handler do
                 @handler.do_find(@request, @response)
             end
 
+            it "should return a 404 when no model instance can be found" do
+                @model_class.stubs(:name).returns "my name"
+                @handler.expects(:set_response).with { |response, body, status| status == 404 }
+                @model_class.stubs(:find).returns(nil)
+                @handler.do_find(@request, @response)
+            end
+
             it "should serialize the result in with the appropriate format" do
                 @model_instance = stub('model instance')
 
diff --git a/spec/unit/network/http/webrick/rest.rb b/spec/unit/network/http/webrick/rest.rb
index b42053d53..4c72ec545 100755
--- a/spec/unit/network/http/webrick/rest.rb
+++ b/spec/unit/network/http/webrick/rest.rb
@@ -33,7 +33,7 @@ describe Puppet::Network::HTTP::WEBrickREST do
 
         describe "when using the Handler interface" do
             it "should use the 'accept' request parameter as the Accept header" do
-                @request.expects(:[]).with(:accept).returns "foobar"
+                @request.expects(:[]).with("accept").returns "foobar"
                 @handler.accept_header(@request).should == "foobar"
             end
 
@@ -57,17 +57,24 @@ describe Puppet::Network::HTTP::WEBrickREST do
                 @handler.body(@request).should == "my body"
             end
 
-            it "should set the response's :content_type header when setting the content type" do
-                @response.expects(:[]=).with(:content_type, "text/html")
+            it "should set the response's 'content-type' header when setting the content type" do
+                @response.expects(:[]=).with("content-type", "text/html")
                 @handler.set_content_type(@response, "text/html")
             end
 
-            it "should set the status and body on the response when setting the response" do
+            it "should set the status and body on the response when setting the response for a successful query" do
                 @response.expects(:status=).with 200
                 @response.expects(:body=).with "mybody"
 
                 @handler.set_response(@response, "mybody", 200)
             end
+
+            it "should set the status and message on the response when setting the response for a failed query" do
+                @response.expects(:status=).with 400
+                @response.expects(:reason_phrase=).with "mybody"
+
+                @handler.set_response(@response, "mybody", 400)
+            end
         end
 
         describe "and determining the request parameters" do