From 5141aeda78a834cf55cda9ed9190227f0fdf3472 Mon Sep 17 00:00:00 2001 From: Daniel Saewitz Date: Wed, 6 Mar 2013 19:59:19 -0500 Subject: [PATCH 1/2] Fix broken tnl test --- test/api.mocha.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee index 2b185afd96..f622810a40 100644 --- a/test/api.mocha.coffee +++ b/test/api.mocha.coffee @@ -100,8 +100,8 @@ describe 'API', -> expect(res.body.id).not.to.be.empty() self = _.clone(currentUser) delete self.apiToken - # To next level should be 100 - self.stats.tnl = 100 + # To next level + self.stats.tnl = 150 self.stats.maxHealth = 50 expect(res.body).to.eql self From 7cb291c4de7f604505276557ac7ca1a981695faf Mon Sep 17 00:00:00 2001 From: Daniel Saewitz Date: Wed, 6 Mar 2013 20:39:48 -0500 Subject: [PATCH 2/2] Rename user.stats.tnl to user.stats.toNextLevel --- src/server/api.coffee | 2 +- test/api.mocha.coffee | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/server/api.coffee b/src/server/api.coffee index 3fe4bd598a..6bdc0699c4 100644 --- a/src/server/api.coffee +++ b/src/server/api.coffee @@ -42,7 +42,7 @@ auth = (req, res, next) -> router.get '/user', auth, (req, res) -> user = req.userObj - user.stats.tnl = tnl user.stats.lvl + user.stats.toNextLevel = tnl user.stats.lvl user.stats.maxHealth = 50 delete user.apiToken diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee index f622810a40..4b0adfebe5 100644 --- a/test/api.mocha.coffee +++ b/test/api.mocha.coffee @@ -100,8 +100,7 @@ describe 'API', -> expect(res.body.id).not.to.be.empty() self = _.clone(currentUser) delete self.apiToken - # To next level - self.stats.tnl = 150 + self.stats.toNextLevel = 150 self.stats.maxHealth = 50 expect(res.body).to.eql self