Skip to content

Commit

Permalink
Rename serverTimeout to serverUnavailable. Closes #117. (#119)
Browse files Browse the repository at this point in the history
* Rename serverTiemout to serverUnavailable

* Revert TOC changes

* Put back tests for serverTimeout
  • Loading branch information
savardc authored and arb committed Jun 20, 2016
1 parent 5d67ac0 commit c082525
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 7 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -653,14 +653,14 @@ Generates the following response payload:
}
```

### `Boom.serverTimeout([message], [data])`
### `Boom.serverUnavailable([message], [data])`

Returns a 503 Service Unavailable error where:
- `message` - optional message.
- `data` - optional additional error data.

```js
Boom.serverTimeout('unavailable');
Boom.serverUnavailable('unavailable');
```

Generates the following response payload:
Expand Down
7 changes: 5 additions & 2 deletions lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -375,11 +375,14 @@ exports.badGateway = function (message, data) {
};


exports.serverTimeout = function (message, data) {
exports.serverUnavailable = function (message, data) {

return internals.serverError(message, data, 503, exports.serverTimeout);
return internals.serverError(message, data, 503, exports.serverUnavailable);
};

// Deprecated
exports.serverTimeout = exports.serverUnavailable;


exports.gatewayTimeout = function (message, data) {

Expand Down
20 changes: 17 additions & 3 deletions test/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,6 @@ describe('illegal()', () => {
});
});


describe('serverTimeout()', () => {

it('returns a 503 error statusCode', (done) => {
Expand All @@ -542,6 +541,21 @@ describe('serverTimeout()', () => {
});
});

describe('serverUnavailable()', () => {

it('returns a 503 error statusCode', (done) => {

expect(Boom.serverUnavailable().output.statusCode).to.equal(503);
done();
});

it('sets the message with the passed in message', (done) => {

expect(Boom.serverUnavailable('my message').message).to.equal('my message');
done();
});
});

describe('forbidden()', () => {

it('returns a 403 error statusCode', (done) => {
Expand Down Expand Up @@ -678,8 +692,8 @@ describe('stack trace', () => {
'badData', 'preconditionRequired', 'tooManyRequests',

// 500s
'internal', 'notImplemented', 'badGateway', 'serverTimeout', 'gatewayTimeout',
'badImplementation'
'internal', 'notImplemented', 'badGateway', 'serverTimeout', 'serverUnavailable',
'gatewayTimeout', 'badImplementation'
].forEach((name) => {

const err = Boom[name]();
Expand Down

0 comments on commit c082525

Please sign in to comment.