hp now docking on cron

This commit is contained in:
Tyler Renelle 2013-01-20 23:21:50 -05:00
parent 1d8d25f6e1
commit b9e479e589
3 changed files with 16 additions and 13 deletions

View file

@ -26,7 +26,8 @@ get '/', (page, model, next) ->
#if req.headers['x-forwarded-proto']!='https' and process.env.NODE_ENV=='production'
# return page.redirect 'https://' + req.headers.host + req.url
model.subscribe "users.#{model.session.userId}", (err, user) ->
userPath = "users.#{model.session.userId}"
model.subscribe userPath, (err, user) ->
userObj = user.get()
return page.redirect '/500.html' unless userObj? #this should never happen, but it is. Looking into it
@ -59,7 +60,8 @@ get '/', (page, model, next) ->
scoring.setModel(model)
scoring.cron(userObj)
model.set "users.#{userObj.id}", userObj unless _.isEqual(user.get(), userObj)
model.set userPath, userObj unless _.isEqual(user.get(), userObj)
model.set '_view', _view
# Setup Task Lists
@ -84,6 +86,7 @@ ready (model) ->
browser.setupSortable(model)
browser.setupTooltips(model)
browser.setupTour(model)
browser.setupGrowlNotifications(model) unless model.get('_view.mobileDevice')
# Setup model in scoring functions
scoring.setModel(model)

View file

@ -88,8 +88,8 @@ updateStats = (newStats, update) ->
userSet 'stats.hp', 0, update
return
else
userSet 'stats.hp', newStats.hp
userSet 'stats.hp', newStats.hp, update
if newStats.exp?
# level up & carry-over exp
tnl = user.get '_tnl'

View file

@ -77,16 +77,16 @@ casper.then ->
@reload()
@then ->
@wait 2000, ->
user = getUser()
tasksAfter = @evaluate ->
model = window.DERBY.app.model
{ habits:model.get('_habitList'), dailies:model.get('_dailyList'), todos:model.get('_todoList'), rewards:model.get('_rewardList')}
# @wait 1000, ->
user = getUser()
tasksAfter = @evaluate ->
model = window.DERBY.app.model
{ habits:model.get('_habitList'), dailies:model.get('_dailyList'), todos:model.get('_todoList'), rewards:model.get('_rewardList')}
@test.assert tasksBefore.count == tasksAfter.count, "[√] We didn't lose anything"
utils.dump {before:tasksBefore.todos[4], after:tasksAfter.todos[4]}
@test.assert tasksBefore.todos[4].value < tasksAfter.todos[4].value, "Todo gained value on cron"
@test.assert user.stats.hp < 50, 'User lost HP on cron'
@test.assert tasksBefore.count == tasksAfter.count, "[√] We didn't lose anything"
utils.dump {before:tasksBefore.todos[4], after:tasksAfter.todos[4]}
@test.assert tasksBefore.todos[4].value < tasksAfter.todos[4].value, "Todo gained value on cron"
@test.assertEqual user.stats.hp, 13, 'User lost HP on cron'
# ---------- Misc Pages ------------