krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

stops Orb of Rebirth being visible after rebirth - fixes #8593 (#9172)

Browse Source 
* remove link between rebirth and beastmaster, and fix tests

* add test checking rebirth is reset when beastmaster is enabled

* remove exclusive test
This commit is contained in:
borisabramovich86
2017-10-18 23:23:27 +03:00
committed by Sabe Jones
parent d711bf4085
commit 444f393f3a
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/common/ops/rebirth.js
View File

@@ -172,13 +172,13 @@ describe('shared.ops.rebirth', () => {
expect(user.flags.levelDrops).to.be.empty; expect(user.flags.levelDrops).to.be.empty;
}); });
it('does not reset rebirthEnabled if user has beastMaster', () => { it('reset rebirthEnabled even if user has beastMaster', () => {
user.achievements.beastMaster = 1; user.achievements.beastMaster = 1;
user.flags.rebirthEnabled = true; user.flags.rebirthEnabled = true;
rebirth(user); rebirth(user);
expect(user.flags.rebirthEnabled).to.be.true; expect(user.flags.rebirthEnabled).to.be.false;
}); });
it('sets rebirth achievement', () => { it('sets rebirth achievement', () => {

4
website/common/script/ops/rebirth.js
View File

@@ -81,12 +81,10 @@ module.exports = function rebirth (user, tasks = [], req = {}, analytics) {
} }
let flags = user.flags; let flags = user.flags;
if (!user.achievements.beastMaster) {
flags.rebirthEnabled = false;
}
flags.itemsEnabled = false; flags.itemsEnabled = false;
flags.dropsEnabled = false; flags.dropsEnabled = false;
flags.classSelected = false; flags.classSelected = false;
flags.rebirthEnabled = false;
flags.levelDrops = {}; flags.levelDrops = {};
if (!user.achievements.rebirths) { if (!user.achievements.rebirths) {