summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorJose Ivan Vargas <jvargas@gitlab.com>2017-09-07 17:16:31 -0500
committerJose Ivan Vargas <jvargas@gitlab.com>2017-09-07 17:16:31 -0500
commit7f5ae2e8b2a3e29ad128e28798b82c8b19d55100 (patch)
tree53845beb23909fe0517fdf327a00cc6c10a93873 /spec
parent851ada82158fccce112665c420b60d1905317dba (diff)
downloadgitlab-ce-7f5ae2e8b2a3e29ad128e28798b82c8b19d55100.tar.gz
Changed how the backend response is handled for when instead of series
Diffstat (limited to 'spec')
-rw-r--r--spec/javascripts/monitoring/graph/legend_spec.js2
-rw-r--r--spec/javascripts/monitoring/graph_path_spec.js4
-rw-r--r--spec/javascripts/monitoring/mock_data.js2
3 files changed, 4 insertions, 4 deletions
diff --git a/spec/javascripts/monitoring/graph/legend_spec.js b/spec/javascripts/monitoring/graph/legend_spec.js
index 969b5bad730..2571b7ef869 100644
--- a/spec/javascripts/monitoring/graph/legend_spec.js
+++ b/spec/javascripts/monitoring/graph/legend_spec.js
@@ -93,7 +93,7 @@ describe('GraphLegend', () => {
const component = createComponent(defaultValuesComponent);
const titles = component.$el.querySelectorAll('.legend-metric-title');
- expect(titles[0].textContent.indexOf('hundred(s)')).not.toEqual(-1);
+ expect(titles[0].textContent.indexOf('1xx')).not.toEqual(-1);
expect(titles[1].textContent.indexOf('2xx')).not.toEqual(-1);
expect(getTextFromNode(component, '.y-label-text')).toEqual(component.yAxisLabel);
});
diff --git a/spec/javascripts/monitoring/graph_path_spec.js b/spec/javascripts/monitoring/graph_path_spec.js
index e7348b03ba1..a4844636d09 100644
--- a/spec/javascripts/monitoring/graph_path_spec.js
+++ b/spec/javascripts/monitoring/graph_path_spec.js
@@ -27,9 +27,9 @@ describe('Monitoring Paths', () => {
const metricArea = component.$el.querySelector('.metric-area');
const metricLine = component.$el.querySelector('.metric-line');
- expect(metricArea.getAttribute('fill')).toBe('#8dd5aa');
+ expect(metricArea.getAttribute('fill')).toBe('#8fbce8');
expect(metricArea.getAttribute('d')).toBe(firstTimeSeries.areaPath);
- expect(metricLine.getAttribute('stroke')).toBe('#1aaa55');
+ expect(metricLine.getAttribute('stroke')).toBe('#1f78d1');
expect(metricLine.getAttribute('d')).toBe(firstTimeSeries.linePath);
});
});
diff --git a/spec/javascripts/monitoring/mock_data.js b/spec/javascripts/monitoring/mock_data.js
index 4d0d565cf26..7ceab657464 100644
--- a/spec/javascripts/monitoring/mock_data.js
+++ b/spec/javascripts/monitoring/mock_data.js
@@ -6347,7 +6347,7 @@ export const singleRowMetricsMultipleSeries = [
]
},
],
- 'series': [
+ 'when': [
{
'value': 'hundred(s)',
'color': 'green',