Coderev, add tests

chartjs · Dec 10, 2018 · c514370 · c514370
1 parent 9cb217b
commit c514370
Show file tree

Hide file tree

Showing 3 changed files with 132 additions and 2 deletions.
diff --git a/docs/axes/README.md b/docs/axes/README.md
@@ -16,7 +16,7 @@ The following properties are common to all axes provided by Chart.js.
 
 | Name | Type | Default | Description
 | ---- | ---- | ------- | -----------
-| `display` | `Boolean (or "auto")` | `true` | If set to `false` the axis is hidden from view. Overrides *gridLines.display*, *scaleLabel.display*, and *ticks.display*.
+| `display` | `Boolean`/`String` | `true` | Controls the axis global visibility (visible when `true`, hidden when `false`). When `display: 'auto'`, the axis is visible only if at least one associated dataset is visible.
 | `callbacks` | `Object` | | Callback functions to hook into the axis lifecycle. [more...](#callbacks)
 | `weight` | `Number` | `0` | The weight used to sort the axis. Higher weights are further away from the chart area.
 

diff --git a/src/core/core.scale.js b/src/core/core.scale.js
@@ -396,7 +396,7 @@ module.exports = Element.extend({
 		var tickOpts = opts.ticks;
 		var scaleLabelOpts = opts.scaleLabel;
 		var gridLineOpts = opts.gridLines;
-		var display = this._isVisible();
+		var display = me._isVisible();
 		var position = opts.position;
 		var isHorizontal = me.isHorizontal();
 

diff --git a/test/specs/core.scale.tests.js b/test/specs/core.scale.tests.js
@@ -152,4 +152,134 @@ describe('Core.scale', function() {
 			})).toEqual(test.expected);
 		});
 	});
+
+	fdescribe('given the axes display option is set to auto', function() {
+		describe('for the x axes', function() {
+			it('should draw the axes if at least one associated dataset is visible', function() {
+				var chart = window.acquireChart({
+					type: 'line',
+					data: {
+						datasets: [{
+							data: [100, 200, 100, 50],
+							xAxisId: 'foo',
+							hidden: true,
+							labels: ['Q1', 'Q2', 'Q3', 'Q4']
+						}, {
+							data: [100, 200, 100, 50],
+							xAxisId: 'foo',
+							labels: ['Q1', 'Q2', 'Q3', 'Q4']
+						}]
+					},
+					options: {
+						scales: {
+							xAxes: [{
+								id: 'foo',
+								display: 'auto'
+							}],
+							yAxes: [{
+								type: 'category',
+								id: 'yScale0'
+							}]
+						}
+					}
+				});
+
+				var scale = chart.scales.foo;
+				scale.ctx = window.createMockContext();
+				chart.draw();
+
+				expect(scale.ctx.getCalls().length > 0).toBe(true);
+			});
+
+			it('should not draw the axes if no associated datasets are visible', function() {
+				var chart = window.acquireChart({
+					type: 'line',
+					data: {
+						datasets: [{
+							data: [100, 200, 100, 50],
+							xAxisId: 'foo',
+							hidden: true,
+							labels: ['Q1', 'Q2', 'Q3', 'Q4']
+						}]
+					},
+					options: {
+						scales: {
+							xAxes: [{
+								id: 'foo',
+								display: 'auto'
+							}]
+						}
+					}
+				});
+
+				var scale = chart.scales.foo;
+				scale.ctx = window.createMockContext();
+				chart.draw();
+
+				expect(scale.ctx.getCalls().length).toBe(0);
+			});
+		});
+
+		describe('for the y axes', function() {
+			it('should draw the axes if at least one associated dataset is visible', function() {
+				var chart = window.acquireChart({
+					type: 'line',
+					data: {
+						datasets: [{
+							data: [100, 200, 100, 50],
+							yAxisId: 'foo',
+							hidden: true,
+							labels: ['Q1', 'Q2', 'Q3', 'Q4']
+						}, {
+							data: [100, 200, 100, 50],
+							yAxisId: 'foo',
+							labels: ['Q1', 'Q2', 'Q3', 'Q4']
+						}]
+					},
+					options: {
+						scales: {
+							yAxes: [{
+								id: 'foo',
+								display: 'auto'
+							}]
+						}
+					}
+				});
+
+				var scale = chart.scales.foo;
+				scale.ctx = window.createMockContext();
+				chart.draw();
+
+				expect(scale.ctx.getCalls().length).toBe(0);
+			});
+
+			it('should not draw the axes if no associated datasets are visible', function() {
+				var chart = window.acquireChart({
+					type: 'line',
+					data: {
+						datasets: [{
+							data: [100, 200, 100, 50],
+							yAxisId: 'foo',
+							hidden: true,
+							labels: ['Q1', 'Q2', 'Q3', 'Q4']
+						}]
+					},
+					options: {
+						scales: {
+							yAxes: [{
+								id: 'foo',
+								display: 'auto'
+							}]
+						}
+					}
+				});
+
+				var scale = chart.scales.foo;
+				scale.ctx = window.createMockContext();
+				chart.draw();
+
+				expect(scale.ctx.getCalls().length > 0).toBe(true);
+			});
+		});
+	});
 });