diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2017-10-06 10:20:34 +0300 |
---|---|---|
committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-10-06 10:20:34 +0300 |
commit | 6c5837ae4933b17f657c80c96431e528ff62d971 (patch) | |
tree | f838d1a30a37237f33e849ad5e724ccdeea52137 /spec/javascripts | |
parent | 9560d5b8399df42109e5768f19a99d0d5a664bd9 (diff) | |
parent | 790bc25dcd727471698838c5f8504fa9dc44fc37 (diff) |
Merge branch '37105-monitoring-graph-axes-labels-are-inaccurate-and-inconsistent' into 'master'
Resolve "Monitoring graph axes labels are inaccurate and inconsistent"
Closes #37105
See merge request gitlab-org/gitlab-ce!14258
Diffstat (limited to 'spec/javascripts')
-rw-r--r-- | spec/javascripts/monitoring/graph_path_spec.js | 2 | ||||
-rw-r--r-- | spec/javascripts/monitoring/graph_spec.js | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/javascripts/monitoring/graph_path_spec.js b/spec/javascripts/monitoring/graph_path_spec.js index a4844636d09..81825a3ae87 100644 --- a/spec/javascripts/monitoring/graph_path_spec.js +++ b/spec/javascripts/monitoring/graph_path_spec.js @@ -1,5 +1,5 @@ import Vue from 'vue'; -import GraphPath from '~/monitoring/components/graph_path.vue'; +import GraphPath from '~/monitoring/components/graph/path.vue'; import createTimeSeries from '~/monitoring/utils/multiple_time_series'; import { singleRowMetricsMultipleSeries, convertDatesMultipleSeries } from './mock_data'; diff --git a/spec/javascripts/monitoring/graph_spec.js b/spec/javascripts/monitoring/graph_spec.js index 7213b3bfa30..fd79abe241a 100644 --- a/spec/javascripts/monitoring/graph_spec.js +++ b/spec/javascripts/monitoring/graph_spec.js @@ -44,7 +44,7 @@ describe('Graph', () => { .not.toEqual(-1); }); - it('outterViewBox gets a width and height property based on the DOM size of the element', () => { + it('outerViewBox gets a width and height property based on the DOM size of the element', () => { const component = createComponent({ graphData: convertedMetrics[1], classType: 'col-md-6', @@ -52,8 +52,8 @@ describe('Graph', () => { deploymentData, }); - const viewBoxArray = component.outterViewBox.split(' '); - expect(typeof component.outterViewBox).toEqual('string'); + const viewBoxArray = component.outerViewBox.split(' '); + expect(typeof component.outerViewBox).toEqual('string'); expect(viewBoxArray[2]).toEqual(component.graphWidth.toString()); expect(viewBoxArray[3]).toEqual(component.graphHeight.toString()); }); |