New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix: Leftovers of name prop migration + fix @ in user ids (richEditor)
#4222
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| /** | ||
| * @copyright Copyright (c) 2023 Ferdinand Thiessen <opensource@fthiessen.de> | ||
| * | ||
| * @author Ferdinand Thiessen <opensource@fthiessen.de> | ||
| * | ||
| * @license AGPL-3.0-or-later | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| import { shallowMount } from '@vue/test-utils' | ||
| import richEditor from '../../../src/mixins/richEditor/index.js' | ||
|
|
||
| const TestEditor = { | ||
| mixins: [richEditor], | ||
| render: (h) => h('div'), | ||
| } | ||
|
|
||
| describe('richEditor.js', () => { | ||
| 'use strict' | ||
|
|
||
| describe('renderContent', () => { | ||
| it('sanitizes the input', () => { | ||
| const editor = shallowMount(TestEditor, { propsData: { userData: {} } }) | ||
| const input = 'Some <table>html</table>' | ||
| const output = editor.vm.renderContent(input) | ||
|
|
||
| expect(output).toEqual('Some <table>html</table>') | ||
| }) | ||
|
|
||
| it('converts newline to hard line breaks', () => { | ||
| const editor = shallowMount(TestEditor, { propsData: { userData: {} } }) | ||
| const input = 'hard\nbreak' | ||
| const output = editor.vm.renderContent(input) | ||
|
|
||
| expect(output).toEqual('hard<br>break') | ||
| }) | ||
|
|
||
| it('no duplicated ampersand (from Linkify)', () => { | ||
| const editor = shallowMount(TestEditor, { propsData: { userData: {} } }) | ||
| const input = 'hello &' | ||
| const output = editor.vm.renderContent(input) | ||
|
|
||
| expect(output).toEqual('hello &') | ||
| }) | ||
|
|
||
| it('keeps mentions without user data', () => { | ||
| const editor = shallowMount(TestEditor, { propsData: { userData: {} } }) | ||
| const input = 'hello @foobar' | ||
| const output = editor.vm.renderContent(input) | ||
|
|
||
| expect(output).toEqual('hello @foobar') | ||
| }) | ||
|
|
||
| it('keeps mentions with user data', () => { | ||
| const editor = shallowMount(TestEditor, { | ||
| propsData: { | ||
| userData: { | ||
| jdoe: { | ||
| id: 'jdoe', | ||
| title: 'J. Doe', | ||
| source: 'users', | ||
| icon: 'icon-user', | ||
| }, | ||
| }, | ||
| }, | ||
| }) | ||
| const input = 'hello @jdoe' | ||
| const output = editor.vm.renderContent(input) | ||
|
|
||
| expect(output).toMatch(/^hello <span.+role="heading" title="J. Doe"/) | ||
| }) | ||
|
|
||
| it('keep mentions with special characters', () => { | ||
| const editor = shallowMount(TestEditor, { propsData: { userData: {} } }) | ||
| const input = 'hello @foo@bar - hello @"bar @ foo"' | ||
| const output = editor.vm.renderContent(input) | ||
|
|
||
| expect(output).toEqual('hello @foo@bar - hello @"bar @ foo"') | ||
| }) | ||
| }) | ||
| }) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change was intentional, because we agreed to use the term
titleonly if if relates to the HTML attributetitle, which it does not here.Is there a deeper problem with renaming the prop here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, the problem was that the property of the menububble was renamed from label to title, but the menububble and the autocompleteresult share the same data.
Also I think that in this case title is the more logical name for this property usage.