diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 03:11:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 03:11:06 +0300 |
commit | 96740a3316f0846e7092dbd9c575f22a0db09845 (patch) | |
tree | 2b85d9f8bf6fbab612ebb50541f3a453e452c751 /app/assets/javascripts/pipeline_new | |
parent | 98f1353fcd07e45ef995c3cee14b659711a63221 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/pipeline_new')
-rw-r--r-- | app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue | 1 | ||||
-rw-r--r-- | app/assets/javascripts/pipeline_new/components/refs_dropdown.vue | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue b/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue index e44d80ee9d1..dae89c5f3d9 100644 --- a/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue +++ b/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue @@ -393,6 +393,7 @@ export default { v-model="variable.variable_type" :class="$options.formElementClasses" :options="$options.typeOptions" + data-testid="pipeline-form-ci-variable-type" /> <gl-form-input v-model="variable.key" diff --git a/app/assets/javascripts/pipeline_new/components/refs_dropdown.vue b/app/assets/javascripts/pipeline_new/components/refs_dropdown.vue index ed5c659d1df..d35d2010150 100644 --- a/app/assets/javascripts/pipeline_new/components/refs_dropdown.vue +++ b/app/assets/javascripts/pipeline_new/components/refs_dropdown.vue @@ -81,11 +81,12 @@ export default { }; </script> <template> - <gl-dropdown :text="refShortName" block @show.once="loadRefs"> + <gl-dropdown :text="refShortName" block data-testid="ref-select" @show.once="loadRefs"> <gl-search-box-by-type v-model.trim="searchTerm" :is-loading="isLoading" :placeholder="__('Search refs')" + data-testid="search-refs" /> <gl-dropdown-section-header>{{ __('Branches') }}</gl-dropdown-section-header> <gl-dropdown-item |