From c2ced5c925b408696394af88be5a6957b2ce8a59 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Fri, 28 Jul 2023 16:29:51 -0500
Subject: [PATCH] fix(tests): manyfix

---
 .../integration/groups/POST-groups_id_removeMember.test.js   | 5 ++++-
 test/api/v3/integration/groups/POST-groups_invite.test.js    | 5 ++---
 .../quests/POST-groups_groupId_quests_invite.test.js         | 2 +-
 website/server/models/user/schema.js                         | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/test/api/v3/integration/groups/POST-groups_id_removeMember.test.js b/test/api/v3/integration/groups/POST-groups_id_removeMember.test.js
index c8a903d891..6e8e7822e1 100644
--- a/test/api/v3/integration/groups/POST-groups_id_removeMember.test.js
+++ b/test/api/v3/integration/groups/POST-groups_id_removeMember.test.js
@@ -25,6 +25,7 @@ describe('POST /groups/:groupId/removeMember/:memberId', () => {
       },
       invites: 1,
       members: 2,
+      upgradeToGroupPlan: true,
     });
 
     guild = group;
@@ -129,9 +130,11 @@ describe('POST /groups/:groupId/removeMember/:memberId', () => {
     it('sends email to removed user', async () => {
       await leader.post(`/groups/${guild._id}/removeMember/${member._id}`);
 
-      expect(email.sendTxn).to.be.calledOnce;
+      expect(email.sendTxn).to.be.calledTwice;
       expect(email.sendTxn.args[0][0]._id).to.eql(member._id);
       expect(email.sendTxn.args[0][1]).to.eql('kicked-from-guild');
+      expect(email.sendTxn.args[1][0]._id).to.eql(member._id);
+      expect(email.sendTxn.args[1][1]).to.eql('group-member-removed');
     });
   });
 
diff --git a/test/api/v3/integration/groups/POST-groups_invite.test.js b/test/api/v3/integration/groups/POST-groups_invite.test.js
index f04641ba04..0001e09e3a 100644
--- a/test/api/v3/integration/groups/POST-groups_invite.test.js
+++ b/test/api/v3/integration/groups/POST-groups_invite.test.js
@@ -533,7 +533,7 @@ describe('Post /groups/:groupId/invite', () => {
     let partyLeader;
 
     beforeEach(async () => {
-      group = await createAndPopulateGroup({
+      ({ group, groupLeader: partyLeader } = await createAndPopulateGroup({
         groupDetails: {
           name: 'Test Party',
           type: 'party',
@@ -541,8 +541,7 @@ describe('Post /groups/:groupId/invite', () => {
         },
         // Generate party with 20 members
         members: PARTY_LIMIT_MEMBERS - 10,
-      });
-      partyLeader = group.groupLeader;
+      }));
     });
 
     it('allows 30 members in a party', async () => {
diff --git a/test/api/v3/integration/quests/POST-groups_groupId_quests_invite.test.js b/test/api/v3/integration/quests/POST-groups_groupId_quests_invite.test.js
index 5c8e27df2e..d42680a87d 100644
--- a/test/api/v3/integration/quests/POST-groups_groupId_quests_invite.test.js
+++ b/test/api/v3/integration/quests/POST-groups_groupId_quests_invite.test.js
@@ -52,7 +52,7 @@ describe('POST /groups/:groupId/quests/invite/:questKey', () => {
 
     it('does not issue invites for Guilds', async () => {
       const { group } = await createAndPopulateGroup({
-        groupDetails: { type: 'guild', privacy: 'public' },
+        groupDetails: { type: 'guild', privacy: 'private' },
         members: 1,
         upgradeToGroupPlan: true,
       });
diff --git a/website/server/models/user/schema.js b/website/server/models/user/schema.js
index 2ca9547f4c..5404a89227 100644
--- a/website/server/models/user/schema.js
+++ b/website/server/models/user/schema.js
@@ -478,7 +478,7 @@ export default new Schema({
       },
       cancelledPlan: {
         $type: Boolean,
-      }
+      },
     }],
   },