prettify error message

NARKOZ · Oct 13, 2013 · 93e8b81 · 93e8b81
1 parent 42e6c06
commit 93e8b81
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/gitlab/request.rb b/lib/gitlab/request.rb
@@ -72,7 +72,8 @@ def validate(response)
     end
 
     def error_message(response)
-      "Server responded with code #{response.code}, message: #{response.parsed_response.message}. For request: #{response.request.base_uri}#{response.request.path}"
+      "Server responded with code #{response.code}, message: #{response.parsed_response.message}. " \
+      "Request URI: #{response.request.base_uri}#{response.request.path}"
     end
 
     # Sets a base_uri and private_token parameter for requests.

diff --git a/spec/gitlab/client/user_teams_spec.rb b/spec/gitlab/client/user_teams_spec.rb
@@ -104,7 +104,9 @@
         stub_request(:post, "#{Gitlab.endpoint}/user_teams/3/members").
             with(:query => {:private_token => Gitlab.private_token}).
             to_return({:body => load_fixture("error_already_exists"), :status => 409})
-        expect {Gitlab.add_user_team_member(3, 1, 40)}.to raise_error(Gitlab::Error::Conflict) {|e|e.message.should == "Server responded with code 409, message: 409 Already exists. For request: #{Gitlab.endpoint}/user_teams/3/members"}
+        expect {
+          Gitlab.add_user_team_member(3, 1, 40)
+        }.to raise_error(Gitlab::Error::Conflict, "Server responded with code 409, message: 409 Already exists. Request URI: #{Gitlab.endpoint}/user_teams/3/members")
       end
     end
   end