From 81b14cfac6002536c7d340f1f21d9916a49729f6 Mon Sep 17 00:00:00 2001 From: Daniel Saewitz Date: Wed, 20 Mar 2013 16:52:32 -0400 Subject: [PATCH 1/2] Add alternate scoreTask --- src/server/api.coffee | 12 +++++++++--- test/api.mocha.coffee | 13 +++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/server/api.coffee b/src/server/api.coffee index 08ec4cb11c..1c0cdb57b9 100644 --- a/src/server/api.coffee +++ b/src/server/api.coffee @@ -54,8 +54,9 @@ router.get '/user', auth, (req, res) -> user.stats.maxHealth = 50 delete user.apiToken - delete user.auth.hashed_password - delete user.auth.salt + if user.auth + delete user.auth.hashed_password + delete user.auth.salt res.json user @@ -186,10 +187,15 @@ scoreTask = (req, res, next) -> delta = scoring.score(model, taskId, direction) result = model.get ('_user.stats') result.delta = delta - res.send(result) + res.json result +### + POST /user/tasks/:taskId/:direction +### +router.post '/user/task/:taskId/:direction', auth, scoreTask router.post '/user/tasks/:taskId/:direction', auth, scoreTask + module.exports = router module.exports.auth = auth module.exports.scoreTask = scoreTask # export so deprecated can call it diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee index e243322bd9..ce25d0f99d 100644 --- a/test/api.mocha.coffee +++ b/test/api.mocha.coffee @@ -271,3 +271,16 @@ describe 'API', -> expect(res.statusCode).to.be 400 expect(res.body.err).to.be 'No task found.' done() + + it 'POST /api/v1/user/task/:id/up', (done) -> + tid = currentUser.habitIds[0] + request.post("#{baseURL}/user/task/#{tid}/up") + .set('Accept', 'application/json') + .set('X-API-User', currentUser.id) + .set('X-API-Key', currentUser.apiToken) + .send({}) + .end (res) -> + expect(res.body.err).to.be undefined + expect(res.statusCode).to.be 200 + expect(res.body).to.eql { gp: 1, exp: 7.5, lvl: 1, hp: 50, delta: 1 } + done() From 4d3db53befd2ca7e89074b27422535e55a0696e2 Mon Sep 17 00:00:00 2001 From: Daniel Saewitz Date: Thu, 21 Mar 2013 11:56:06 -0400 Subject: [PATCH 2/2] Remove extra newline --- src/server/api.coffee | 1 - 1 file changed, 1 deletion(-) diff --git a/src/server/api.coffee b/src/server/api.coffee index 1c0cdb57b9..3ba6227217 100644 --- a/src/server/api.coffee +++ b/src/server/api.coffee @@ -195,7 +195,6 @@ scoreTask = (req, res, next) -> router.post '/user/task/:taskId/:direction', auth, scoreTask router.post '/user/tasks/:taskId/:direction', auth, scoreTask - module.exports = router module.exports.auth = auth module.exports.scoreTask = scoreTask # export so deprecated can call it