From d669db0f9a94a37e042583e5211409f4069e82c9 Mon Sep 17 00:00:00 2001 From: Keith Holliday Date: Mon, 6 Feb 2017 15:11:59 -0700 Subject: [PATCH] Fixed tests and updated default challenge model name --- .../challenges/POST-challenges_challengeId_leave.test.js | 4 +++- .../v3/integration/groups/GET-groups_groupId_members.test.js | 2 +- website/server/models/task.js | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/test/api/v3/integration/challenges/POST-challenges_challengeId_leave.test.js b/test/api/v3/integration/challenges/POST-challenges_challengeId_leave.test.js index 0502be654c..71d3e86f51 100644 --- a/test/api/v3/integration/challenges/POST-challenges_challengeId_leave.test.js +++ b/test/api/v3/integration/challenges/POST-challenges_challengeId_leave.test.js @@ -117,7 +117,9 @@ describe('POST /challenges/:challengeId/leave', () => { }); expect(testTask).to.not.be.undefined; - expect(testTask.challenge).to.eql({}); + expect(testTask.challenge).to.eql({ + name: 'None', + }); }); }); }); diff --git a/test/api/v3/integration/groups/GET-groups_groupId_members.test.js b/test/api/v3/integration/groups/GET-groups_groupId_members.test.js index 75511cca4c..72b12453d9 100644 --- a/test/api/v3/integration/groups/GET-groups_groupId_members.test.js +++ b/test/api/v3/integration/groups/GET-groups_groupId_members.test.js @@ -84,7 +84,7 @@ describe('GET /groups/:groupId/members', () => { expect(Object.keys(memberRes.auth)).to.eql(['timestamps']); expect(Object.keys(memberRes.preferences).sort()).to.eql([ 'size', 'hair', 'skin', 'shirt', - 'chair', 'costume', 'sleep', 'background', + 'chair', 'costume', 'sleep', 'background', 'tasks', ].sort()); expect(memberRes.stats.maxMP).to.exist; diff --git a/website/server/models/task.js b/website/server/models/task.js index 7129923f89..fbe475e357 100644 --- a/website/server/models/task.js +++ b/website/server/models/task.js @@ -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 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 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