From fbb9b2c65a0787a93e332e5c482f1ea06e2fa6e2 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Tue, 3 Oct 2023 15:58:31 -0500 Subject: [PATCH] fix(tests): post merge cleanup --- .../POST-members_memberId_clear-flags.js | 18 +++++----- .../members/POST-members_memberId_flag.js | 10 +++--- test/common/ops/buy/purchase.js | 12 +++---- website/server/controllers/api-v3/chat.js | 34 ------------------- .../libs/chatReporting/groupChatReporter.js | 2 +- .../libs/chatReporting/inboxChatReporter.js | 6 ---- 6 files changed, 21 insertions(+), 61 deletions(-) diff --git a/test/api/v3/integration/members/POST-members_memberId_clear-flags.js b/test/api/v3/integration/members/POST-members_memberId_clear-flags.js index b6b486b6f7..a135e698b2 100644 --- a/test/api/v3/integration/members/POST-members_memberId_clear-flags.js +++ b/test/api/v3/integration/members/POST-members_memberId_clear-flags.js @@ -25,10 +25,10 @@ describe('POST /members/:memberId/clear-flags', () => { message: t('invalidReqParams'), }); }); - + it('returns error when member with UUID is not found', async () => { const randomId = generateUUID(); - + await expect(moderator.post(`/members/${randomId}/clear-flags`)) .to.eventually.be.rejected.and.eql({ code: 404, @@ -39,14 +39,14 @@ describe('POST /members/:memberId/clear-flags', () => { it('returns error when requesting user is not a moderator', async () => { await expect(reporter.post(`/members/${admin._id}/clear-flags`)) - .to.eventually.be.rejected.and.eql({ - code: 400, - error: 'BadRequest', - message: 'Only a moderator may clear reports from a profile.', - }); + .to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: 'Only a moderator may clear reports from a profile.', + }); }); }); - + context('valid request', () => { it('removes a single flag from user', async () => { await expect(moderator.post(`/members/${admin._id}/clear-flags`)).to.eventually.be.ok; @@ -61,4 +61,4 @@ describe('POST /members/:memberId/clear-flags', () => { expect(updatedTarget.profile.flags).to.eql({}); }); }); -}); \ No newline at end of file +}); diff --git a/test/api/v3/integration/members/POST-members_memberId_flag.js b/test/api/v3/integration/members/POST-members_memberId_flag.js index 3c8282df76..964660d959 100644 --- a/test/api/v3/integration/members/POST-members_memberId_flag.js +++ b/test/api/v3/integration/members/POST-members_memberId_flag.js @@ -1,11 +1,11 @@ import { v4 as generateUUID } from 'uuid'; import moment from 'moment'; import nconf from 'nconf'; +import { IncomingWebhook } from '@slack/webhook'; import { generateUser, translate as t, } from '../../../../helpers/api-integration/v3'; -import { IncomingWebhook } from '@slack/webhook'; describe('POST /members/:memberId/flag', () => { let reporter; @@ -28,10 +28,10 @@ describe('POST /members/:memberId/flag', () => { message: t('invalidReqParams'), }); }); - + it('returns error when member with UUID is not found', async () => { const randomId = generateUUID(); - + await expect(reporter.post(`/members/${randomId}/flag`)) .to.eventually.be.rejected.and.eql({ code: 404, @@ -42,7 +42,7 @@ describe('POST /members/:memberId/flag', () => { it('returns error when non-admin flags same profile twice', async () => { await reporter.post(`/members/${target._id}/flag`); - await expect (reporter.post(`/members/${target._id}/flag`)) + await expect(reporter.post(`/members/${target._id}/flag`)) .to.eventually.be.rejected.and.eql({ code: 400, error: 'BadRequest', @@ -148,4 +148,4 @@ describe('POST /members/:memberId/flag', () => { /* eslint-enable camelcase */ }); }); -}); \ No newline at end of file +}); diff --git a/test/common/ops/buy/purchase.js b/test/common/ops/buy/purchase.js index 798cf63c3a..962175d2ae 100644 --- a/test/common/ops/buy/purchase.js +++ b/test/common/ops/buy/purchase.js @@ -197,14 +197,14 @@ describe('shared.ops.purchase', () => { it('purchases quest bundles', async () => { const startingBalance = user.balance; - // const clock = sandbox.useFakeTimers(moment('2019-05-20').valueOf()); + const clock = sandbox.useFakeTimers(moment('2022-03-16').valueOf()); const type = 'bundles'; - const key = 'featheredFriends'; + const key = 'cuddleBuddies'; const price = 1.75; const questList = [ - 'falcon', - 'harpy', - 'owl', + 'bunny', + 'ferret', + 'guineapig', ]; await purchase(user, { params: { type, key } }); @@ -216,7 +216,7 @@ describe('shared.ops.purchase', () => { expect(user.balance).to.equal(startingBalance - price); expect(pinnedGearUtils.removeItemByPath.notCalled).to.equal(true); - // clock.restore(); + clock.restore(); }); }); diff --git a/website/server/controllers/api-v3/chat.js b/website/server/controllers/api-v3/chat.js index 02ec113f0e..2f8804641e 100644 --- a/website/server/controllers/api-v3/chat.js +++ b/website/server/controllers/api-v3/chat.js @@ -148,21 +148,6 @@ api.postChat = { const authorEmail = getUserInfo(user, ['email']).email; const groupUrl = getGroupUrl(group); - const report = [ - { name: 'MESSAGE_TIME', content: (new Date()).toString() }, - { name: 'MESSAGE_TEXT', content: message }, - - { name: 'AUTHOR_USERNAME', content: user.profile.name }, - { name: 'AUTHOR_UUID', content: user._id }, - { name: 'AUTHOR_EMAIL', content: authorEmail }, - { name: 'AUTHOR_MODAL_URL', content: `/profile/${user._id}` }, - - { name: 'GROUP_NAME', content: group.name }, - { name: 'GROUP_TYPE', content: group.type }, - { name: 'GROUP_ID', content: group._id }, - { name: 'GROUP_URL', content: groupUrl }, - ]; - // Slack the mods slack.sendSlurNotification({ authorEmail, @@ -223,21 +208,6 @@ api.postChat = { const authorEmail = getUserInfo(user, ['email']).email; const groupUrl = getGroupUrl(group); - const report = [ - { name: 'MESSAGE_TIME', content: (new Date()).toString() }, - { name: 'MESSAGE_TEXT', content: message }, - - { name: 'AUTHOR_USERNAME', content: user.profile.name }, - { name: 'AUTHOR_UUID', content: user._id }, - { name: 'AUTHOR_EMAIL', content: authorEmail }, - { name: 'AUTHOR_MODAL_URL', content: `/profile/${user._id}` }, - - { name: 'GROUP_NAME', content: group.name }, - { name: 'GROUP_TYPE', content: group.type }, - { name: 'GROUP_ID', content: group._id }, - { name: 'GROUP_URL', content: groupUrl }, - ]; - // Slack the mods slack.sendShadowMutedPostNotification({ authorEmail, @@ -438,10 +408,6 @@ api.clearChatFlags = { message.flagCount = 0; await message.save(); - const adminEmailContent = getUserInfo(user, ['email']).email; - const authorEmail = getAuthorEmailFromMessage(message); - const groupUrl = getGroupUrl(group); - res.respond(200, {}); }, }; diff --git a/website/server/libs/chatReporting/groupChatReporter.js b/website/server/libs/chatReporting/groupChatReporter.js index b6e09e0eb7..65d21818ba 100644 --- a/website/server/libs/chatReporting/groupChatReporter.js +++ b/website/server/libs/chatReporting/groupChatReporter.js @@ -47,7 +47,7 @@ export default class GroupChatReporter extends ChatReporter { async notify (group, message, userComment, automatedComment = '') { slack.sendFlagNotification({ - authorEmail: this.authorEmail, + authorEmail: this.user.auth.local.email, flagger: this.user, group, message, diff --git a/website/server/libs/chatReporting/inboxChatReporter.js b/website/server/libs/chatReporting/inboxChatReporter.js index 8424a6a7d2..b2210d56bf 100644 --- a/website/server/libs/chatReporting/inboxChatReporter.js +++ b/website/server/libs/chatReporting/inboxChatReporter.js @@ -38,12 +38,6 @@ export default class InboxChatReporter extends ChatReporter { } async notify (message, userComment) { - const group = { - type: 'private messages', - name: 'N/A', - _id: 'N/A', - }; - slack.sendInboxFlagNotification({ messageUserEmail: this.messageUserEmail, flagger: this.user,