sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-04 04:59:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix tests / lint

Browse source
This commit is contained in:
negue 2018-10-14 15:28:00 +02:00
parent 75e3f15352
commit 2c250bfcd9
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/api/v3/integration/chat/POST-chat.flag.test.js
View file

@ -63,7 +63,7 @@ describe('POST /chat/:chatId/flag', () => {
/* eslint-disable camelcase */
expect(IncomingWebhook.prototype.send).to.be.calledWith({
text: `${user.profile.name} (${user.id}; language: en) flagged a message`,
text: `${user.profile.name} (${user.id}; language: en) flagged a group message`,
attachments: [{
fallback: 'Flag Message',
color: 'danger',
@ -98,7 +98,7 @@ describe('POST /chat/:chatId/flag', () => {
/* eslint-disable camelcase */
expect(IncomingWebhook.prototype.send).to.be.calledWith({
text: `${newUser.profile.name} (${newUser.id}; language: en) flagged a message`,
text: `${newUser.profile.name} (${newUser.id}; language: en) flagged a group message`,
attachments: [{
fallback: 'Flag Message',
color: 'danger',

14
test/api/v3/integration/members/POST-flag_private_message.test.js → test/api/v4/members/POST-flag_private_message.test.js
View file

@ -1,7 +1,7 @@
import {
generateUser,
translate as t,
} from '../../../../helpers/api-integration/v3';
} from '../../../helpers/api-integration/v4';
describe('POST /members/flag-private-message/:messageId', () => {
let userToSendMessage;
@ -19,9 +19,9 @@ describe('POST /members/flag-private-message/:messageId', () => {
toUserId: receiver._id,
});
let updatedSender = await userToSendMessage.get('/user');
let senderMessages = await userToSendMessage.get('/inbox/messages');
let sendersMessageInSendersInbox = _.find(updatedSender.inbox.messages, (message) => {
let sendersMessageInSendersInbox = _.find(senderMessages, (message) => {
return message.uuid === receiver._id && message.text === messageToSend;
});
@ -37,9 +37,9 @@ describe('POST /members/flag-private-message/:messageId', () => {
toUserId: receiver._id,
});
let updatedReceiver = await receiver.get('/user');
let receiversMessages = await receiver.get('/inbox/messages');
let sendersMessageInReceiversInbox = _.find(updatedReceiver.inbox.messages, (message) => {
let sendersMessageInReceiversInbox = _.find(receiversMessages, (message) => {
return message.uuid === userToSendMessage._id && message.text === messageToSend;
});
@ -55,9 +55,9 @@ describe('POST /members/flag-private-message/:messageId', () => {
toUserId: receiver._id,
});
let updatedReceiver = await receiver.get('/user');
let receiversMessages = await receiver.get('/inbox/messages');
let sendersMessageInReceiversInbox = _.find(updatedReceiver.inbox.messages, (message) => {
let sendersMessageInReceiversInbox = _.find(receiversMessages, (message) => {
return message.uuid === userToSendMessage._id && message.text === messageToSend;
});

1
website/server/controllers/api-v3/members.js
View file

@ -20,7 +20,6 @@ import {
} from '../../libs/email';
import { sendNotification as sendPushNotification } from '../../libs/pushNotifications';
import { achievements } from '../../../../website/common/';
import {chatReporterFactory} from '../../libs/chatReporting/chatReporterFactory';
let api = {};