diff options
author | Jose Ivan Vargas Lopez <jvargas@gitlab.com> | 2017-10-12 09:58:36 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-10-12 09:58:36 +0000 |
commit | b5ada8eadd6b6aa06c81f2cc8111ea13185db577 (patch) | |
tree | ec90b49b24d61d34ca85aa5042153f037d9cb0aa /spec/javascripts | |
parent | ba90f023f0e96d1df42277a156ef265a0062a403 (diff) | |
download | gitlab-ce-b5ada8eadd6b6aa06c81f2cc8111ea13185db577.tar.gz |
Resolve "Prometheus service page shows error"
Diffstat (limited to 'spec/javascripts')
-rw-r--r-- | spec/javascripts/prometheus_metrics/prometheus_metrics_spec.js | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/spec/javascripts/prometheus_metrics/prometheus_metrics_spec.js b/spec/javascripts/prometheus_metrics/prometheus_metrics_spec.js index 2b3a821dbd9..b24567ffc0c 100644 --- a/spec/javascripts/prometheus_metrics/prometheus_metrics_spec.js +++ b/spec/javascripts/prometheus_metrics/prometheus_metrics_spec.js @@ -109,12 +109,16 @@ describe('PrometheusMetrics', () => { it('should show loader animation while response is being loaded and hide it when request is complete', (done) => { const deferred = $.Deferred(); - spyOn($, 'getJSON').and.returnValue(deferred.promise()); + spyOn($, 'ajax').and.returnValue(deferred.promise()); prometheusMetrics.loadActiveMetrics(); expect(prometheusMetrics.$monitoredMetricsLoading.hasClass('hidden')).toBeFalsy(); - expect($.getJSON).toHaveBeenCalledWith(prometheusMetrics.activeMetricsEndpoint); + expect($.ajax).toHaveBeenCalledWith({ + url: prometheusMetrics.activeMetricsEndpoint, + dataType: 'json', + global: false, + }); deferred.resolve({ data: metrics, success: true }); @@ -126,7 +130,7 @@ describe('PrometheusMetrics', () => { it('should show empty state if response failed to load', (done) => { const deferred = $.Deferred(); - spyOn($, 'getJSON').and.returnValue(deferred.promise()); + spyOn($, 'ajax').and.returnValue(deferred.promise()); spyOn(prometheusMetrics, 'populateActiveMetrics'); prometheusMetrics.loadActiveMetrics(); @@ -142,7 +146,7 @@ describe('PrometheusMetrics', () => { it('should populate metrics list once response is loaded', (done) => { const deferred = $.Deferred(); - spyOn($, 'getJSON').and.returnValue(deferred.promise()); + spyOn($, 'ajax').and.returnValue(deferred.promise()); spyOn(prometheusMetrics, 'populateActiveMetrics'); prometheusMetrics.loadActiveMetrics(); |