Add latest changes from gitlab-org/gitlab@master

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