Commit 4c87c858 authored by Nicolò Maria Mezzopera's avatar Nicolò Maria Mezzopera

Merge branch 'cngo-rename-comment-form-textarea-label' into 'master'

Rename comment form textarea label to `Comment`

See merge request gitlab-org/gitlab!55088
parents 4c33c59f 2b69386f
...@@ -363,7 +363,7 @@ export default { ...@@ -363,7 +363,7 @@ export default {
data-qa-selector="comment_field" data-qa-selector="comment_field"
data-testid="comment-field" data-testid="comment-field"
:data-supports-quick-actions="!glFeatures.tributeAutocomplete" :data-supports-quick-actions="!glFeatures.tributeAutocomplete"
:aria-label="__('Description')" :aria-label="__('Comment')"
:placeholder="__('Write a comment or drag your files here…')" :placeholder="__('Write a comment or drag your files here…')"
@keydown.up="editCurrentUserLastNote()" @keydown.up="editCurrentUserLastNote()"
@keydown.meta.enter="handleSave()" @keydown.meta.enter="handleSave()"
......
---
title: Rename comment form textarea label to `Comment`
merge_request: 55088
author:
type: changed
...@@ -209,16 +209,16 @@ RSpec.describe 'GFM autocomplete', :js do ...@@ -209,16 +209,16 @@ RSpec.describe 'GFM autocomplete', :js do
# Regression test for https://gitlab.com/gitlab-org/gitlab/-/issues/321925 # Regression test for https://gitlab.com/gitlab-org/gitlab/-/issues/321925
it 'shows username when pasting then pressing Enter' do it 'shows username when pasting then pressing Enter' do
fill_in 'Description', with: "@#{user.username}\n" fill_in 'Comment', with: "@#{user.username}\n"
expect(find_field('Description').value).to have_content "@#{user.username}" expect(find_field('Comment').value).to have_content "@#{user.username}"
end end
it 'does not show `@undefined` when pressing `@` then Enter' do it 'does not show `@undefined` when pressing `@` then Enter' do
fill_in 'Description', with: "@\n" fill_in 'Comment', with: "@\n"
expect(find_field('Description').value).to have_content "@" expect(find_field('Comment').value).to have_content "@"
expect(find_field('Description').value).not_to have_content "@undefined" expect(find_field('Comment').value).not_to have_content "@undefined"
end end
it 'selects the first item for non-assignee dropdowns if a query is entered' do it 'selects the first item for non-assignee dropdowns if a query is entered' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment