Merge branch 'develop' into party-chat-translations

# Conflicts: # test/api/unit/models/group.test.js
2018-06-20 20:24:38 +09:00
parent a23926f34f 122d147f07
commit 89f6a9b07e
799 changed files with 42207 additions and 31980 deletions
@@ -5,7 +5,7 @@ import {
  sleep,
  checkExistence,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';

 describe('DELETE /challenges/:challengeId', () => {
@@ -41,6 +41,7 @@ describe('DELETE /challenges/:challengeId', () => {
      group = populatedGroup.group;

      challenge = await generateChallenge(groupLeader, group);
+      await groupLeader.post(`/challenges/${challenge._id}/join`);

      await groupLeader.post(`/tasks/challenge/${challenge._id}`, [
        {type: 'habit', text: taskText},
@@ -3,7 +3,7 @@ import {
  createAndPopulateGroup,
  generateChallenge,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';

 describe('GET /challenges/:challengeId', () => {
@@ -33,9 +33,11 @@ describe('GET /challenges/:challengeId', () => {
      group = populatedGroup.group;

      challenge = await generateChallenge(groupLeader, group);
+      await groupLeader.post(`/challenges/${challenge._id}/join`);
    });

    it('should return challenge data', async () => {
+      await challenge.sync();
      let chal = await user.get(`/challenges/${challenge._id}`);
      expect(chal.memberCount).to.equal(challenge.memberCount);
      expect(chal.name).to.equal(challenge.name);
@@ -80,6 +82,7 @@ describe('GET /challenges/:challengeId', () => {

      challenge = await generateChallenge(groupLeader, group);
      await members[0].post(`/challenges/${challenge._id}/join`);
+      await groupLeader.post(`/challenges/${challenge._id}/join`);
    });

    it('fails if user doesn\'t have access to the challenge', async () => {
@@ -134,6 +137,7 @@ describe('GET /challenges/:challengeId', () => {

      challenge = await generateChallenge(groupLeader, group);
      await members[0].post(`/challenges/${challenge._id}/join`);
+      await groupLeader.post(`/challenges/${challenge._id}/join`);
    });

    it('fails if user doesn\'t have access to the challenge', async () => {
@@ -4,7 +4,7 @@ import {
  generateChallenge,
  translate as t,
  sleep,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';

 describe('GET /challenges/:challengeId/export/csv', () => {
@@ -24,6 +24,7 @@ describe('GET /challenges/:challengeId/export/csv', () => {
    members = populatedGroup.members;

    challenge = await generateChallenge(groupLeader, group);
+    await groupLeader.post(`/challenges/${challenge._id}/join`);
    await members[0].post(`/challenges/${challenge._id}/join`);
    await members[1].post(`/challenges/${challenge._id}/join`);
    await members[2].post(`/challenges/${challenge._id}/join`);
@@ -3,7 +3,7 @@ import {
  generateGroup,
  generateChallenge,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';

 describe('GET /challenges/:challengeId/members', () => {
@@ -45,6 +45,7 @@ describe('GET /challenges/:challengeId/members', () => {
    let leader = await generateUser({balance: 4});
    let group = await generateGroup(leader, {type: 'guild', privacy: 'public', name: generateUUID()});
    let challenge = await generateChallenge(leader, group);
+    await leader.post(`/challenges/${challenge._id}/join`);
    let res = await user.get(`/challenges/${challenge._id}/members`);
    expect(res[0]).to.eql({
      _id: leader._id,
@@ -59,6 +60,7 @@ describe('GET /challenges/:challengeId/members', () => {
    let anotherUser = await generateUser({balance: 3});
    let group = await generateGroup(anotherUser, {type: 'guild', privacy: 'public', name: generateUUID()});
    let challenge = await generateChallenge(anotherUser, group);
+    await anotherUser.post(`/challenges/${challenge._id}/join`);
    let res = await user.get(`/challenges/${challenge._id}/members`);
    expect(res[0]).to.eql({
      _id: anotherUser._id,
@@ -72,6 +74,7 @@ describe('GET /challenges/:challengeId/members', () => {
  it('returns only first 30 members if req.query.includeAllMembers is not true', async () => {
    let group = await generateGroup(user, {type: 'party', name: generateUUID()});
    let challenge = await generateChallenge(user, group);
+    await user.post(`/challenges/${challenge._id}/join`);

    let usersToGenerate = [];
    for (let i = 0; i < 31; i++) {
@@ -90,6 +93,7 @@ describe('GET /challenges/:challengeId/members', () => {
  it('returns only first 30 members if req.query.includeAllMembers is not defined', async () => {
    let group = await generateGroup(user, {type: 'party', name: generateUUID()});
    let challenge = await generateChallenge(user, group);
+    await user.post(`/challenges/${challenge._id}/join`);

    let usersToGenerate = [];
    for (let i = 0; i < 31; i++) {
@@ -108,6 +112,7 @@ describe('GET /challenges/:challengeId/members', () => {
  it('returns all members if req.query.includeAllMembers is true', async () => {
    let group = await generateGroup(user, {type: 'party', name: generateUUID()});
    let challenge = await generateChallenge(user, group);
+    await user.post(`/challenges/${challenge._id}/join`);

    let usersToGenerate = [];
    for (let i = 0; i < 31; i++) {
@@ -127,6 +132,7 @@ describe('GET /challenges/:challengeId/members', () => {
    this.timeout(30000); // @TODO: times out after 8 seconds
    let group = await generateGroup(user, {type: 'party', name: generateUUID()});
    let challenge = await generateChallenge(user, group);
+    await user.post(`/challenges/${challenge._id}/join`);

    let usersToGenerate = [];
    for (let i = 0; i < 57; i++) {
@@ -147,6 +153,7 @@ describe('GET /challenges/:challengeId/members', () => {
  it('supports using req.query.search to get search members', async () => {
    let group = await generateGroup(user, {type: 'party', name: generateUUID()});
    let challenge = await generateChallenge(user, group);
+    await user.post(`/challenges/${challenge._id}/join`);

    let usersToGenerate = [];
    for (let i = 0; i < 3; i++) {
@@ -3,7 +3,7 @@ import {
  generateChallenge,
  generateGroup,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';

 describe('GET /challenges/:challengeId/members/:memberId', () => {
@@ -50,6 +50,7 @@ describe('GET /challenges/:challengeId/members/:memberId', () => {
  it('fails if user doesn\'t have access to the challenge', async () => {
    let group = await generateGroup(user, {type: 'party', name: generateUUID()});
    let challenge = await generateChallenge(user, group);
+    await user.post(`/challenges/${challenge._id}/join`);
    let anotherUser = await generateUser();
    let member = await generateUser();
    await expect(anotherUser.get(`/challenges/${challenge._id}/members/${member._id}`)).to.eventually.be.rejected.and.eql({
@@ -62,6 +63,7 @@ describe('GET /challenges/:challengeId/members/:memberId', () => {
  it('fails if member is not part of the challenge', async () => {
    let group = await generateGroup(user, {type: 'party', name: generateUUID()});
    let challenge = await generateChallenge(user, group);
+    await user.post(`/challenges/${challenge._id}/join`);
    let member = await generateUser();
    await expect(user.get(`/challenges/${challenge._id}/members/${member._id}`)).to.eventually.be.rejected.and.eql({
      code: 404,
@@ -74,6 +76,7 @@ describe('GET /challenges/:challengeId/members/:memberId', () => {
    let groupLeader = await generateUser({balance: 4});
    let group = await generateGroup(groupLeader, {type: 'guild', privacy: 'public', name: generateUUID()});
    let challenge = await generateChallenge(groupLeader, group);
+    await groupLeader.post(`/challenges/${challenge._id}/join`);
    let taskText = 'Test Text';
    await groupLeader.post(`/tasks/challenge/${challenge._id}`, [{type: 'habit', text: taskText}]);

@@ -86,6 +89,7 @@ describe('GET /challenges/:challengeId/members/:memberId', () => {
  it('returns the member tasks for the challenges', async () => {
    let group = await generateGroup(user, {type: 'party', name: generateUUID()});
    let challenge = await generateChallenge(user, group);
+    await user.post(`/challenges/${challenge._id}/join`);
    await user.post(`/tasks/challenge/${challenge._id}`, [{type: 'habit', text: 'Test Text'}]);

    let memberProgress = await user.get(`/challenges/${challenge._id}/members/${user._id}`);
@@ -98,6 +102,7 @@ describe('GET /challenges/:challengeId/members/:memberId', () => {
  it('returns the tasks without the tags and checklist', async () => {
    let group = await generateGroup(user, {type: 'party', name: generateUUID()});
    let challenge = await generateChallenge(user, group);
+    await user.post(`/challenges/${challenge._id}/join`);
    let taskText = 'Test Text';
    await user.post(`/tasks/challenge/${challenge._id}`, [{
      type: 'todo',
@@ -3,7 +3,7 @@ import {
  generateChallenge,
  createAndPopulateGroup,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { TAVERN_ID } from '../../../../../website/common/script/constants';

 describe('GET challenges/groups/:groupId', () => {
@@ -25,7 +25,9 @@ describe('GET challenges/groups/:groupId', () => {
      nonMember = await generateUser();

      challenge = await generateChallenge(user, group);
+      await user.post(`/challenges/${challenge._id}/join`);
      challenge2 = await generateChallenge(user, group);
+      await user.post(`/challenges/${challenge2._id}/join`);
    });

    it('should return group challenges for non member with populated leader', async () => {
@@ -73,6 +75,7 @@ describe('GET challenges/groups/:groupId', () => {
      expect(foundChallengeIndex).to.eql(0);

      let newChallenge = await generateChallenge(user, publicGuild);
+      await user.post(`/challenges/${newChallenge._id}/join`);

      challenges = await user.get(`/challenges/groups/${publicGuild._id}`);

@@ -99,7 +102,9 @@ describe('GET challenges/groups/:groupId', () => {
      nonMember = await generateUser();

      challenge = await generateChallenge(user, group);
+      await user.post(`/challenges/${challenge._id}/join`);
      challenge2 = await generateChallenge(user, group);
+      await user.post(`/challenges/${challenge2._id}/join`);
    });

    it('should prevent non-member from seeing challenges', async () => {
@@ -156,9 +161,12 @@ describe('GET challenges/groups/:groupId', () => {
          slug: 'habitica_official',
        }],
      });
+      await user.post(`/challenges/${officialChallenge._id}/join`);

      challenge = await generateChallenge(user, group);
+      await user.post(`/challenges/${challenge._id}/join`);
      challenge2 = await generateChallenge(user, group);
+      await user.post(`/challenges/${challenge2._id}/join`);
    });

    it('should return official challenges first', async () => {
@@ -178,6 +186,7 @@ describe('GET challenges/groups/:groupId', () => {
      expect(foundChallengeIndex).to.eql(1);

      let newChallenge = await generateChallenge(user, publicGuild);
+      await user.post(`/challenges/${newChallenge._id}/join`);

      challenges = await user.get(`/challenges/groups/${publicGuild._id}`);

@@ -203,7 +212,9 @@ describe('GET challenges/groups/:groupId', () => {
      nonMember = await generateUser();

      challenge = await generateChallenge(user, group);
+      await user.post(`/challenges/${challenge._id}/join`);
      challenge2 = await generateChallenge(user, group);
+      await user.post(`/challenges/${challenge2._id}/join`);
    });

    it('should prevent non-member from seeing challenges', async () => {
@@ -263,7 +274,9 @@ describe('GET challenges/groups/:groupId', () => {
      tavern = await user.get(`/groups/${TAVERN_ID}`);

      challenge = await generateChallenge(user, tavern, {prize: 1});
+      await user.post(`/challenges/${challenge._id}/join`);
      challenge2 = await generateChallenge(user, tavern, {prize: 1});
+      await user.post(`/challenges/${challenge2._id}/join`);
    });

    it('should return tavern challenges with populated leader', async () => {
@@ -2,7 +2,7 @@ import {
  generateUser,
  generateChallenge,
  createAndPopulateGroup,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';

 describe('GET challenges/user', () => {
  context('no official challenges', () => {
@@ -24,7 +24,9 @@ describe('GET challenges/user', () => {
      nonMember = await generateUser();

      challenge = await generateChallenge(user, group);
+      await user.post(`/challenges/${challenge._id}/join`);
      challenge2 = await generateChallenge(user, group);
+      await user.post(`/challenges/${challenge2._id}/join`);
    });

    it('should return challenges user has joined', async () => {
@@ -146,6 +148,7 @@ describe('GET challenges/user', () => {
      expect(foundChallengeIndex).to.eql(0);

      let newChallenge = await generateChallenge(user, publicGuild);
+      await user.post(`/challenges/${newChallenge._id}/join`);

      challenges = await user.get('/challenges/user');

@@ -164,6 +167,7 @@ describe('GET challenges/user', () => {
      });

      let privateChallenge = await generateChallenge(groupLeader, group);
+      await groupLeader.post(`/challenges/${privateChallenge._id}/join`);

      let challenges = await nonMember.get('/challenges/user');

@@ -198,9 +202,12 @@ describe('GET challenges/user', () => {
          slug: 'habitica_official',
        }],
      });
+      await user.post(`/challenges/${officialChallenge._id}/join`);

      challenge = await generateChallenge(user, group);
+      await user.post(`/challenges/${challenge._id}/join`);
      challenge2 = await generateChallenge(user, group);
+      await user.post(`/challenges/${challenge2._id}/join`);
    });

    it('should return official challenges first', async () => {
@@ -220,6 +227,7 @@ describe('GET challenges/user', () => {
      expect(foundChallengeIndex).to.eql(1);

      let newChallenge = await generateChallenge(user, publicGuild);
+      await user.post(`/challenges/${newChallenge._id}/join`);

      challenges = await user.get('/challenges/user');

@@ -252,12 +260,14 @@ describe('GET challenges/user', () => {
      await user.update({balance: 20});

      for (let i = 0; i < 11; i += 1) {
-        await generateChallenge(user, group); // eslint-disable-line
+        let challenge = await generateChallenge(user, group); // eslint-disable-line
+        await user.post(`/challenges/${challenge._id}/join`); // eslint-disable-line
      }
    });

    it('returns public guilds filtered by category', async () => {
      const categoryChallenge = await generateChallenge(user, guild, {categories});
+      await user.post(`/challenges/${categoryChallenge._id}/join`);
      const challenges = await user.get(`/challenges/user?categories=${categories[0].slug}`);

      expect(challenges[0]._id).to.eql(categoryChallenge._id);
@@ -2,7 +2,7 @@ import {
  generateUser,
  createAndPopulateGroup,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';

 describe('POST /challenges', () => {
@@ -242,7 +242,6 @@ describe('POST /challenges', () => {
    it('returns an error when challenge validation fails; doesn\'s save user or group', async () => {
      let oldChallengeCount = group.challengeCount;
      let oldUserBalance = groupLeader.balance;
-      let oldUserChallenges = groupLeader.challenges;
      let oldGroupBalance = group.balance;

      await expect(groupLeader.post('/challenges', {
@@ -260,7 +259,6 @@ describe('POST /challenges', () => {
      expect(group.challengeCount).to.eql(oldChallengeCount);
      expect(group.balance).to.eql(oldGroupBalance);
      expect(groupLeader.balance).to.eql(oldUserBalance);
-      expect(groupLeader.challenges).to.eql(oldUserChallenges);
    });

    it('sets all properites of the challenge as passed', async () => {
@@ -291,18 +289,19 @@ describe('POST /challenges', () => {
        name: group.name,
        type: group.type,
      });
-      expect(challenge.memberCount).to.eql(1);
+      expect(challenge.memberCount).to.eql(0);
      expect(challenge.prize).to.eql(prize);
    });

-    it('adds challenge to creator\'s challenges', async () => {
-      let challenge = await groupLeader.post('/challenges', {
+    it('does not add challenge to creator\'s challenges', async () => {
+      await groupLeader.post('/challenges', {
        group: group._id,
        name: 'Test Challenge',
        shortName: 'TC Label',
      });

-      await expect(groupLeader.sync()).to.eventually.have.property('challenges').to.include(challenge._id);
+      await groupLeader.sync();
+      expect(groupLeader.challenges.length).to.equal(0);
    });

    it('awards achievement if this is creator\'s first challenge', async () => {
@@ -3,7 +3,7 @@ import {
  generateChallenge,
  createAndPopulateGroup,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';

 describe('POST /challenges/:challengeId/join', () => {
@@ -43,6 +43,7 @@ describe('POST /challenges/:challengeId/join', () => {
      authorizedUser = populatedGroup.members[0];

      challenge = await generateChallenge(groupLeader, group);
+      await groupLeader.post(`/challenges/${challenge._id}/join`);
    });

    it('returns an error when user doesn\'t have permissions to access the challenge', async () => {
@@ -91,6 +92,7 @@ describe('POST /challenges/:challengeId/join', () => {
    });

    it('increases memberCount of challenge', async () => {
+      await challenge.sync();
      let oldMemberCount = challenge.memberCount;

      await authorizedUser.post(`/challenges/${challenge._id}/join`);
@@ -3,7 +3,7 @@ import {
  generateChallenge,
  createAndPopulateGroup,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';

 describe('POST /challenges/:challengeId/leave', () => {
@@ -48,6 +48,7 @@ describe('POST /challenges/:challengeId/leave', () => {
      notInGroupLeavingUser = populatedGroup.members[2];

      challenge = await generateChallenge(groupLeader, group);
+      await groupLeader.post(`/challenges/${challenge._id}/join`);

      taskText = 'A challenge task text';

@@ -5,7 +5,7 @@ import {
  sleep,
  checkExistence,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';

 describe('POST /challenges/:challengeId/winner/:winnerId', () => {
@@ -58,6 +58,7 @@ describe('POST /challenges/:challengeId/winner/:winnerId', () => {
      challenge = await generateChallenge(groupLeader, group, {
        prize: 1,
      });
+      await groupLeader.post(`/challenges/${challenge._id}/join`);

      await groupLeader.post(`/tasks/challenge/${challenge._id}`, [
        {type: 'habit', text: taskText},
@@ -1,7 +1,7 @@
 import {
  generateUser,
  generateGroup,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';

 describe('POST /challenges/:challengeId/clone', () => {
  it('clones a challenge', async () => {
@@ -3,7 +3,7 @@ import {
  generateChallenge,
  createAndPopulateGroup,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';

 describe('PUT /challenges/:challengeId', () => {
  let privateGuild, user, nonMember, challenge, member;
@@ -25,6 +25,7 @@ describe('PUT /challenges/:challengeId', () => {
    member = members[0];

    challenge = await generateChallenge(user, group);
+    await user.post(`/challenges/${challenge._id}/join`);
    await member.post(`/challenges/${challenge._id}/join`);
  });

@@ -2,7 +2,7 @@ import {
  createAndPopulateGroup,
  generateUser,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';

 describe('DELETE /groups/:groupId/chat/:chatId', () => {
@@ -2,7 +2,7 @@ import {
  generateUser,
  generateGroup,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';

 describe('GET /groups/:groupId/chat', () => {
  let user;
@@ -1,7 +1,7 @@
 import {
  generateUser,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { find } from 'lodash';

 describe('POST /chat/:chatId/flag', () => {
@@ -1,7 +1,7 @@
 import {
  createAndPopulateGroup,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { find } from 'lodash';

 describe('POST /chat/:chatId/like', () => {
@@ -4,7 +4,7 @@ import {
  translate as t,
  sleep,
  server,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import {
  SPAM_MESSAGE_LIMIT,
  SPAM_MIN_EXEMPT_CONTRIB_LEVEL,
@@ -1,7 +1,7 @@
 import {
  createAndPopulateGroup,
  sleep,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';

 describe('POST /groups/:id/chat/seen', () => {
  context('Guild', () => {
@@ -2,7 +2,7 @@ import {
  createAndPopulateGroup,
  generateUser,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import config from '../../../../../config.json';
 import { v4 as generateUUID } from 'uuid';

@@ -1,7 +1,7 @@
 import {
  requester,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import i18n from '../../../../../website/common/script/i18n';

 describe('GET /content', () => {
@@ -1,7 +1,7 @@
 import {
  generateUser,
  resetHabiticaDB,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import apiError from '../../../../../website/server/libs/apiError';

 describe('GET /coupons/', () => {
@@ -2,7 +2,7 @@ import {
  generateUser,
  translate as t,
  resetHabiticaDB,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';

 describe('POST /coupons/enter/:code', () => {
  let user;
@@ -2,7 +2,7 @@ import {
  generateUser,
  translate as t,
  resetHabiticaDB,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import couponCode from 'coupon-code';
 import apiError from '../../../../../website/server/libs/apiError';

@@ -2,7 +2,7 @@ import {
  generateUser,
  requester,
  resetHabiticaDB,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';

 describe('POST /coupons/validate/:code', () => {
  let api = requester();
@@ -1,7 +1,7 @@
 import {
  generateUser,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';

 xdescribe('GET /export/avatar-:memberId.html', () => {
@@ -1,6 +1,6 @@
 import {
  generateUser,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import {
  updateDocument,
 } from '../../../../helpers/mongo';
@@ -1,6 +1,6 @@
 import {
  generateUser,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';

 describe('GET /export/inbox.html', () => {
  let user;
@@ -1,6 +1,6 @@
 import {
  generateUser,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';

 describe('GET /export/userdata.json', () => {
  it('should return a valid JSON file with user data', async () => {
@@ -1,6 +1,6 @@
 import {
  generateUser,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import xml2js from 'xml2js';
 import util from 'util';

@@ -1,7 +1,7 @@
 import nconf from 'nconf';
 import {
  generateUser,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';

 describe('POST /debug/add-hourglass', () => {
  let userToGetHourGlass;
@@ -1,7 +1,7 @@
 import nconf from 'nconf';
 import {
  generateUser,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';

 describe('POST /debug/add-ten-gems', () => {
  let userToGainTenGems;
@@ -1,7 +1,7 @@
 import nconf from 'nconf';
 import {
  generateUser,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';

 describe('POST /debug/make-admin (pended for v3 prod testing)', () => {
  let user;
@@ -3,7 +3,7 @@
 import nconf from 'nconf';
 import {
  generateUser,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';

 describe('POST /debug/modify-inventory', () => {
  let user, originalItems;
@@ -1,7 +1,7 @@
 import nconf from 'nconf';
 import {
  generateUser,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';

 describe('POST /debug/quest-progress', () => {
  let user;
@@ -1,7 +1,7 @@
 import nconf from 'nconf';
 import {
  generateUser,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';

 describe('POST /debug/set-cron', () => {
  let user;
@@ -1,7 +1,7 @@
 import {
  generateUser,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { encrypt } from '../../../../../website/server/libs/encryption';
 import { v4 as generateUUID } from 'uuid';

@@ -1,7 +1,7 @@
 import {
  generateUser,
  generateGroup,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';

 describe('GET /group-plans', () => {
  let user;
@@ -3,7 +3,7 @@ import {
  resetHabiticaDB,
  generateGroup,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import {
  TAVERN_ID,
 } from '../../../../../website/server/models/group';
@@ -2,7 +2,7 @@ import {
  generateUser,
  generateGroup,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';

 describe('GET /groups/:groupId/invites', () => {
@@ -81,7 +81,8 @@ describe('GET /groups/:groupId/invites', () => {
    });
  });

-  it('supports using req.query.lastId to get more invites', async () => {
+  it('supports using req.query.lastId to get more invites', async function () {
+    this.timeout(30000); // @TODO: times out after 8 seconds
    let leader = await generateUser({balance: 4});
    let group = await generateGroup(leader, {type: 'guild', privacy: 'public', name: generateUUID()});

@@ -2,7 +2,7 @@ import {
  generateUser,
  generateGroup,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';
 import common from '../../../../../website/common';

@@ -2,7 +2,7 @@ import {
  generateUser,
  createAndPopulateGroup,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';

 import {
@@ -1,7 +1,7 @@
 import {
  createAndPopulateGroup,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { find } from 'lodash';

 describe('POST /group/:groupId/remove-manager', () => {
@@ -1,7 +1,7 @@
 import {
  generateUser,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';

 describe('POST /group', () => {
  let user;
@@ -3,7 +3,7 @@ import {
  createAndPopulateGroup,
  checkExistence,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';

 describe('POST /group/:groupId/join', () => {
@@ -5,7 +5,7 @@ import {
  sleep,
  generateUser,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';
 import {
  each,
@@ -93,6 +93,7 @@ describe('POST /groups/:groupId/leave', () => {

        beforeEach(async () => {
          challenge = await generateChallenge(leader, groupToLeave);
+          await leader.post(`/challenges/${challenge._id}/join`);

          await leader.post(`/tasks/challenge/${challenge._id}`, {
            text: 'test habit',
@@ -2,7 +2,7 @@ import {
  generateUser,
  createAndPopulateGroup,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';

 describe('POST /group/:groupId/reject-invite', () => {
  context('Rejecting a public guild invite', () => {
@@ -3,7 +3,7 @@ import {
  createAndPopulateGroup,
  translate as t,
  sleep,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import * as email from '../../../../../website/server/libs/email';

 describe('POST /groups/:groupId/removeMember/:memberId', () => {
@@ -2,7 +2,7 @@ import {
  generateUser,
  generateGroup,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';
 import nconf from 'nconf';

@@ -2,7 +2,7 @@ import {
  generateUser,
  createAndPopulateGroup,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';

 describe('POST /group/:groupId/add-manager', () => {
  let leader, nonLeader, groupToUpdate;
@@ -2,7 +2,7 @@ import {
  createAndPopulateGroup,
  generateUser,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';

 describe('PUT /group', () => {
  let leader, nonLeader, groupToUpdate, adminUser;
@@ -1,7 +1,7 @@
 import {
  generateUser,
  resetHabiticaDB,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';

 describe('GET /hall/heroes', () => {
  it('returns all heroes sorted by -contributor.level and with correct fields', async () => {
@@ -1,7 +1,7 @@
 import {
  generateUser,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';

 describe('GET /heroes/:heroId', () => {
@@ -2,7 +2,7 @@ import {
  generateUser,
  translate as t,
  resetHabiticaDB,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { times } from 'lodash';

 describe('GET /hall/patrons', () => {
@@ -1,7 +1,7 @@
 import {
  generateUser,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';

 describe('PUT /heroes/:heroId', () => {
@@ -1,7 +1,7 @@
 import {
  generateUser,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';

 describe('GET /members/:memberId/achievements', () => {
@@ -1,7 +1,7 @@
 import {
  generateUser,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';
 import common from '../../../../../website/common';

@@ -1,7 +1,7 @@
 import {
  generateUser,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';

 describe('GET /members/:toUserId/objections/:interaction', () => {
@@ -1,7 +1,7 @@
 import {
  generateUser,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';

 describe('POST /members/send-private-message', () => {
@@ -1,7 +1,7 @@
 import {
  generateUser,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';

 function findMessage (messages, receiverId) {
@@ -1,6 +1,6 @@
 import {
  requester,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';

 describe('GET /news', () => {
  let api;
@@ -1,6 +1,6 @@
 import {
  generateUser,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';

 describe('POST /news/tell-me-later', () => {
  let user;
@@ -1,7 +1,7 @@
 import {
  generateUser,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';

 describe('POST /notifications/:notificationId/read', () => {
@@ -1,7 +1,7 @@
 import {
  generateUser,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';

 describe('POST /notifications/:notificationId/see', () => {
@@ -1,7 +1,7 @@
 import {
  generateUser,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';

 describe('POST /notifications/read', () => {
@@ -1,7 +1,7 @@
 import {
  generateUser,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';

 describe('POST /notifications/see', () => {
@@ -1,7 +1,7 @@
 import {
  generateUser,
  translate as t,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import superagent from 'superagent';
 import nconf from 'nconf';

@@ -3,7 +3,7 @@ import {
  translate as t,
  generateUser,
  sleep,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { model as Chat } from '../../../../../website/server/models/chat';

 describe('POST /groups/:groupId/quests/accept', () => {
@@ -3,7 +3,7 @@ import {
  translate as t,
  generateUser,
  sleep,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { model as Chat } from '../../../../../website/server/models/chat';

 describe('POST /groups/:groupId/quests/force-start', () => {
@@ -2,7 +2,7 @@ import {
  createAndPopulateGroup,
  translate as t,
  sleep,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';
 import { quests as questScrolls } from '../../../../../website/common/script/content';
 import { model as Chat } from '../../../../../website/server/models/chat';
@@ -2,7 +2,7 @@ import {
  createAndPopulateGroup,
  translate as t,
  generateUser,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';
 import { model as Group } from '../../../../../website/server/models/group';

@@ -2,7 +2,7 @@ import {
  createAndPopulateGroup,
  translate as t,
  generateUser,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';

 describe('POST /groups/:groupId/quests/cancel', () => {
@@ -2,7 +2,7 @@ import {
  createAndPopulateGroup,
  translate as t,
  generateUser,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';

 describe('POST /groups/:groupId/quests/leave', () => {
@@ -3,7 +3,7 @@ import {
  translate as t,
  generateUser,
  sleep,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';
 import { model as Chat } from '../../../../../website/server/models/chat';

@@ -1,6 +1,6 @@
 import {
  requester,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';

 describe('GET /status', () => {
  it('returns status: up', async () => {
@@ -92,6 +92,7 @@ describe('DELETE /tasks/:id', () => {
      });
      let guild = await generateGroup(user);
      let challenge = await generateChallenge(user, guild);
+      await user.post(`/challenges/${challenge._id}/join`);

      await user.post('/user/webhook', {
        url: `http://localhost:${server.port}/webhooks/${uuid}`,
@@ -40,6 +40,7 @@ describe('GET /tasks/:taskId', () => {
    user = await generateUser();
    guild = await generateGroup(user);
    challenge = await generateChallenge(user, guild);
+    await user.post(`/challenges/${challenge._id}/join`);
  });

  it('returns error when incorrect id is passed', async () => {
@@ -9,6 +9,7 @@ describe('POST /tasks/clearCompletedTodos', () => {
    let user = await generateUser({balance: 1});
    let guild = await generateGroup(user);
    let challenge = await generateChallenge(user, guild);
+    await user.post(`/challenges/${challenge._id}/join`);

    let initialTodoCount = user.tasksOrder.todos.length;
    await user.post('/tasks/user', [
@@ -37,6 +37,7 @@ describe('POST /tasks/unlink-all/:challengeId', () => {
    user = await generateUser();
    guild = await generateGroup(user);
    challenge = await generateChallenge(user, guild);
+    await user.post(`/challenges/${challenge._id}/join`);
  });

  it('fails if no keep query', async () => {
@@ -38,6 +38,7 @@ describe('POST /tasks/unlink-one/:taskId', () => {
    user = await generateUser();
    guild = await generateGroup(user);
    challenge = await generateChallenge(user, guild);
+    await user.post(`/challenges/${challenge._id}/join`);
  });

  it('fails if no keep query', async () => {
@@ -3,7 +3,7 @@ import {
  sleep,
  translate as t,
  server,
-} from '../../../../helpers/api-v3-integration.helper';
+} from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';

 describe('POST /tasks/user', () => {
@@ -65,6 +65,7 @@ describe('PUT /tasks/:id', () => {
        fields for challenge tasks owned by a user`, async () => {
      let guild = await generateGroup(user);
      let challenge = await generateChallenge(user, guild);
+      await user.post(`/challenges/${challenge._id}/join`);

      let challengeTask = await user.post(`/tasks/challenge/${challenge._id}`, {
        type: 'daily',
@@ -198,6 +199,7 @@ describe('PUT /tasks/:id', () => {
      });
      let guild = await generateGroup(user);
      let challenge = await generateChallenge(user, guild);
+      await user.post(`/challenges/${challenge._id}/join`);

      await user.post('/user/webhook', {
        url: `http://localhost:${server.port}/webhooks/${uuid}`,
@@ -15,6 +15,7 @@ describe('DELETE /tasks/:taskId/checklist/:itemId', () => {
    user = await generateUser();
    guild = await generateGroup(user);
    challenge = await generateChallenge(user, guild);
+    await user.post(`/challenges/${challenge._id}/join`);
  });

  it('fails on task not found', async () => {
@@ -17,6 +17,7 @@ describe('DELETE /tasks/:id', () => {
    user = await generateUser();
    guild = await generateGroup(user);
    challenge = await generateChallenge(user, guild);
+    await user.post(`/challenges/${challenge._id}/join`);
  });

  beforeEach(async () => {
@@ -42,6 +42,7 @@ describe('GET /tasks/challenge/:challengeId', () => {
    user = await generateUser();
    guild = await generateGroup(user);
    challenge = await generateChallenge(user, guild);
+    await user.post(`/challenges/${challenge._id}/join`);
  });

  it('returns error when challenge is not found', async () => {
@@ -15,6 +15,7 @@ describe('POST /tasks/:taskId/checklist/', () => {
    user = await generateUser();
    guild = await generateGroup(user);
    challenge = await generateChallenge(user, guild);
+    await user.post(`/challenges/${challenge._id}/join`);
  });

  it('fails on task not found', async () => {
@@ -3,7 +3,7 @@ import {
  generateGroup,
  generateChallenge,
  translate as t,
-} from '../../../../../helpers/api-v3-integration.helper';
+} from '../../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';
 import { find } from 'lodash';

@@ -20,6 +20,7 @@ describe('POST /tasks/challenge/:challengeId', () => {
    user = await generateUser({balance: 1});
    guild = await generateGroup(user);
    challenge = await generateChallenge(user, guild);
+    await user.post(`/challenges/${challenge._id}/join`);
  });

  it('returns error when challenge is not found', async () => {
@@ -15,6 +15,7 @@ describe('POST /tasks/:id/score/:direction', () => {
    user = await generateUser();
    guild = await generateGroup(user);
    challenge = await generateChallenge(user, guild);
+    await user.post(`/challenges/${challenge._id}/join`);
  });

  context('habits', () => {
@@ -15,6 +15,7 @@ describe('PUT /tasks/:id', () => {
    user = await generateUser();
    guild = await generateGroup(user);
    challenge = await generateChallenge(user, guild);
+    await user.post(`/challenges/${challenge._id}/join`);
  });

  context('errors', () => {
@@ -15,6 +15,7 @@ describe('PUT /tasks/:taskId/checklist/:itemId', () => {
    user = await generateUser();
    guild = await generateGroup(user);
    challenge = await generateChallenge(user, guild);
+    await user.post(`/challenges/${challenge._id}/join`);
  });

  it('fails on task not found', async () => {
@@ -2,7 +2,7 @@ import {
  generateUser,
  createAndPopulateGroup,
  translate as t,
-} from '../../../../../helpers/api-v3-integration.helper';
+} from '../../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';

 describe('POST /tasks/group/:groupid', () => {
@@ -2,7 +2,7 @@ import {
  generateUser,
  createAndPopulateGroup,
  translate as t,
-} from '../../../../../helpers/api-v3-integration.helper';
+} from '../../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';
 import { find } from 'lodash';

@@ -1,7 +1,7 @@
 import {
  generateUser,
  generateGroup,
-} from '../../../../../helpers/api-v3-integration.helper';
+} from '../../../../../helpers/api-integration/v3';

 describe('POST group-tasks/:taskId/move/to/:position', () => {
  let user, guild;
@@ -2,7 +2,7 @@ import {
  generateUser,
  createAndPopulateGroup,
  translate as t,
-} from '../../../../../helpers/api-v3-integration.helper';
+} from '../../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';
 import { find } from 'lodash';

@@ -117,6 +117,7 @@ describe('DELETE /user', () => {
      let authorizedUser = populatedGroup.members[1];

      let challenge = await generateChallenge(populatedGroup.groupLeader, group);
+      await populatedGroup.groupLeader.post(`/challenges/${challenge._id}/join`);
      await authorizedUser.post(`/challenges/${challenge._id}/join`);

      await challenge.sync();
@@ -109,6 +109,7 @@ describe('POST /user/class/cast/:spellId', () => {
  it('returns an error if a challenge task was targeted', async () => {
    let {group, groupLeader} = await createAndPopulateGroup();
    let challenge = await generateChallenge(groupLeader, group);
+    await groupLeader.post(`/challenges/${challenge._id}/join`);
    await groupLeader.post(`/tasks/challenge/${challenge._id}`, [
      {type: 'habit', text: 'task text'},
    ]);
@@ -238,6 +239,7 @@ describe('POST /user/class/cast/:spellId', () => {
  it('searing brightness does not affect challenge or group tasks', async () => {
    let guild = await generateGroup(user);
    let challenge = await generateChallenge(user, guild);
+    await user.post(`/challenges/${challenge._id}/join`);
    await user.post(`/tasks/challenge/${challenge._id}`, {
      text: 'test challenge habit',
      type: 'habit',
@@ -90,6 +90,7 @@ describe('POST /user/reset', () => {
  it('does not delete challenge or group tasks', async () => {
    let guild = await generateGroup(user);
    let challenge = await generateChallenge(user, guild);
+    await user.post(`/challenges/${challenge._id}/join`);
    await user.post(`/tasks/challenge/${challenge._id}`, {
      text: 'test challenge habit',
      type: 'habit',
@@ -1,7 +1,7 @@
 import {
  generateUser,
  translate as t,
-} from '../../../../../helpers/api-v3-integration.helper';
+} from '../../../../../helpers/api-integration/v3';
 import {
  bcryptCompare,
  sha1MakeSalt,
@@ -1,7 +1,7 @@
 import {
  generateUser,
  translate as t,
-} from '../../../../../helpers/api-v3-integration.helper';
+} from '../../../../../helpers/api-integration/v3';
 import {
  bcryptCompare,
  sha1MakeSalt,
@@ -1,7 +1,7 @@
 import {
  generateUser,
  translate as t,
-} from '../../../../../helpers/api-v3-integration.helper';
+} from '../../../../../helpers/api-integration/v3';
 import {
  bcryptCompare,
  sha1MakeSalt,
--- a/Show More
+++ b/Show More