diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-03-08 01:47:24 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-03-08 01:47:24 +0300 |
| commit | 1558bd1263ffa733f70d9b1268d2010bc0f704b8 (patch) | |
| tree | 55b5eb4f9d595f183a0762febbe8f1e5994f6ccb /spec/javascripts | |
| parent | fa797c42edc6f0eca6d5640231270c15fd59dad9 (diff) | |
| parent | 8780abfd55c9b2917c3716fc4b67437c52369b60 (diff) | |
Merge branch 'jivl-backport-custom-metrics-frontend' into 'master'
backport of custom metrics for the common metrics section of CE
See merge request gitlab-org/gitlab-ce!17586
Diffstat (limited to 'spec/javascripts')
| -rw-r--r-- | spec/javascripts/prometheus_metrics/prometheus_metrics_spec.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/javascripts/prometheus_metrics/prometheus_metrics_spec.js b/spec/javascripts/prometheus_metrics/prometheus_metrics_spec.js index f6c0f51cf62..955ec6a531c 100644 --- a/spec/javascripts/prometheus_metrics/prometheus_metrics_spec.js +++ b/spec/javascripts/prometheus_metrics/prometheus_metrics_spec.js @@ -85,7 +85,7 @@ describe('PrometheusMetrics', () => { expect(prometheusMetrics.$monitoredMetricsLoading.hasClass('hidden')).toBeTruthy(); expect(prometheusMetrics.$monitoredMetricsList.hasClass('hidden')).toBeFalsy(); - expect(prometheusMetrics.$monitoredMetricsCount.text()).toEqual('12'); + expect(prometheusMetrics.$monitoredMetricsCount.text()).toEqual('3 exporters with 12 metrics were found'); expect($metricsListLi.length).toEqual(metrics.length); expect($metricsListLi.first().find('.badge').text()).toEqual(`${metrics[0].active_metrics}`); }); |