From 2cfff1b8b9c642e9284483d6658312d9a3763417 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Thu, 12 Aug 2021 02:49:37 +0300 Subject: remove new options for style and separate line, now groups all chained mentions on a mentionsline regardless of placement. fixes spacing --- test/unit/specs/components/rich_content.spec.js | 399 +----------------------- 1 file changed, 14 insertions(+), 385 deletions(-) (limited to 'test/unit/specs/components/rich_content.spec.js') diff --git a/test/unit/specs/components/rich_content.spec.js b/test/unit/specs/components/rich_content.spec.js index 9ac9bedb..dfc229c0 100644 --- a/test/unit/specs/components/rich_content.spec.js +++ b/test/unit/specs/components/rich_content.spec.js @@ -8,11 +8,13 @@ const makeMention = (who) => { attentions.push({ statusnet_profile_url: `https://fake.tld/@${who}` }) return `@${who}` } -const stubMention = (who) => `` -const lastMentions = (...data) => `${data.join('')}` const p = (...data) => `

${data.join('')}

` const compwrap = (...data) => `${data.join('')}` -const removedMentionSpan = '' +const mentionsLine = (times) => [ + '' +].join('') describe('RichContent', () => { it('renders simple post without exploding', () => { @@ -21,7 +23,6 @@ describe('RichContent', () => { localVue, propsData: { attentions, - hideMentions: true, handleLinks: true, greentext: true, emoji: [], @@ -45,7 +46,6 @@ describe('RichContent', () => { localVue, propsData: { attentions, - hideMentions: true, handleLinks: true, greentext: true, emoji: [], @@ -56,20 +56,15 @@ describe('RichContent', () => { expect(wrapper.html()).to.eql(compwrap(expected)) }) - it('removes mentions from the beginning of post', () => { + it('replaces first mention with mentionsline', () => { const html = p( makeMention('John'), - ' how are you doing thoday?' - ) - const expected = p( - removedMentionSpan, - 'how are you doing thoday?' + ' how are you doing today?' ) const wrapper = shallowMount(RichContent, { localVue, propsData: { attentions, - hideMentions: true, handleLinks: true, greentext: true, emoji: [], @@ -77,70 +72,13 @@ describe('RichContent', () => { } }) - expect(wrapper.html()).to.eql(compwrap(expected)) + expect(wrapper.html()).to.eql(compwrap(p( + mentionsLine(1), + ' how are you doing today?' + ))) }) - it('replaces first mention with mentionsline if hideMentions=false', () => { - const html = p( - makeMention('John'), - ' how are you doing thoday?' - ) - const expected = p( - '', - '', - '', - 'how are you doing thoday?' - ) - const wrapper = shallowMount(RichContent, { - localVue, - propsData: { - attentions, - hideMentions: false, - handleLinks: true, - greentext: true, - emoji: [], - html - } - }) - - expect(wrapper.html()).to.eql(compwrap(expected)) - }) - - it('removes mentions from the end of the hellpost (

)', () => { - const html = [ - p('How are you doing today, fine gentlemen?'), - p( - makeMention('John'), - makeMention('Josh'), - makeMention('Jeremy') - ) - ].join('') - const expected = [ - p( - 'How are you doing today, fine gentlemen?' - ), - // TODO fix this extra line somehow? - p() - ].join('') - - const wrapper = shallowMount(RichContent, { - localVue, - propsData: { - attentions, - hideMentions: true, - handleLinks: true, - greentext: true, - emoji: [], - html - } - }) - - expect(wrapper.html()).to.eql(compwrap(expected)) - }) - - it('replaces mentions at the end of the hellpost if hideMentions=false (

)', () => { + it('replaces mentions at the end of the hellpost', () => { const html = [ p('How are you doing today, fine gentlemen?'), p( @@ -167,189 +105,6 @@ describe('RichContent', () => { localVue, propsData: { attentions, - hideMentions: false, - handleLinks: true, - greentext: true, - emoji: [], - html - } - }) - - expect(wrapper.html()).to.eql(compwrap(expected)) - }) - - it('removes mentions from the end of the hellpost (
)', () => { - const html = [ - 'How are you doing today, fine gentlemen?', - [ - makeMention('John'), - makeMention('Josh'), - makeMention('Jeremy') - ].join('') - ].join('
') - const expected = [ - 'How are you doing today, fine gentlemen?', - // TODO fix this extra line somehow? - '
' - ].join('') - - const wrapper = shallowMount(RichContent, { - localVue, - propsData: { - attentions, - hideMentions: true, - handleLinks: true, - greentext: true, - emoji: [], - html - } - }) - - expect(wrapper.html()).to.eql(compwrap(expected)) - }) - - it('removes mentions from the end of the hellpost (\\n)', () => { - const html = [ - 'How are you doing today, fine gentlemen?', - [ - makeMention('John'), - makeMention('Josh'), - makeMention('Jeremy') - ].join('') - ].join('\n') - const expected = [ - 'How are you doing today, fine gentlemen?', - // TODO fix this extra line somehow? - '' - ].join('\n') - - const wrapper = shallowMount(RichContent, { - localVue, - propsData: { - attentions, - hideMentions: true, - handleLinks: true, - greentext: true, - emoji: [], - html - } - }) - - expect(wrapper.html()).to.eql(compwrap(expected)) - }) - - it('Does not remove mentions in the middle or at the end of text string', () => { - const html = [ - [ - makeMention('Jack'), - 'let\'s meet up with ', - makeMention('Janet') - ].join(''), - [ - 'cc: ', - makeMention('John'), - makeMention('Josh'), - makeMention('Jeremy') - ].join('') - ].join('\n') - const expected = [ - [ - removedMentionSpan, - 'let\'s meet up with ', - stubMention('Janet') - ].join(''), - [ - 'cc: ', - stubMention('John'), - stubMention('Josh'), - stubMention('Jeremy') - ].join('') - ].join('\n') - - const wrapper = shallowMount(RichContent, { - localVue, - propsData: { - attentions, - hideMentions: true, - handleLinks: true, - greentext: true, - emoji: [], - html - } - }) - - expect(wrapper.html()).to.eql(compwrap(expected)) - }) - - it('removes mentions from the end if there\'s only one first mention', () => { - const html = [ - p( - makeMention('Todd'), - 'so anyway you are wrong' - ), - p( - makeMention('Tom'), - makeMention('Trace'), - makeMention('Theodor') - ) - ].join('') - const expected = [ - p( - removedMentionSpan, - 'so anyway you are wrong' - ), - // TODO fix this extra line somehow? - p() - ].join('') - - const wrapper = shallowMount(RichContent, { - localVue, - propsData: { - attentions, - hideMentions: true, - handleLinks: true, - greentext: true, - emoji: [], - html - } - }) - - expect(wrapper.html()).to.eql(compwrap(expected)) - }) - - it('does not remove mentions from the end if there\'s more than one first mention', () => { - const html = [ - p( - makeMention('Zacharie'), - makeMention('Zinaide'), - 'you guys have cool names, and so do these guys: ' - ), - p( - makeMention('Watson'), - makeMention('Wallace'), - makeMention('Wakamoto') - ) - ].join('') - const expected = [ - p( - removedMentionSpan, - removedMentionSpan, - 'you guys have cool names, and so do these guys: ' - ), - p( - lastMentions( - stubMention('Watson'), - stubMention('Wallace'), - stubMention('Wakamoto') - ) - ) - ].join('') - - const wrapper = shallowMount(RichContent, { - localVue, - propsData: { - attentions, - hideMentions: true, handleLinks: true, greentext: true, emoji: [], @@ -378,7 +133,6 @@ describe('RichContent', () => { localVue, propsData: { attentions, - hideMentions: true, handleLinks: false, greentext: true, emoji: [], @@ -403,7 +157,6 @@ describe('RichContent', () => { localVue, propsData: { attentions, - hideMentions: true, handleLinks: false, greentext: true, emoji: [], @@ -424,7 +177,6 @@ describe('RichContent', () => { localVue, propsData: { attentions, - hideMentions: true, handleLinks: false, greentext: false, emoji: [], @@ -446,7 +198,6 @@ describe('RichContent', () => { localVue, propsData: { attentions, - hideMentions: true, handleLinks: false, greentext: false, emoji: [{ url: 'about:blank', shortcode: 'spurdo' }], @@ -464,7 +215,6 @@ describe('RichContent', () => { localVue, propsData: { attentions, - hideMentions: true, handleLinks: false, greentext: false, emoji: [], @@ -484,7 +234,7 @@ describe('RichContent', () => { ].join('\n') const expected = [ '>quote', - stubMention('lol'), + mentionsLine(1) '>quote', '>quote' ].join('\n') @@ -517,11 +267,7 @@ describe('RichContent', () => { const expected = [ 'Bruh', 'Bruh', - [ - stubMention('foo'), - stubMention('bar'), - stubMention('baz') - ].join(''), + mentionsLine(3) 'Bruh' ].join('
') @@ -529,119 +275,6 @@ describe('RichContent', () => { localVue, propsData: { attentions, - hideMentions: true, - handleLinks: true, - greentext: true, - emoji: [], - html - } - }) - - expect(wrapper.html()).to.eql(compwrap(expected)) - }) - - it('Don\'t remove last mention if it\'s the only one', () => { - const html = [ - 'Bruh', - 'Bruh', - makeMention('foo'), - makeMention('bar'), - makeMention('baz') - ].join('
') - const expected = [ - 'Bruh', - 'Bruh', - stubMention('foo'), - stubMention('bar'), - stubMention('baz') - ].join('
') - - const wrapper = shallowMount(RichContent, { - localVue, - propsData: { - attentions, - hideMentions: true, - handleLinks: true, - greentext: true, - emoji: [], - html - } - }) - - expect(wrapper.html()).to.eql(compwrap(expected)) - }) - - it('Don\'t remove last mentions if there are more than one first mention - remove first instead', () => { - const html = [ - [ - makeMention('foo'), - makeMention('bar') - ].join(' '), - 'Bruh', - 'Bruh', - [ - makeMention('foo'), - makeMention('bar'), - makeMention('baz') - ].join(' ') - ].join('\n') - - const expected = [ - [ - removedMentionSpan, - removedMentionSpan, - 'Bruh' // Due to trim we remove extra newline - ].join(''), - 'Bruh', - lastMentions([ - stubMention('foo'), - stubMention('bar'), - stubMention('baz') - ].join(' ')) - ].join('\n') - - const wrapper = shallowMount(RichContent, { - localVue, - propsData: { - attentions, - hideMentions: true, - handleLinks: true, - greentext: true, - emoji: [], - html - } - }) - - expect(wrapper.html()).to.eql(compwrap(expected)) - }) - - it('Remove last mentions if there\'s just one first mention - remove all', () => { - const html = [ - [ - makeMention('foo') - ].join(' '), - 'Bruh', - 'Bruh', - [ - makeMention('foo'), - makeMention('bar'), - makeMention('baz') - ].join(' ') - ].join('\n') - - const expected = [ - [ - removedMentionSpan, - 'Bruh' // Due to trim we remove extra newline - ].join(''), - 'Bruh\n' // Can't remove this one yet - ].join('\n') - - const wrapper = shallowMount(RichContent, { - localVue, - propsData: { - attentions, - hideMentions: true, handleLinks: true, greentext: true, emoji: [], @@ -678,7 +311,6 @@ describe('RichContent', () => { localVue, propsData: { attentions, - hideMentions: true, handleLinks: true, greentext: true, emoji: [], @@ -726,7 +358,6 @@ describe('RichContent', () => { localVue, propsData: { attentions, - hideMentions: false, handleLinks: true, greentext: true, emoji: [], @@ -781,7 +412,6 @@ describe('RichContent', () => { }, propsData: { attentions, - hideMentions: false, handleLinks: true, greentext: true, emoji: [], @@ -826,7 +456,6 @@ describe('RichContent', () => { localVue, propsData: { attentions, - hideMentions: false, handleLinks: true, greentext: true, emoji: [], -- cgit v1.2.3-70-g09d2