diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-28 03:08:34 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-28 03:08:34 +0300 |
commit | d690a8d62bc0abd5ab937822ff7a1b9f1e7b1a91 (patch) | |
tree | cede6bf5f7560522c7917378f8c09439b267a6e7 /app/assets/javascripts/notes | |
parent | d440531cf8d33834541da20aa2427c726d39e5ef (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes')
4 files changed, 11 insertions, 4 deletions
diff --git a/app/assets/javascripts/notes/components/discussion_filter.vue b/app/assets/javascripts/notes/components/discussion_filter.vue index e4b191b55a7..1ce23c941e6 100644 --- a/app/assets/javascripts/notes/components/discussion_filter.vue +++ b/app/assets/javascripts/notes/components/discussion_filter.vue @@ -117,6 +117,7 @@ export default { v-if="displayFilters" id="discussion-filter-dropdown" class="gl-mr-3 full-width-mobile discussion-filter-container js-discussion-filter-container qa-discussion-filter" + data-qa-selector="discussion_filter_dropdown" :text="currentFilter.title" > <div v-for="filter in filters" :key="filter.value" class="dropdown-item-wrapper"> @@ -125,7 +126,7 @@ export default { :is-checked="filter.value === currentValue" :class="{ 'is-active': filter.value === currentValue }" :data-filter-type="filterType(filter.value)" - class="qa-filter-options" + data-qa-selector="filter_menu_item" @click.prevent="selectFilter(filter.value)" > {{ filter.title }} diff --git a/app/assets/javascripts/notes/components/discussion_filter_note.vue b/app/assets/javascripts/notes/components/discussion_filter_note.vue index ae6646cf96c..ff70c89cd39 100644 --- a/app/assets/javascripts/notes/components/discussion_filter_note.vue +++ b/app/assets/javascripts/notes/components/discussion_filter_note.vue @@ -33,7 +33,10 @@ export default { </script> <template> - <li class="timeline-entry note note-wrapper discussion-filter-note js-discussion-filter-note"> + <li + class="timeline-entry note note-wrapper discussion-filter-note js-discussion-filter-note" + data-qa-selector="discussion_filter_container" + > <div class="timeline-icon d-none d-lg-flex"> <gl-icon name="comment" /> </div> diff --git a/app/assets/javascripts/notes/components/note_header.vue b/app/assets/javascripts/notes/components/note_header.vue index a13a0dbbf30..60a92da3e08 100644 --- a/app/assets/javascripts/notes/components/note_header.vue +++ b/app/assets/javascripts/notes/components/note_header.vue @@ -170,7 +170,9 @@ export default { </template> <span v-else>{{ __('A deleted user') }}</span> <span class="note-headline-light note-headline-meta"> - <span class="system-note-message"> <slot></slot> </span> + <span class="system-note-message" data-qa-selector="system_note_content"> + <slot></slot> + </span> <template v-if="createdAt"> <span ref="actionText" class="system-note-separator"> <template v-if="actionText">{{ actionText }}</template> diff --git a/app/assets/javascripts/notes/components/noteable_note.vue b/app/assets/javascripts/notes/components/noteable_note.vue index d859e03dc12..1775e83978e 100644 --- a/app/assets/javascripts/notes/components/noteable_note.vue +++ b/app/assets/javascripts/notes/components/noteable_note.vue @@ -353,7 +353,8 @@ export default { :class="classNameBindings" :data-award-url="note.toggle_award_path" :data-note-id="note.id" - class="note note-wrapper qa-noteable-note-item" + class="note note-wrapper" + data-qa-selector="noteable_note_container" > <div v-if="showMultiLineComment" |