diff options
author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-07-03 18:43:56 +0300 |
---|---|---|
committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-07-03 18:43:56 +0300 |
commit | 2a829d0f530c1721271400c46cfc7f0387dc789a (patch) | |
tree | 07521f0802119dae6a9d4da81d7c629d2aa4a332 /spec | |
parent | c8eef2d2a62f6ac7304c8ab4d50282613e21ec8a (diff) |
Fixed the y_label not setting correctly for each graph on the monitoring dashboard
Diffstat (limited to 'spec')
-rw-r--r-- | spec/javascripts/monitoring/mock_data.js | 4 | ||||
-rw-r--r-- | spec/javascripts/monitoring/monitoring_column_spec.js | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/spec/javascripts/monitoring/mock_data.js b/spec/javascripts/monitoring/mock_data.js index 6f4cb989847..56d938e1fbe 100644 --- a/spec/javascripts/monitoring/mock_data.js +++ b/spec/javascripts/monitoring/mock_data.js @@ -13,7 +13,7 @@ const metricsGroupsAPIResponse = { 'queries': [ { 'query_range': 'avg(container_memory_usage_bytes{%{environment_filter}}) / 2^20', - 'label': 'Container memory', + 'y_label': 'Memory', 'unit': 'MiB', 'result': [ { @@ -2477,7 +2477,7 @@ export const singleRowMetrics = [ { 'title': 'CPU usage', 'weight': 1, - 'y_label': 'Values', + 'y_label': 'Memory', 'queries': [ { 'query_range': 'avg(rate(container_cpu_usage_seconds_total{%{environment_filter}}[2m])) * 100', diff --git a/spec/javascripts/monitoring/monitoring_column_spec.js b/spec/javascripts/monitoring/monitoring_column_spec.js index c8787f9708c..b3bc97adc9f 100644 --- a/spec/javascripts/monitoring/monitoring_column_spec.js +++ b/spec/javascripts/monitoring/monitoring_column_spec.js @@ -94,4 +94,15 @@ describe('MonitoringColumn', () => { done(); }); }); + + it('has a title for the y-axis that comes from the backend', () => { + const component = createComponent({ + columnData: singleRowMetrics[0], + classType: 'col-md-6', + updateAspectRatio: false, + deploymentData, + }); + + expect(component.yAxisLabel).toEqual(component.columnData.y_label); + }); }); |