From 581bd8637fa860fa26f60d8089c5d6e3f613d23f Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Mon, 1 May 2017 17:40:54 -0400 Subject: Revert "[GH-5915] Clicking on @mention of a user in a post shows the profile popover (#6129)" (#6289) This reverts commit 83f819451a80a767170b927eb2f0d5ed63f03239. --- webapp/tests/utils/formatting_at_mentions.test.jsx | 30 ++++++++-------------- 1 file changed, 11 insertions(+), 19 deletions(-) (limited to 'webapp/tests/utils/formatting_at_mentions.test.jsx') diff --git a/webapp/tests/utils/formatting_at_mentions.test.jsx b/webapp/tests/utils/formatting_at_mentions.test.jsx index 51f9bef65..d64b42c3f 100644 --- a/webapp/tests/utils/formatting_at_mentions.test.jsx +++ b/webapp/tests/utils/formatting_at_mentions.test.jsx @@ -50,38 +50,30 @@ describe('TextFormatting.AtMentions', function() { ); }); - it('Not at mentions', function() { - assert.equal( - TextFormatting.autolinkAtMentions('user@host', new Map(), {user: {}, host: {}}), - 'user@host' - ); - - assert.equal( - TextFormatting.autolinkAtMentions('user@email.com', new Map(), {user: {}, email: {}}), - 'user@email.com' - ); - + it('Implied at mentions', function() { + // PLT-4454 Assume users exist for things that look like at mentions until we support the new mention syntax assert.equal( TextFormatting.autolinkAtMentions('@user', new Map(), {}), - '@user' + '$MM_ATMENTION0', + 'should imply user exists and replace mention with token' ); assert.equal( TextFormatting.autolinkAtMentions('@user.', new Map(), {}), - '@user.', + '$MM_ATMENTION0.', 'should assume username doesn\'t end in punctuation' ); + }); + it('Not at mentions', function() { assert.equal( - TextFormatting.autolinkAtMentions('@will', new Map(), {william: {}}), - '@will', - 'should return same text without token' + TextFormatting.autolinkAtMentions('user@host', new Map(), {user: {}, host: {}}), + 'user@host' ); assert.equal( - TextFormatting.autolinkAtMentions('@william', new Map(), {will: {}}), - '@william', - 'should return same text without token' + TextFormatting.autolinkAtMentions('user@email.com', new Map(), {user: {}, email: {}}), + 'user@email.com' ); }); }); -- cgit v1.2.3-1-g7c22