From e9d5123f8a5e70ea4952332145177e033c0075ea Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Thu, 7 Feb 2019 18:02:23 +0100 Subject: [PATCH] fix failing tests --- test/api/unit/libs/highlightMentions.js | 24 +++++++++++------------ website/server/controllers/api-v3/chat.js | 1 - 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/test/api/unit/libs/highlightMentions.js b/test/api/unit/libs/highlightMentions.js index 5a44a1834a..5adf9d29fb 100644 --- a/test/api/unit/libs/highlightMentions.js +++ b/test/api/unit/libs/highlightMentions.js @@ -33,32 +33,32 @@ describe('highlightMentions', () => { it('doesn\'t change text without mentions', async () => { let text = 'some chat text'; - let highlightedText = await highlightMentions(text); - expect(highlightedText).to.equal(text); + let result = await highlightMentions(text); + expect(result[0]).to.equal(text); }); it('highlights existing users', async () => { let text = '@user: message'; - let highlightedText = await highlightMentions(text); - expect(highlightedText).to.equal('[@user](/profile/111): message'); + let result = await highlightMentions(text); + expect(result[0]).to.equal('[@user](/profile/111): message'); }); it('highlights special characters', async () => { let text = '@user-dash: message @user_underscore'; - let highlightedText = await highlightMentions(text); - expect(highlightedText).to.equal('[@user-dash](/profile/444): message [@user_underscore](/profile/555)'); + let result = await highlightMentions(text); + expect(result[0]).to.equal('[@user-dash](/profile/444): message [@user_underscore](/profile/555)'); }); it('doesn\'t highlight nonexisting users', async () => { let text = '@nouser message'; - let highlightedText = await highlightMentions(text); - expect(highlightedText).to.equal('@nouser message'); + let result = await highlightMentions(text); + expect(result[0]).to.equal('@nouser message'); }); it('highlights multiple existing users', async () => { let text = '@user message (@user2) @user3 @user'; - let highlightedText = await highlightMentions(text); - expect(highlightedText).to.equal('[@user](/profile/111) message ([@user2](/profile/222)) [@user3](/profile/333) [@user](/profile/111)'); + let result = await highlightMentions(text); + expect(result[0]).to.equal('[@user](/profile/111) message ([@user2](/profile/222)) [@user3](/profile/333) [@user](/profile/111)'); }); it('doesn\'t highlight more than 5 users', async () => { let text = '@user @user2 @user3 @user4 @user5 @user6'; - let highlightedText = await highlightMentions(text); - expect(highlightedText).to.equal(text); + let result = await highlightMentions(text); + expect(result[0]).to.equal(text); }); }); diff --git a/website/server/controllers/api-v3/chat.js b/website/server/controllers/api-v3/chat.js index ede6098abc..3b3ef035cf 100644 --- a/website/server/controllers/api-v3/chat.js +++ b/website/server/controllers/api-v3/chat.js @@ -85,7 +85,6 @@ function getBannedWordsFromText (message) { } -const mentionRegex = new RegExp('\\B@[-\\w]+', 'g'); /** * @api {post} /api/v3/groups/:groupId/chat Post chat message to a group * @apiName PostChat