Skip to content

Commit fbc99c0

Browse files
committedOct 9, 2015
use default http status messages
1 parent f68bbca commit fbc99c0

File tree

3 files changed

+9
-34
lines changed

3 files changed

+9
-34
lines changed
 

‎lib/http-status.js

+3-28
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
var http = require('http');
12
var util = require('util');
3+
var _ = require('lodash');
24

35
var STATUS_CODE_ATTRIBUTE_NAME = module.exports.STATUS_CODE_ATTRIBUTE_NAME = 'status';
46

@@ -59,31 +61,4 @@ var code_map = HttpStatusError.code_map = {
5961
"AlreadyInUseError": 409,
6062
};
6163

62-
var message_map = HttpStatusError.message_map = {
63-
400: "Bad Request!",
64-
401: "Authentication Required!",
65-
402: "Payment Required!",
66-
403: "Forbidden!",
67-
404: "Not Found!",
68-
405: "Method not Allowed!",
69-
406: "Response Type Not Acceptable!",
70-
407: "Proxy Authentication Required!",
71-
408: "Request Timeout!",
72-
409: "Conflict!",
73-
410: "Gone!",
74-
411: "Content-Length Required!",
75-
412: "Precondition Failed!",
76-
413: "Request Entity Too Lage!",
77-
414: "Request URI Too Long!",
78-
415: "Unsupported Media Type!",
79-
416: "Requested Range Not Satisfiable!",
80-
417: "Expectation Failed!",
81-
429: "Too Many Requests!",
82-
500: "Internal Server Error!",
83-
501: "Not Implemented!",
84-
502: "Bad Gateway!",
85-
503: "Service Unavailable!",
86-
504: "Gateway Timeout!",
87-
505: "HTTP Version Not Supported!"
88-
};
89-
64+
var message_map = HttpStatusError.message_map = _.extend({}, http.STATUS_CODES);

‎tests/http-status.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ describe("HttpStatusError", function(){
2020

2121
it("should work with status code", function(){
2222
var error = new HttpStatusError(403);
23-
assert.equal(error.message, "(403) Forbidden!");
23+
assert.equal(error.message, "(403) Forbidden");
2424
assert.equal(error.status, 403);
2525
assert.equal(error.status_code, 403);
2626
assert.equal(error.statusCode, 403);
@@ -38,7 +38,7 @@ describe("HttpStatusError", function(){
3838

3939
it("should work with status code without new", function(){
4040
var error = HttpStatusError(403);
41-
assert.equal(error.message, "(403) Forbidden!");
41+
assert.equal(error.message, "(403) Forbidden");
4242
assert.equal(error.status, 403);
4343
assert.equal(error.status_code, 403);
4444
assert.equal(error.statusCode, 403);

‎tests/middleware/errorHandler.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ describe("errorHandler", function(){
131131
err = new Error("test");
132132
request.get('/error').end(function(err, res){
133133
assert.equal(res.res.statusCode, 500);
134-
assert.equal(res.text, "Internal Server Error!");
134+
assert.equal(res.text, "Internal Server Error");
135135
assert.ok(console.error.called);
136136
assert.ok(/test/.test(console.error.getCall(0).args[0]));
137137
done();
@@ -143,7 +143,7 @@ describe("errorHandler", function(){
143143
err.status = 544;
144144
request.get('/error').end(function(err, res){
145145
assert.equal(res.res.statusCode, 544);
146-
assert.equal(res.text, "Internal Server Error!");
146+
assert.equal(res.text, "Internal Server Error");
147147
assert.ok(console.error.called);
148148
assert.ok(/test/.test(console.error.getCall(0).args[0]));
149149
done();
@@ -154,7 +154,7 @@ describe("errorHandler", function(){
154154
err = new errors.HttpStatus('custom status message', 544);
155155
request.get('/error').end(function(err, res){
156156
assert.equal(res.res.statusCode, 544);
157-
assert.equal(res.text, "Internal Server Error!");
157+
assert.equal(res.text, "Internal Server Error");
158158
assert.ok(console.error.called);
159159
assert.ok(/custom status message/.test(console.error.getCall(0).args[0]));
160160
done();
@@ -165,7 +165,7 @@ describe("errorHandler", function(){
165165
err = new errors.HttpStatus(544, 'custom status message')
166166
request.get('/error').end(function(err, res){
167167
assert.equal(res.res.statusCode, 544);
168-
assert.equal(res.text, "Internal Server Error!");
168+
assert.equal(res.text, "Internal Server Error");
169169
assert.ok(console.error.called);
170170
assert.ok(/custom status message/.test(console.error.getCall(0).args[0]));
171171
done();

0 commit comments

Comments
 (0)
Please sign in to comment.