diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-11-07 21:23:54 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-11-07 21:23:54 +0900 |
| commit | bbdb0cf05141cdf9931e2aa673bf7a2ce5db0078 (patch) | |
| tree | cf0e3da342c5543d817484d5130bc1e69012359a /spec/javascripts | |
| parent | ce7b05f41d3941552320c23dc06f9f2b076099ed (diff) | |
| parent | 666ab4882f2c6d385c04afe269ddf5b11f795b19 (diff) | |
| download | gitlab-ce-bbdb0cf05141cdf9931e2aa673bf7a2ce5db0078.tar.gz | |
Merge branch 'master' into 38464-k8s-apps
Diffstat (limited to 'spec/javascripts')
| -rw-r--r-- | spec/javascripts/monitoring/graph/legend_spec.js | 2 | ||||
| -rw-r--r-- | spec/javascripts/monitoring/graph_path_spec.js | 2 | ||||
| -rw-r--r-- | spec/javascripts/monitoring/utils/multiple_time_series_spec.js | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/spec/javascripts/monitoring/graph/legend_spec.js b/spec/javascripts/monitoring/graph/legend_spec.js index 2571b7ef869..145c8db28d5 100644 --- a/spec/javascripts/monitoring/graph/legend_spec.js +++ b/spec/javascripts/monitoring/graph/legend_spec.js @@ -28,7 +28,7 @@ const defaultValuesComponent = { currentDataIndex: 0, }; -const timeSeries = createTimeSeries(convertedMetrics[0].queries[0], +const timeSeries = createTimeSeries(convertedMetrics[0].queries, defaultValuesComponent.graphWidth, defaultValuesComponent.graphHeight, defaultValuesComponent.graphHeightOffset); diff --git a/spec/javascripts/monitoring/graph_path_spec.js b/spec/javascripts/monitoring/graph_path_spec.js index 81825a3ae87..8ece913ada8 100644 --- a/spec/javascripts/monitoring/graph_path_spec.js +++ b/spec/javascripts/monitoring/graph_path_spec.js @@ -13,7 +13,7 @@ const createComponent = (propsData) => { const convertedMetrics = convertDatesMultipleSeries(singleRowMetricsMultipleSeries); -const timeSeries = createTimeSeries(convertedMetrics[0].queries[0], 428, 272, 120); +const timeSeries = createTimeSeries(convertedMetrics[0].queries, 428, 272, 120); const firstTimeSeries = timeSeries[0]; describe('Monitoring Paths', () => { diff --git a/spec/javascripts/monitoring/utils/multiple_time_series_spec.js b/spec/javascripts/monitoring/utils/multiple_time_series_spec.js index 7e44a9ade9e..99584c75287 100644 --- a/spec/javascripts/monitoring/utils/multiple_time_series_spec.js +++ b/spec/javascripts/monitoring/utils/multiple_time_series_spec.js @@ -2,7 +2,7 @@ import createTimeSeries from '~/monitoring/utils/multiple_time_series'; import { convertDatesMultipleSeries, singleRowMetricsMultipleSeries } from '../mock_data'; const convertedMetrics = convertDatesMultipleSeries(singleRowMetricsMultipleSeries); -const timeSeries = createTimeSeries(convertedMetrics[0].queries[0], 428, 272, 120); +const timeSeries = createTimeSeries(convertedMetrics[0].queries, 428, 272, 120); const firstTimeSeries = timeSeries[0]; describe('Multiple time series', () => { |