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

Fixed tests and updated default challenge model name

Browse Source
This commit is contained in:
Keith Holliday
2017-02-06 15:11:59 -07:00
committed by Alys
parent c244fe488d
commit d669db0f9a
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/api/v3/integration/challenges/POST-challenges_challengeId_leave.test.js
View File

@@ -117,7 +117,9 @@ describe('POST /challenges/:challengeId/leave', () => {
}); });
expect(testTask).to.not.be.undefined; expect(testTask).to.not.be.undefined;
expect(testTask.challenge).to.eql({}); expect(testTask.challenge).to.eql({
name: 'None',
});
}); });
}); });
}); });

2
test/api/v3/integration/groups/GET-groups_groupId_members.test.js
View File

@@ -84,7 +84,7 @@ describe('GET /groups/:groupId/members', () => {
expect(Object.keys(memberRes.auth)).to.eql(['timestamps']); expect(Object.keys(memberRes.auth)).to.eql(['timestamps']);
expect(Object.keys(memberRes.preferences).sort()).to.eql([ expect(Object.keys(memberRes.preferences).sort()).to.eql([
'size', 'hair', 'skin', 'shirt', 'size', 'hair', 'skin', 'shirt',
'chair', 'costume', 'sleep', 'background', 'chair', 'costume', 'sleep', 'background', 'tasks',
].sort()); ].sort());
expect(memberRes.stats.maxMP).to.exist; expect(memberRes.stats.maxMP).to.exist;

2
website/server/models/task.js
View File

@@ -58,7 +58,7 @@ export let TaskSchema = new Schema({
userId: {type: String, ref: 'User', validate: [validator.isUUID, 'Invalid uuid.']}, // When not set it belongs to a challenge userId: {type: String, ref: 'User', validate: [validator.isUUID, 'Invalid uuid.']}, // When not set it belongs to a challenge
challenge: { challenge: {
name: {type: String, default: 'No Category'}, name: {type: String, default: 'None'},
id: {type: String, ref: 'Challenge', validate: [validator.isUUID, 'Invalid uuid.']}, // When set (and userId not set) it's the original task id: {type: String, ref: 'Challenge', validate: [validator.isUUID, 'Invalid uuid.']}, // When set (and userId not set) it's the original task
taskId: {type: String, ref: 'Task', validate: [validator.isUUID, 'Invalid uuid.']}, // When not set but challenge.id defined it's the original task taskId: {type: String, ref: 'Task', validate: [validator.isUUID, 'Invalid uuid.']}, // When not set but challenge.id defined it's the original task
broken: {type: String, enum: ['CHALLENGE_DELETED', 'TASK_DELETED', 'UNSUBSCRIBED', 'CHALLENGE_CLOSED', 'CHALLENGE_TASK_NOT_FOUND']}, // CHALLENGE_TASK_NOT_FOUND comes from v3 migration broken: {type: String, enum: ['CHALLENGE_DELETED', 'TASK_DELETED', 'UNSUBSCRIBED', 'CHALLENGE_CLOSED', 'CHALLENGE_TASK_NOT_FOUND']}, // CHALLENGE_TASK_NOT_FOUND comes from v3 migration