From a065557208d6076ec869144346e06c7de714389c Mon Sep 17 00:00:00 2001
From: Alex Denisov <1101.debian@gmail.com>
Date: Mon, 10 Sep 2012 13:49:00 +0300
Subject: Common errors method added

---
 lib/api/helpers.rb                 | 12 ++++++++----
 spec/requests/api/projects_spec.rb |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 3a385f1582a..054eb2d3f70 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -31,22 +31,26 @@ module Gitlab
     # error helpers
 
     def forbidden!
-      error!({'message' => '403 Forbidden'}, 403)
+      render_api_error!('403 Forbidden', 403)
     end
 
     def not_found!(resource = nil)
       message = ["404"]
       message << resource if resource
       message << "Not Found"
-      error!({'message' => message.join(' ')}, 404)
+      render_api_error!(message.join(' '), 404)
     end
 
     def unauthorized!
-      error!({'message' => '401 Unauthorized'}, 401)
+      render_api_error!('401 Unauthorized', 401)
     end
 
     def not_allowed!
-        error!({'message' => 'method not allowed'}, 405)
+      render_api_error!('Method Not Allowed', 405)
+    end
+
+    def render_api_error!(message, status)
+      error!({'message' => message}, status)
     end
 
     private 
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index 439aeccecec..9388403f762 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -85,7 +85,7 @@ describe Gitlab::API do
     it "should return a 404 error if not found" do
       get api("/projects/42", user)
       response.status.should == 404
-      json_response['message'].should == '404 Not found'
+      json_response['message'].should == '404 Not Found'
     end
   end
 
-- 
cgit v1.2.1