Skip to content

Commit

Permalink
/users[/] doc
Browse files Browse the repository at this point in the history
  • Loading branch information
fengmk2 committed Jul 25, 2013
1 parent 72ddd9d commit 5c70643
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: node_js
node_js:
- 0.8
- '0.8'
- '0.10'
- '0.11'
script: make test-coveralls
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ test-all: test test-cov
test-coveralls:
@$(MAKE) test
@echo TRAVIS_JOB_ID $(TRAVIS_JOB_ID)
@$(MAKE) test MOCHA_OPTS='--require blanket' REPORTER=mocha-lcov-reporter | ./node_modules/coveralls/bin/coveralls.js
@-$(MAKE) test MOCHA_OPTS='--require blanket' REPORTER=mocha-lcov-reporter | ./node_modules/coveralls/bin/coveralls.js

.PHONY: test-cov test test-all install test-coveralls
.PHONY: test
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ $ npm install restful-router
*
* URL routes:
*
* GET /users => user.list()
* GET /users[/] => user.list()
* GET /users/new => user.new()
* GET /users/:id => user.show()
* GET /users/:id/edit => user.edit()
* POST /users => user.create()
* POST /users[/] => user.create()
* PATCH /users/:id => user.update()
* DELETE /users/:id => user.destroy()
*
Expand Down
6 changes: 3 additions & 3 deletions lib/restful-router.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ var debug = require('debug')('restful-router');
*
* URL routes:
*
* GET /users => user.list()
* GET /users[/] => user.list()
* GET /users/new => user.new()
* GET /users/:id => user.show()
* GET /users/:id/edit => user.edit()
* POST /users => user.create()
* POST /users[/] => user.create()
* PATCH /users/:id => user.update()
* DELETE /users/:id => user.destroy()
*
Expand Down Expand Up @@ -62,4 +62,4 @@ module.exports = function restfulRouter(options) {
debug('%s %s', route[0], route[1]);
}
}
};
};
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}
},
"dependencies": {
"debug": "0.x"
"debug": "0.7.2"
},
"devDependencies": {
"should": "*",
Expand All @@ -27,7 +27,8 @@
"urlrouter": ">=0.4.0",
"supertest": "*",
"connect": "*",
"mocha": "*"
"mocha": "*",
"pedding": "*"
},
"repository": {
"type": "git",
Expand Down
18 changes: 16 additions & 2 deletions test/restful-router.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,24 @@
* Module dependencies.
*/

var restful = require('../');
var pedding = require('pedding');
var should = require('should');
var app = require('../example/app');
var request = require('supertest');
var restful = require('../');
var app = require('../example/app');

describe('restful-router.test.js', function () {
it('should get /users => user.list', function (done) {
done = pedding(2, done);
request(app)
.get('/users')
.expect('GET /users => list, query: {}')
.expect(200, done);

request(app)
.get('/users/')
.expect('GET /users => list, query: {}')
.expect(200, done);
});

it('should get /users/new => user.new', function (done) {
Expand All @@ -45,11 +52,18 @@ describe('restful-router.test.js', function () {
});

it('should post /users => user.create', function (done) {
done = pedding(2, done);
request(app)
.post('/users')
.send({ name: 'foo' })
.expect('POST /users => create, query: {}, params: {}, body: {"name":"foo"}')
.expect(200, done);

request(app)
.post('/users/')
.send({ name: 'foo' })
.expect('POST /users => create, query: {}, params: {}, body: {"name":"foo"}')
.expect(200, done);
});

it('should put /users/:id => user.update', function (done) {
Expand Down

0 comments on commit 5c70643

Please sign in to comment.