diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-07 00:07:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-07 00:07:43 +0300 |
| commit | 015663b70f1bcdae4483e38c2beac884f92da5b8 (patch) | |
| tree | 6dd5a59c7f9a27c3cca22801ca30bf3dd8f9b401 /app/assets/javascripts/performance_bar | |
| parent | 5eb11b697d7ee280b0b5c2ff9a1850a3b5e9b7e3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/performance_bar')
3 files changed, 9 insertions, 4 deletions
diff --git a/app/assets/javascripts/performance_bar/components/detailed_metric.vue b/app/assets/javascripts/performance_bar/components/detailed_metric.vue index 7ce32032ed3..24ae900b445 100644 --- a/app/assets/javascripts/performance_bar/components/detailed_metric.vue +++ b/app/assets/javascripts/performance_bar/components/detailed_metric.vue @@ -59,7 +59,8 @@ export default { <div v-if="currentRequest.details && metricDetails" :id="`peek-view-${metric}`" - class="view qa-performance-bar-detailed-metric" + class="view" + data-qa-selector="detailed_metric_content" > <button :data-target="`#modal-peek-${metric}-details`" diff --git a/app/assets/javascripts/performance_bar/components/performance_bar_app.vue b/app/assets/javascripts/performance_bar/components/performance_bar_app.vue index d17c2f33adc..1df5562e1b6 100644 --- a/app/assets/javascripts/performance_bar/components/performance_bar_app.vue +++ b/app/assets/javascripts/performance_bar/components/performance_bar_app.vue @@ -107,7 +107,11 @@ export default { </script> <template> <div id="js-peek" :class="env"> - <div v-if="currentRequest" class="d-flex container-fluid container-limited qa-performance-bar"> + <div + v-if="currentRequest" + class="d-flex container-fluid container-limited" + data-qa-selector="performance_bar" + > <div id="peek-view-host" class="view"> <span v-if="hasHost" diff --git a/app/assets/javascripts/performance_bar/components/request_selector.vue b/app/assets/javascripts/performance_bar/components/request_selector.vue index 1610534ae0d..115b2ff08ac 100644 --- a/app/assets/javascripts/performance_bar/components/request_selector.vue +++ b/app/assets/javascripts/performance_bar/components/request_selector.vue @@ -45,13 +45,13 @@ export default { }; </script> <template> - <div id="peek-request-selector"> + <div id="peek-request-selector" data-qa-selector="request_dropdown"> <select v-model="currentRequestId"> <option v-for="request in requests" :key="request.id" :value="request.id" - class="qa-performance-bar-request" + data-qa-selector="request_dropdown_option" > {{ request.truncatedUrl }} <span v-if="request.hasWarnings">(!)</span> |