summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-11-15 20:20:55 +0000
committerMike Greiling <mike@pixelcog.com>2017-11-15 20:20:55 +0000
commit2f74b1d32392427ce9cc3c0aff205c8991ba2dfc (patch)
treee4e3b6d719b05929c1eb85d7b01d8a78b5b9ebef
parent0e756a768713f77ce1d0c90c009cdb7acebc66bb (diff)
parentb49fab4c2b7c5e28a92e449dc73b599a8ea17ac6 (diff)
downloadgitlab-ce-2f74b1d32392427ce9cc3c0aff205c8991ba2dfc.tar.gz
Merge branch '39861-follow-up-from-enable-multiple-queries-per-prometheus-graph' into 'master'
Resolve "Follow-up from "Enable multiple queries per Prometheus graph"" Closes #39861 See merge request gitlab-org/gitlab-ce!15363
-rw-r--r--spec/javascripts/monitoring/graph_path_spec.js17
1 files changed, 17 insertions, 0 deletions
diff --git a/spec/javascripts/monitoring/graph_path_spec.js b/spec/javascripts/monitoring/graph_path_spec.js
index 8ece913ada8..c83bd19345f 100644
--- a/spec/javascripts/monitoring/graph_path_spec.js
+++ b/spec/javascripts/monitoring/graph_path_spec.js
@@ -32,4 +32,21 @@ describe('Monitoring Paths', () => {
expect(metricLine.getAttribute('stroke')).toBe('#1f78d1');
expect(metricLine.getAttribute('d')).toBe(firstTimeSeries.linePath);
});
+
+ describe('Computed properties', () => {
+ it('strokeDashArray', () => {
+ const component = createComponent({
+ generatedLinePath: firstTimeSeries.linePath,
+ generatedAreaPath: firstTimeSeries.areaPath,
+ lineColor: firstTimeSeries.lineColor,
+ areaColor: firstTimeSeries.areaColor,
+ });
+
+ component.lineStyle = 'dashed';
+ expect(component.strokeDashArray).toBe('3, 1');
+
+ component.lineStyle = 'dotted';
+ expect(component.strokeDashArray).toBe('1, 1');
+ });
+ });
});