diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-19 06:10:08 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-19 06:10:08 +0300 |
commit | 66d5486a564c7bbdc730763a1689e09ae332dabe (patch) | |
tree | 7fd36ade2c6fdcd8042abcc3866e8d131aa57095 /app/assets/javascripts | |
parent | 70d9c92f0e81ae5f9cc82084e4b815a78596c76d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts')
13 files changed, 17 insertions, 20 deletions
diff --git a/app/assets/javascripts/issuable/components/csv_export_modal.vue b/app/assets/javascripts/issuable/components/csv_export_modal.vue index c1de507cd80..fd279a6a451 100644 --- a/app/assets/javascripts/issuable/components/csv_export_modal.vue +++ b/app/assets/javascripts/issuable/components/csv_export_modal.vue @@ -47,7 +47,7 @@ export default { href: this.exportCsvPath, variant: 'confirm', 'data-method': 'post', - 'data-qa-selector': `export_issues_button`, + 'data-testid': 'export-issues-button', 'data-track-action': 'click_button', 'data-track-label': this.dataTrackLabel, }, @@ -78,7 +78,7 @@ export default { :action-cancel="$options.actionCancel" body-class="gl-p-0!" :title="exportText" - data-qa-selector="export_issuable_modal" + data-testid="export-issuable-modal" > <div class="gl-justify-content-start gl-align-items-center gl-p-4 gl-border-b-solid gl-border-1 gl-border-gray-50" diff --git a/app/assets/javascripts/issuable/components/csv_import_export_buttons.vue b/app/assets/javascripts/issuable/components/csv_import_export_buttons.vue index 872e1d4269d..8e2ed63613d 100644 --- a/app/assets/javascripts/issuable/components/csv_import_export_buttons.vue +++ b/app/assets/javascripts/issuable/components/csv_import_export_buttons.vue @@ -76,7 +76,6 @@ export default { v-if="showExportButton" v-gl-modal="exportModalId" data-testid="export-as-csv-button" - data-qa-selector="export_as_csv_button" :item="dropdownItems.exportAsCSV" /> <gl-disclosure-dropdown-item @@ -88,7 +87,6 @@ export default { <gl-disclosure-dropdown-item v-if="showImportButton && canEdit" data-testid="import-from-jira-link" - data-qa-selector="import_from_jira_link" :item="dropdownItems.importFromJIRA" /> diff --git a/app/assets/javascripts/issuable/components/issue_assignees.vue b/app/assets/javascripts/issuable/components/issue_assignees.vue index d8cbc45684b..2181b4e1a40 100644 --- a/app/assets/javascripts/issuable/components/issue_assignees.vue +++ b/app/assets/javascripts/issuable/components/issue_assignees.vue @@ -89,7 +89,7 @@ export default { :img-size="iconSize" class="js-no-trigger author-link" tooltip-placement="bottom" - data-qa-selector="assignee_link" + data-testid="assignee-link" > <span class="js-assignee-tooltip"> <span class="bold d-block">{{ s__('Label|Assignee') }}</span> {{ assignee.name }} @@ -101,7 +101,7 @@ export default { v-gl-tooltip.bottom :title="assigneesCounterTooltip" class="avatar-counter" - data-qa-selector="avatar_counter_content" + data-testid="avatar-counter-content" >{{ assigneeCounterLabel }}</span > </div> diff --git a/app/assets/javascripts/issues/list/components/empty_state_without_any_issues.vue b/app/assets/javascripts/issues/list/components/empty_state_without_any_issues.vue index 9f7fca0ceca..3d62ea07f59 100644 --- a/app/assets/javascripts/issues/list/components/empty_state_without_any_issues.vue +++ b/app/assets/javascripts/issues/list/components/empty_state_without_any_issues.vue @@ -82,7 +82,7 @@ export default { v-if="showCsvButtons" class="gl-w-full gl-sm-w-auto gl-sm-mr-3" :toggle-text="$options.i18n.importIssues" - data-qa-selector="import_issues_dropdown" + data-testid="import-issues-dropdown" > <csv-import-export-buttons :export-csv-path="exportCsvPathWithQuery" diff --git a/app/assets/javascripts/issues/list/components/issues_list_app.vue b/app/assets/javascripts/issues/list/components/issues_list_app.vue index c50b48ca0d8..f396a8d1928 100644 --- a/app/assets/javascripts/issues/list/components/issues_list_app.vue +++ b/app/assets/javascripts/issues/list/components/issues_list_app.vue @@ -1059,7 +1059,7 @@ export default { no-caret :toggle-text="$options.i18n.actionsLabel" text-sr-only - data-qa-selector="issues_list_more_actions_dropdown" + data-testid="issues-list-more-actions-dropdown" > <csv-import-export-buttons v-if="showCsvButtons" diff --git a/app/assets/javascripts/jira_import/components/jira_import_form.vue b/app/assets/javascripts/jira_import/components/jira_import_form.vue index f8ca62da1a5..d737916857b 100644 --- a/app/assets/javascripts/jira_import/components/jira_import_form.vue +++ b/app/assets/javascripts/jira_import/components/jira_import_form.vue @@ -269,7 +269,7 @@ export default { <gl-form-select id="jira-project-select" v-model="selectedProject" - data-qa-selector="jira_project_dropdown" + data-testid="jira-project-dropdown" class="mb-2" :options="jiraProjects" :state="selectState" @@ -349,7 +349,7 @@ export default { variant="confirm" class="js-no-auto-disable" :loading="isSubmitting" - data-qa-selector="jira_issues_import_button" + data-testid="jira-issues-import-button" > {{ __('Continue') }} </gl-button> diff --git a/app/assets/javascripts/vue_shared/components/markdown/mount_markdown_editor.js b/app/assets/javascripts/vue_shared/components/markdown/mount_markdown_editor.js index 0b0867ae84c..6c2f084591e 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/mount_markdown_editor.js +++ b/app/assets/javascripts/vue_shared/components/markdown/mount_markdown_editor.js @@ -72,7 +72,7 @@ export function mountMarkdownEditor(options = {}) { quickActionsDocsPath, formFieldPlaceholder, formFieldClasses, - qaSelector, + testid, newIssuePath, } = el.dataset; @@ -115,7 +115,7 @@ export function mountMarkdownEditor(options = {}) { id: formFieldId, name: formFieldName, class: formFieldClasses, - 'data-qa-selector': qaSelector, + 'data-testid': testid, }, autosaveKey, enableAutocomplete, diff --git a/app/assets/javascripts/vue_shared/issuable/create/components/issuable_form.vue b/app/assets/javascripts/vue_shared/issuable/create/components/issuable_form.vue index 699b41f3bf3..1cfa3f6d3d7 100644 --- a/app/assets/javascripts/vue_shared/issuable/create/components/issuable_form.vue +++ b/app/assets/javascripts/vue_shared/issuable/create/components/issuable_form.vue @@ -36,7 +36,7 @@ export default { ariaLabel: __('Description'), class: 'rspec-issuable-form-description', placeholder: __('Write a comment or drag your files hereā¦'), - dataQaSelector: 'issuable_form_description_field', + dataTestid: 'issuable-form-description-field', id: 'issuable-description', name: 'issuable-description', }, diff --git a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_list_root.vue b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_list_root.vue index 7a9404e06c7..a08c16b28f2 100644 --- a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_list_root.vue +++ b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_list_root.vue @@ -344,7 +344,7 @@ export default { :show-friendly-text="showFilteredSearchFriendlyText" terms-as-tokens class="gl-flex-grow-1 gl-border-t-none row-content-block" - data-qa-selector="issuable_search_container" + data-testid="issuable-search-container" @checked-input="handleAllIssuablesCheckedInput" @onFilter="$emit('filter', $event)" @onSort="$emit('sort', $event)" @@ -377,7 +377,7 @@ export default { v-for="issuable in issuables" :key="issuableId(issuable)" :class="{ 'gl-cursor-grab': isManualOrdering }" - data-qa-selector="issuable_container" + data-testid="issuable-container" :data-qa-issuable-title="issuable.title" :has-scoped-labels-feature="hasScopedLabelsFeature" :issuable-symbol="issuableSymbol" diff --git a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_tabs.vue b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_tabs.vue index 0691bc02b5c..ab71842ae13 100644 --- a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_tabs.vue +++ b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_tabs.vue @@ -56,7 +56,7 @@ export default { @click="$emit('click', tab.name)" > <template #title> - <span :title="tab.titleTooltip" :data-qa-selector="`${tab.name}_issuables_tab`"> + <span :title="tab.titleTooltip" :data-testid="`${tab.name}-issuables-tab`"> {{ tab.title }} </span> <gl-badge diff --git a/app/assets/javascripts/vue_shared/issuable/show/components/issuable_description.vue b/app/assets/javascripts/vue_shared/issuable/show/components/issuable_description.vue index ce1851ab873..01389cd90a9 100644 --- a/app/assets/javascripts/vue_shared/issuable/show/components/issuable_description.vue +++ b/app/assets/javascripts/vue_shared/issuable/show/components/issuable_description.vue @@ -34,7 +34,7 @@ export default { <div class="description" :class="{ 'js-task-list-container': canEdit && enableTaskList }" - data-qa-selector="description_content" + data-testid="description-content" > <div ref="gfmContainer" v-safe-html="issuable.descriptionHtml" class="md"></div> <textarea diff --git a/app/assets/javascripts/vue_shared/issuable/show/components/issuable_show_root.vue b/app/assets/javascripts/vue_shared/issuable/show/components/issuable_show_root.vue index 2bc57ecba55..17e22fcfeb1 100644 --- a/app/assets/javascripts/vue_shared/issuable/show/components/issuable_show_root.vue +++ b/app/assets/javascripts/vue_shared/issuable/show/components/issuable_show_root.vue @@ -105,7 +105,7 @@ export default { </script> <template> - <div class="issuable-show-container" data-qa-selector="issuable_show_container"> + <div class="issuable-show-container" data-testid="issuable-show-container"> <issuable-header :issuable-state="issuable.state" :status-icon="statusIcon" diff --git a/app/assets/javascripts/vue_shared/issuable/show/components/issuable_title.vue b/app/assets/javascripts/vue_shared/issuable/show/components/issuable_title.vue index 841d92fd63d..da71adc8abd 100644 --- a/app/assets/javascripts/vue_shared/issuable/show/components/issuable_title.vue +++ b/app/assets/javascripts/vue_shared/issuable/show/components/issuable_title.vue @@ -60,8 +60,7 @@ export default { v-safe-html="issuable.titleHtml || issuable.title" class="title gl-font-size-h-display" dir="auto" - data-qa-selector="title_content" - data-testid="title" + data-testid="issuable-title" ></h1> <gl-button v-if="enableEdit" |