diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-05 09:11:46 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-05 09:11:46 +0300 |
commit | acda833a93d5372cdb11b50d01dc14620a451496 (patch) | |
tree | 38d017ff14ae51359a8c378fa948496b8a10f829 /app/assets/javascripts/ide | |
parent | 335dc0be1feec6e3f37be353a630576119c75e75 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/ide')
3 files changed, 8 insertions, 5 deletions
diff --git a/app/assets/javascripts/ide/components/commit_sidebar/form.vue b/app/assets/javascripts/ide/components/commit_sidebar/form.vue index 05a254d3fbf..d02dc67d933 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/form.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/form.vue @@ -156,7 +156,7 @@ export default { category="primary" variant="confirm" block - class="qa-begin-commit-button" + data-qa-selector="begin_commit_button" data-testid="begin-commit-button" @click="beginCommit" > @@ -184,7 +184,7 @@ export default { :disabled="commitButtonDisabled" :loading="submitCommitLoading" data-testid="commit-button" - class="qa-commit-button" + data-qa-selector="commit_button" category="primary" variant="confirm" type="submit" diff --git a/app/assets/javascripts/ide/components/file_templates/bar.vue b/app/assets/javascripts/ide/components/file_templates/bar.vue index 0921b5a5424..ba679ae7c9b 100644 --- a/app/assets/javascripts/ide/components/file_templates/bar.vue +++ b/app/assets/javascripts/ide/components/file_templates/bar.vue @@ -80,7 +80,9 @@ export default { <template> <div - class="gl-display-flex gl-align-items-center ide-file-templates qa-file-templates-bar gl-relative gl-z-index-1" + class="gl-display-flex gl-align-items-center ide-file-templates gl-relative gl-z-index-1" + data-testid="file-templates-bar" + data-qa-selector="file_templates_container" > <strong class="gl-mr-3"> {{ $options.i18n.barLabel }} </strong> <gl-dropdown @@ -97,7 +99,8 @@ export default { </gl-dropdown> <gl-dropdown v-if="showTemplatesDropdown" - class="gl-mr-6 qa-file-template-dropdown" + class="gl-mr-6" + data-qa-selector="file_template_dropdown" :text="$options.i18n.templateListDropdownLabel" @show="fetchTemplateTypes" > diff --git a/app/assets/javascripts/ide/components/ide_tree_list.vue b/app/assets/javascripts/ide/components/ide_tree_list.vue index c9bf84be6ac..737ff49f74c 100644 --- a/app/assets/javascripts/ide/components/ide_tree_list.vue +++ b/app/assets/javascripts/ide/components/ide_tree_list.vue @@ -52,7 +52,7 @@ export default { </script> <template> - <div class="ide-file-list qa-file-list"> + <div class="ide-file-list" data-qa-selector="file_list_container"> <template v-if="showLoading"> <div v-for="n in 3" :key="n" class="multi-file-loading-container"> <gl-skeleton-loader /> |