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

Merge branch 'develop' into party-chat-translations

Browse Source 
# Conflicts:
#	test/api/unit/models/group.test.js
This commit is contained in:
Mateus Etto
2018-06-20 20:24:38 +09:00
parent a23926f34f 122d147f07
commit 89f6a9b07e
799 changed files with 42207 additions and 31980 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/helpers/api-unit.helper.js
View File

@@ -95,7 +95,6 @@ export function generateTodo (user) {
let task = new Tasks.todo(Tasks.Task.sanitize(todo)); // eslint-disable-line new-cap
task.userId = user._id;
task.save();
return task;
}
@@ -110,7 +109,6 @@ export function generateDaily (user) {
let task = new Tasks.daily(Tasks.Task.sanitize(daily)); // eslint-disable-line new-cap
task.userId = user._id;
task.save();
return task;
}