diff --git a/test/casper/habits.casper.coffee b/test/casper/habits.casper.coffee index dec7a7063e..601ba7730e 100644 --- a/test/casper/habits.casper.coffee +++ b/test/casper/habits.casper.coffee @@ -1,30 +1,37 @@ -helpers = require('./helpers') -casper = helpers.casper -utils = helpers.utils -url = helpers.url +helper = new require('./test/casper/helpers')() +casper = helper.casper +utils = helper.utils +url = helper.url + +casper.start url + '/?play=1' + +# ---------- Register ------------ +user = undefined +casper.then -> helper.register() +casper.then -> user = helper.getUser() # ---------- Habits ------------ casper.then -> - reset() - addTasks() + helper.reset() + helper.addTasks() casper.then -> - user = userBeforeAfter (-> casper.click '.habits a[data-direction="down"]') - @test.assert user.before.stats.hp > user.after.stats.hp, '-habit -hp' - @test.assert user.before.stats.exp == user.after.stats.exp, '-habit =exp' + u = helper.userBeforeAfter (-> casper.click '.habits a[data-direction="down"]') + casper.test.assert u.before.stats.hp > u.after.stats.hp, '-habit -hp' + casper.test.assert u.before.stats.exp == u.after.stats.exp, '-habit =exp' - @then -> - user = userBeforeAfter (-> casper.click '.habits a[data-direction="up"]') - @test.assert user.before.stats.exp < user.after.stats.exp, '+habit +exp' - @test.assertEquals user.before.stats.hp, user.after.stats.hp, '+habit =hp' +casper.then -> + u = helper.userBeforeAfter (-> casper.click '.habits a[data-direction="up"]') + casper.test.assert u.before.stats.exp < u.after.stats.exp, '+habit +exp' + casper.test.assertEquals u.before.stats.hp, u.after.stats.hp, '+habit =hp' # Test Death casper.then -> @repeat 50, (-> casper.click '.habits a[data-direction="down"]') - @then -> - user = getUser() - @test.assertEquals user.stats.hp, 0, 'hp==0 (death by habits)' - @test.assertEquals user.stats.lvl, 0, 'lvl==0 (death by habits)' + casper.then -> + u = helper.getUser() + @test.assertEquals u.stats.hp, 0, 'hp==0 (death by habits)' + @test.assertEquals u.stats.lvl, 0, 'lvl==0 (death by habits)' @test.assert(@visible('#dead-modal'), 'Revive Modal Visible') # ---------- Run ------------ diff --git a/test/casper/helpers.coffee b/test/casper/helpers.coffee index 438d3832a5..5a4f6c955f 100644 --- a/test/casper/helpers.coffee +++ b/test/casper/helpers.coffee @@ -30,9 +30,9 @@ module.exports = -> userBeforeAfter: (callback) -> user = {} - user.before = getUser() + user.before = @getUser() callback() - user.after = getUser() + user.after = @getUser() user runCron: ->