krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-16 22:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed update stats notification (#10339)

Browse Source 
* Removed update stats notification

* Removed level up hook
This commit is contained in:
Keith Holliday
2018-05-07 12:45:36 -05:00
committed by GitHub
parent 8470f16f4f
commit 54a4bba228
3 changed files with 54 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
test/api/v3/integration/tasks/POST-tasks_id_score_direction.test.js
View File

@@ -82,48 +82,48 @@ describe('POST /tasks/:id/score/:direction', () => {
expect(body.delta).to.be.greaterThan(0); expect(body.delta).to.be.greaterThan(0);
}); });
context('sending user activity webhooks', () => { // context('sending user activity webhooks', () => {
before(async () => { // before(async () => {
await server.start(); // await server.start();
}); // });
//
after(async () => { // after(async () => {
await server.close(); // await server.close();
}); // });
//
it('sends user activity webhook when the user levels up', async () => { // it('sends user activity webhook when the user levels up', async () => {
let uuid = generateUUID(); // let uuid = generateUUID();
//
await user.post('/user/webhook', { // await user.post('/user/webhook', {
url: `http://localhost:${server.port}/webhooks/${uuid}`, // url: `http://localhost:${server.port}/webhooks/${uuid}`,
type: 'userActivity', // type: 'userActivity',
enabled: true, // enabled: true,
options: { // options: {
leveledUp: true, // leveledUp: true,
}, // },
}); // });
//
const initialLvl = user.stats.lvl; // const initialLvl = user.stats.lvl;
//
await user.update({ // await user.update({
'stats.exp': 3000, // 'stats.exp': 3000,
}); // });
let task = await user.post('/tasks/user', { // let task = await user.post('/tasks/user', {
text: 'test habit', // text: 'test habit',
type: 'habit', // type: 'habit',
}); // });
//
await user.post(`/tasks/${task.id}/score/up`); // await user.post(`/tasks/${task.id}/score/up`);
await user.sync(); // await user.sync();
await sleep(); // await sleep();
//
let body = server.getWebhookData(uuid); // let body = server.getWebhookData(uuid);
//
expect(body.type).to.eql('leveledUp'); // expect(body.type).to.eql('leveledUp');
expect(body.initialLvl).to.eql(initialLvl); // expect(body.initialLvl).to.eql(initialLvl);
expect(body.finalLvl).to.eql(user.stats.lvl); // expect(body.finalLvl).to.eql(user.stats.lvl);
}); // });
}); // });
}); });
context('todos', () => { context('todos', () => {

8
test/common/fns/updateStats.test.js
View File

@@ -8,7 +8,7 @@ describe('common.fns.updateStats', () => {
beforeEach(() => { beforeEach(() => {
user = generateUser(); user = generateUser();
user.addNotification = sinon.spy(); // user.addNotification = sinon.spy();
}); });
context('No Hp', () => { context('No Hp', () => {
@@ -110,14 +110,14 @@ describe('common.fns.updateStats', () => {
expect(user.stats.points).to.eql(10); expect(user.stats.points).to.eql(10);
}); });
it('add user notification when drops are enabled', () => { xit('add user notification when drops are enabled', () => {
user.stats.lvl = 3; user.stats.lvl = 3;
updateStats(user, { }); updateStats(user, { });
expect(user.addNotification).to.be.calledOnce; expect(user.addNotification).to.be.calledOnce;
expect(user.addNotification).to.be.calledWith('DROPS_ENABLED'); expect(user.addNotification).to.be.calledWith('DROPS_ENABLED');
}); });
it('add user notification when the user levels up', () => { xit('add user notification when the user levels up', () => {
const initialLvl = user.stats.lvl; const initialLvl = user.stats.lvl;
updateStats(user, { updateStats(user, {
exp: 3000, exp: 3000,
@@ -129,7 +129,7 @@ describe('common.fns.updateStats', () => {
}); });
}); });
it('add user notification when rebirth is enabled', () => { xit('add user notification when rebirth is enabled', () => {
user.stats.lvl = 51; user.stats.lvl = 51;
updateStats(user, { }); updateStats(user, { });
expect(user.addNotification).to.be.calledTwice; // once is for drops enabled expect(user.addNotification).to.be.calledTwice; // once is for drops enabled

15
website/common/script/fns/updateStats.js
View File

@@ -20,7 +20,7 @@ module.exports = function updateStats (user, stats, req = {}, analytics) {
if (stats.exp >= experienceToNextLevel) { if (stats.exp >= experienceToNextLevel) {
user.stats.exp = stats.exp; user.stats.exp = stats.exp;
const initialLvl = user.stats.lvl; // const initialLvl = user.stats.lvl;
while (stats.exp >= experienceToNextLevel) { while (stats.exp >= experienceToNextLevel) {
stats.exp -= experienceToNextLevel; stats.exp -= experienceToNextLevel;
@@ -50,12 +50,13 @@ module.exports = function updateStats (user, stats, req = {}, analytics) {
} }
} }
const newLvl = user.stats.lvl; // @TODO: Tmp disable to see if this is causing concurrency
// const newLvl = user.stats.lvl;
if (user.addNotification) user.addNotification('LEVELED_UP', { //
initialLvl, // if (user.addNotification) user.addNotification('LEVELED_UP', {
newLvl, // initialLvl,
}); // newLvl,
// });
} }
user.stats.exp = stats.exp; user.stats.exp = stats.exp;