From 42687335af7ecbb3fe24b410b7a6c6501a522d82 Mon Sep 17 00:00:00 2001 From: Xaz16 Date: Wed, 4 Sep 2019 17:52:38 +0300 Subject: [PATCH] Fix: reset habits by another keys (counterDown/counterUp): - Fix test for correct way of reseting habits - Use another keys for reseting habits --- test/common/ops/rebirth.js | 6 ++++-- website/common/script/ops/rebirth.js | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/test/common/ops/rebirth.js b/test/common/ops/rebirth.js index 95f26b8d97..65014e3cb4 100644 --- a/test/common/ops/rebirth.js +++ b/test/common/ops/rebirth.js @@ -86,12 +86,14 @@ describe('shared.ops.rebirth', () => { }); it('resets user\'s daily streaks to 0', () => { - tasks[0].streak = 1; // Habit + tasks[0].counterDown = 1; // Habit + tasks[0].counterUp = 1; // Habit tasks[1].streak = 1; // Daily rebirth(user, tasks); - expect(tasks[0].streak).to.equal(0); + expect(tasks[0].counterDown).to.equal(0); + expect(tasks[0].counterUp).to.equal(0); expect(tasks[1].streak).to.equal(0); }); diff --git a/website/common/script/ops/rebirth.js b/website/common/script/ops/rebirth.js index f0dd3f8906..02207c4ac4 100644 --- a/website/common/script/ops/rebirth.js +++ b/website/common/script/ops/rebirth.js @@ -48,7 +48,8 @@ module.exports = function rebirth (user, tasks = [], req = {}, analytics) { task.streak = 0; } if (task.type === 'habit') { - task.streak = 0; + task.counterDown = 0; + task.counterUp = 0; } } });