Download as
Browse Code »

Commit a065557208d6076ec869144346e06c7de714389c

Authored by Alex Denisov
1 parent 915dac00
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Common errors method added

Showing 2 changed files with 9 additions and 5 deletions   Show diff stats
lib/api/helpers.rb
  Diff comments   View file @a065557
@@ -31,22 +31,26 @@ module Gitlab @@ -31,22 +31,26 @@ module Gitlab
31 # error helpers 31 # error helpers
32 32
33 def forbidden! 33 def forbidden!
34 - error!({'message' => '403 Forbidden'}, 403) 34 + render_api_error!('403 Forbidden', 403)
35 end 35 end
36 36
37 def not_found!(resource = nil) 37 def not_found!(resource = nil)
38 message = ["404"] 38 message = ["404"]
39 message << resource if resource 39 message << resource if resource
40 message << "Not Found" 40 message << "Not Found"
41 - error!({'message' => message.join(' ')}, 404) 41 + render_api_error!(message.join(' '), 404)
42 end 42 end
43 43
44 def unauthorized! 44 def unauthorized!
45 - error!({'message' => '401 Unauthorized'}, 401) 45 + render_api_error!('401 Unauthorized', 401)
46 end 46 end
47 47
48 def not_allowed! 48 def not_allowed!
49 - error!({'message' => 'method not allowed'}, 405) 49 + render_api_error!('Method Not Allowed', 405)
  50 + end
  51 +
  52 + def render_api_error!(message, status)
  53 + error!({'message' => message}, status)
50 end 54 end
51 55
52 private 56 private
spec/requests/api/projects_spec.rb
  Diff comments   View file @a065557
@@ -85,7 +85,7 @@ describe Gitlab::API do @@ -85,7 +85,7 @@ describe Gitlab::API do
85 it "should return a 404 error if not found" do 85 it "should return a 404 error if not found" do
86 get api("/projects/42", user) 86 get api("/projects/42", user)
87 response.status.should == 404 87 response.status.should == 404
88 - json_response['message'].should == '404 Not found' 88 + json_response['message'].should == '404 Not Found'
89 end 89 end
90 end 90 end
91 91