From 65906f0b7168b9a300698f91f47e63beeed91e1b Mon Sep 17 00:00:00 2001 From: Aleksey Date: Mon, 9 Sep 2019 16:46:49 +0300 Subject: [PATCH] Fix: reset streak for habits after rebirth (#11345) * Fix: reset streak for habits after rebirth - Modify current test of reseting streaks - Add new if branch for task with "habit" type * 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 | 4 ++++ website/common/script/ops/rebirth.js | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/test/common/ops/rebirth.js b/test/common/ops/rebirth.js index 2bb46fd3be..65014e3cb4 100644 --- a/test/common/ops/rebirth.js +++ b/test/common/ops/rebirth.js @@ -86,10 +86,14 @@ describe('shared.ops.rebirth', () => { }); it('resets user\'s daily streaks to 0', () => { + tasks[0].counterDown = 1; // Habit + tasks[0].counterUp = 1; // Habit tasks[1].streak = 1; // Daily rebirth(user, tasks); + 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 86c12d7c5d..02207c4ac4 100644 --- a/website/common/script/ops/rebirth.js +++ b/website/common/script/ops/rebirth.js @@ -47,6 +47,10 @@ module.exports = function rebirth (user, tasks = [], req = {}, analytics) { if (task.type === 'daily') { task.streak = 0; } + if (task.type === 'habit') { + task.counterDown = 0; + task.counterUp = 0; + } } });