From 7df8f5f5e4d9697903a2e14361c24b72d211867f Mon Sep 17 00:00:00 2001
From: andig <cpuidle@gmx.de>
Date: Fri, 25 Aug 2017 10:50:55 +0200
Subject: [PATCH] Implement scale label padding

---
 docs/axes/labelling.md                        |   1 +
 src/core/core.scale.js                        |  47 +++++++++----
 .../core.scale/label-offset-vertical-axes.png | Bin 4434 -> 4435 bytes
 test/specs/controller.bubble.tests.js         |   6 +-
 test/specs/controller.line.tests.js           |  64 +++++++++---------
 test/specs/core.helpers.tests.js              |  12 +---
 test/specs/core.scale.tests.js                |  19 ++++++
 test/specs/core.tooltip.tests.js              |   8 +--
 test/specs/scale.category.tests.js            |  18 ++---
 test/specs/scale.linear.tests.js              |  22 +++---
 test/specs/scale.logarithmic.tests.js         |  12 ++--
 test/specs/scale.radialLinear.tests.js        |   6 +-
 test/specs/scale.time.tests.js                |   6 +-
 13 files changed, 116 insertions(+), 105 deletions(-)

diff --git a/docs/axes/labelling.md b/docs/axes/labelling.md
index 22fc2600463..aec8d990ff4 100644
--- a/docs/axes/labelling.md
+++ b/docs/axes/labelling.md
@@ -15,6 +15,7 @@ The scale label configuration is nested under the scale configuration in the `sc
 | `fontFamily` | `String` | `"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif"` | Font family for the scale title, follows CSS font-family options.
 | `fontSize` | `Number` | `12` | Font size for scale title.
 | `fontStyle` | `String` | `'normal'` | Font style for the scale title, follows CSS font-style options (i.e. normal, italic, oblique, initial, inherit).
+| `padding` | `Number` or `Object` | `4` | Padding to apply around scale labels. Only `top` and `bottom` are implemented.
 
 ## Creating Custom Tick Formats
 
diff --git a/src/core/core.scale.js b/src/core/core.scale.js
index 6f63b92dbd7..c27983699c5 100644
--- a/src/core/core.scale.js
+++ b/src/core/core.scale.js
@@ -36,7 +36,14 @@ defaults._set('scale', {
 		// actual label
 		labelString: '',
 
-		lineHeight: 1.2
+		// line height
+		lineHeight: 1.2,
+
+		// top/bottom padding
+		padding: {
+			top: 4,
+			bottom: 4
+		}
 	},
 
 	// label settings
@@ -391,7 +398,6 @@ module.exports = function(Chart) {
 
 			var tickFont = parseFontOptions(tickOpts);
 			var tickMarkLength = opts.gridLines.tickMarkLength;
-			var scaleLabelLineHeight = parseLineHeight(scaleLabelOpts);
 
 			// Width
 			if (isHorizontal) {
@@ -410,10 +416,14 @@ module.exports = function(Chart) {
 
 			// Are we showing a title for the scale?
 			if (scaleLabelOpts.display && display) {
+				var scaleLabelLineHeight = parseLineHeight(scaleLabelOpts);
+				var scaleLabelPadding = helpers.options.toPadding(scaleLabelOpts.padding);
+				var deltaHeight = scaleLabelLineHeight + scaleLabelPadding.height;
+
 				if (isHorizontal) {
-					minSize.height += scaleLabelLineHeight;
+					minSize.height += deltaHeight;
 				} else {
-					minSize.width += scaleLabelLineHeight;
+					minSize.width += deltaHeight;
 				}
 			}
 
@@ -435,16 +445,17 @@ module.exports = function(Chart) {
 					// TODO - improve this calculation
 					var labelHeight = (sinRotation * largestTextWidth)
 						+ (tickFont.size * tallestLabelHeightInLines)
-						+ (lineSpace * tallestLabelHeightInLines);
+						+ (lineSpace * (tallestLabelHeightInLines - 1))
+						+ lineSpace; // padding
 
 					minSize.height = Math.min(me.maxHeight, minSize.height + labelHeight + tickPadding);
-					me.ctx.font = tickFont.font;
 
+					me.ctx.font = tickFont.font;
 					var firstLabelWidth = computeTextSize(me.ctx, labels[0], tickFont.font);
 					var lastLabelWidth = computeTextSize(me.ctx, labels[labels.length - 1], tickFont.font);
 
-					// Ensure that our ticks are always inside the canvas. When rotated, ticks are right aligned which means that the right padding is dominated
-					// by the font height
+					// Ensure that our ticks are always inside the canvas. When rotated, ticks are right aligned
+					// which means that the right padding is dominated by the font height
 					if (me.labelRotation !== 0) {
 						me.paddingLeft = opts.position === 'bottom' ? (cosRotation * firstLabelWidth) + 3 : (cosRotation * lineSpace) + 3; // add 3 px to move away from canvas edges
 						me.paddingRight = opts.position === 'bottom' ? (cosRotation * lineSpace) + 3 : (cosRotation * lastLabelWidth) + 3;
@@ -453,15 +464,18 @@ module.exports = function(Chart) {
 						me.paddingRight = lastLabelWidth / 2 + 3;
 					}
 				} else {
-					// A vertical axis is more constrained by the width. Labels are the dominant factor here, so get that length first
-					// Account for padding
-
+					// A vertical axis is more constrained by the width. Labels are the
+					// dominant factor here, so get that length first and account for padding
 					if (tickOpts.mirror) {
 						largestTextWidth = 0;
 					} else {
-						largestTextWidth += tickPadding;
+						// use lineSpace for consistency with horizontal axis
+						// tickPadding is not implemented for horizontal
+						largestTextWidth += tickPadding + lineSpace;
 					}
+
 					minSize.width = Math.min(me.maxWidth, minSize.width + largestTextWidth);
+
 					me.paddingTop = tickFont.size / 2;
 					me.paddingBottom = tickFont.size / 2;
 				}
@@ -663,6 +677,7 @@ module.exports = function(Chart) {
 
 			var scaleLabelFontColor = helpers.valueOrDefault(scaleLabel.fontColor, globalDefaults.defaultFontColor);
 			var scaleLabelFont = parseFontOptions(scaleLabel);
+			var scaleLabelPadding = helpers.options.toPadding(scaleLabel.padding);
 			var labelRotationRadians = helpers.toRadians(me.labelRotation);
 
 			var itemsToDraw = [];
@@ -840,10 +855,14 @@ module.exports = function(Chart) {
 
 				if (isHorizontal) {
 					scaleLabelX = me.left + ((me.right - me.left) / 2); // midpoint of the width
-					scaleLabelY = options.position === 'bottom' ? me.bottom - halfLineHeight : me.top + halfLineHeight;
+					scaleLabelY = options.position === 'bottom'
+						? me.bottom - halfLineHeight - scaleLabelPadding.bottom
+						: me.top + halfLineHeight + scaleLabelPadding.top;
 				} else {
 					var isLeft = options.position === 'left';
-					scaleLabelX = isLeft ? me.left + halfLineHeight : me.right - halfLineHeight;
+					scaleLabelX = isLeft
+						? me.left + halfLineHeight + scaleLabelPadding.top
+						: me.right - halfLineHeight - scaleLabelPadding.top;
 					scaleLabelY = me.top + ((me.bottom - me.top) / 2);
 					rotation = isLeft ? -0.5 * Math.PI : 0.5 * Math.PI;
 				}
diff --git a/test/fixtures/core.scale/label-offset-vertical-axes.png b/test/fixtures/core.scale/label-offset-vertical-axes.png
index 2f6b18c8c23939f2b79177a937ba2458298f826b..05785b8bc597181170ffe7bae4e472f35f8a0620 100644
GIT binary patch
literal 4435
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

literal 4434
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
OAOSuc?@BM;-hTspg1-I$

diff --git a/test/specs/controller.bubble.tests.js b/test/specs/controller.bubble.tests.js
index 3fa3eb883cd..d5e841f9849 100644
--- a/test/specs/controller.bubble.tests.js
+++ b/test/specs/controller.bubble.tests.js
@@ -134,9 +134,9 @@ describe('Bubble controller tests', function() {
 		var meta = chart.getDatasetMeta(0);
 
 		[
-			{r: 5, x: 28, y: 32},
-			{r: 1, x: 183, y: 484},
-			{r: 2, x: 338, y: 461},
+			{r: 5, x: 34, y: 32},
+			{r: 1, x: 187, y: 484},
+			{r: 2, x: 340, y: 461},
 			{r: 1, x: 492, y: 32}
 		].forEach(function(expected, i) {
 			expect(meta.data[i]._model.radius).toBe(expected.r);
diff --git a/test/specs/controller.line.tests.js b/test/specs/controller.line.tests.js
index e1231dc692c..da41bc53e43 100644
--- a/test/specs/controller.line.tests.js
+++ b/test/specs/controller.line.tests.js
@@ -203,8 +203,8 @@ describe('Line controller tests', function() {
 
 
 		[
-			{x: 33, y: 484},
-			{x: 186, y: 32}
+			{x: 39, y: 484},
+			{x: 190, y: 32}
 		].forEach(function(expected, i) {
 			expect(meta.data[i]._datasetIndex).toBe(0);
 			expect(meta.data[i]._index).toBe(i);
@@ -250,7 +250,7 @@ describe('Line controller tests', function() {
 		var meta = chart.getDatasetMeta(0);
 		// 1 point
 		var point = meta.data[0];
-		expect(point._model.x).toBeCloseToPixel(27);
+		expect(point._model.x).toBeCloseToPixel(32);
 
 		// 2 points
 		chart.data.labels = ['One', 'Two'];
@@ -259,7 +259,7 @@ describe('Line controller tests', function() {
 
 		var points = meta.data;
 
-		expect(points[0]._model.x).toBeCloseToPixel(27);
+		expect(points[0]._model.x).toBeCloseToPixel(32);
 		expect(points[1]._model.x).toBeCloseToPixel(498);
 
 		// 3 points
@@ -269,8 +269,8 @@ describe('Line controller tests', function() {
 
 		points = meta.data;
 
-		expect(points[0]._model.x).toBeCloseToPixel(27);
-		expect(points[1]._model.x).toBeCloseToPixel(260);
+		expect(points[0]._model.x).toBeCloseToPixel(32);
+		expect(points[1]._model.x).toBeCloseToPixel(263);
 		expect(points[2]._model.x).toBeCloseToPixel(493);
 
 		// 4 points
@@ -280,8 +280,8 @@ describe('Line controller tests', function() {
 
 		points = meta.data;
 
-		expect(points[0]._model.x).toBeCloseToPixel(27);
-		expect(points[1]._model.x).toBeCloseToPixel(184);
+		expect(points[0]._model.x).toBeCloseToPixel(32);
+		expect(points[1]._model.x).toBeCloseToPixel(187);
 		expect(points[2]._model.x).toBeCloseToPixel(340);
 		expect(points[3]._model.x).toBeCloseToPixel(497);
 	});
@@ -311,9 +311,9 @@ describe('Line controller tests', function() {
 		var meta0 = chart.getDatasetMeta(0);
 
 		[
-			{x: 28, y: 161},
-			{x: 183, y: 419},
-			{x: 338, y: 161},
+			{x: 34, y: 161},
+			{x: 187, y: 419},
+			{x: 340, y: 161},
 			{x: 492, y: 419}
 		].forEach(function(values, i) {
 			expect(meta0.data[i]._model.x).toBeCloseToPixel(values.x);
@@ -323,9 +323,9 @@ describe('Line controller tests', function() {
 		var meta1 = chart.getDatasetMeta(1);
 
 		[
-			{x: 28, y: 32},
-			{x: 183, y: 97},
-			{x: 338, y: 161},
+			{x: 34, y: 32},
+			{x: 187, y: 97},
+			{x: 340, y: 161},
 			{x: 492, y: 471}
 		].forEach(function(values, i) {
 			expect(meta1.data[i]._model.x).toBeCloseToPixel(values.x);
@@ -366,9 +366,9 @@ describe('Line controller tests', function() {
 		var meta0 = chart.getDatasetMeta(0);
 
 		[
-			{x: 56, y: 161},
-			{x: 202, y: 419},
-			{x: 347, y: 161},
+			{x: 68, y: 161},
+			{x: 210, y: 419},
+			{x: 351, y: 161},
 			{x: 492, y: 419}
 		].forEach(function(values, i) {
 			expect(meta0.data[i]._model.x).toBeCloseToPixel(values.x);
@@ -378,9 +378,9 @@ describe('Line controller tests', function() {
 		var meta1 = chart.getDatasetMeta(1);
 
 		[
-			{x: 56, y: 32},
-			{x: 202, y: 97},
-			{x: 347, y: 161},
+			{x: 68, y: 32},
+			{x: 210, y: 97},
+			{x: 351, y: 161},
 			{x: 492, y: 471}
 		].forEach(function(values, i) {
 			expect(meta1.data[i]._model.x).toBeCloseToPixel(values.x);
@@ -438,9 +438,9 @@ describe('Line controller tests', function() {
 		var meta0 = chart.getDatasetMeta(0);
 
 		[
-			{x: 28, y: 161},
-			{x: 183, y: 419},
-			{x: 338, y: 161},
+			{x: 34, y: 161},
+			{x: 187, y: 419},
+			{x: 340, y: 161},
 			{x: 492, y: 419}
 		].forEach(function(values, i) {
 			expect(meta0.data[i]._model.x).toBeCloseToPixel(values.x);
@@ -450,9 +450,9 @@ describe('Line controller tests', function() {
 		var meta1 = chart.getDatasetMeta(1);
 
 		[
-			{x: 28, y: 32},
-			{x: 183, y: 97},
-			{x: 338, y: 161},
+			{x: 34, y: 32},
+			{x: 187, y: 97},
+			{x: 340, y: 161},
 			{x: 492, y: 471}
 		].forEach(function(values, i) {
 			expect(meta1.data[i]._model.x).toBeCloseToPixel(values.x);
@@ -486,9 +486,9 @@ describe('Line controller tests', function() {
 		var meta0 = chart.getDatasetMeta(0);
 
 		[
-			{x: 28, y: 161},
-			{x: 183, y: 419},
-			{x: 338, y: 161},
+			{x: 34, y: 161},
+			{x: 187, y: 419},
+			{x: 340, y: 161},
 			{x: 492, y: 419}
 		].forEach(function(values, i) {
 			expect(meta0.data[i]._model.x).toBeCloseToPixel(values.x);
@@ -498,9 +498,9 @@ describe('Line controller tests', function() {
 		var meta1 = chart.getDatasetMeta(1);
 
 		[
-			{x: 28, y: 32},
-			{x: 183, y: 97},
-			{x: 338, y: 161},
+			{x: 34, y: 32},
+			{x: 187, y: 97},
+			{x: 340, y: 161},
 			{x: 492, y: 471}
 		].forEach(function(values, i) {
 			expect(meta1.data[i]._model.x).toBeCloseToPixel(values.x);
diff --git a/test/specs/core.helpers.tests.js b/test/specs/core.helpers.tests.js
index 1b5edb89edf..dc865fb01b2 100644
--- a/test/specs/core.helpers.tests.js
+++ b/test/specs/core.helpers.tests.js
@@ -128,11 +128,7 @@ describe('Core helper tests', function() {
 					},
 					position: 'right',
 					offset: false,
-					scaleLabel: {
-						display: false,
-						labelString: '',
-						lineHeight: 1.2
-					},
+					scaleLabel: Chart.defaults.scale.scaleLabel,
 					ticks: {
 						beginAtZero: false,
 						minRotation: 0,
@@ -170,11 +166,7 @@ describe('Core helper tests', function() {
 					},
 					position: 'left',
 					offset: false,
-					scaleLabel: {
-						display: false,
-						labelString: '',
-						lineHeight: 1.2
-					},
+					scaleLabel: Chart.defaults.scale.scaleLabel,
 					ticks: {
 						beginAtZero: false,
 						minRotation: 0,
diff --git a/test/specs/core.scale.tests.js b/test/specs/core.scale.tests.js
index 58e5a33faeb..dc2da042aca 100644
--- a/test/specs/core.scale.tests.js
+++ b/test/specs/core.scale.tests.js
@@ -1,3 +1,22 @@
 describe('Core.scale', function() {
 	describe('auto', jasmine.specsFromFixtures('core.scale'));
+
+	it('should provide default scale label options', function() {
+		expect(Chart.defaults.scale.scaleLabel).toEqual({
+			// display property
+			display: false,
+
+			// actual label
+			labelString: '',
+
+			// actual label
+			lineHeight: 1.2,
+
+			// top/bottom padding
+			padding: {
+				top: 4,
+				bottom: 4
+			}
+		});
+	});
 });
diff --git a/test/specs/core.tooltip.tests.js b/test/specs/core.tooltip.tests.js
index b1896da3338..73d943bd853 100755
--- a/test/specs/core.tooltip.tests.js
+++ b/test/specs/core.tooltip.tests.js
@@ -143,7 +143,7 @@ describe('Core.Tooltip', function() {
 				}]
 			}));
 
-			expect(tooltip._view.x).toBeCloseToPixel(263);
+			expect(tooltip._view.x).toBeCloseToPixel(266);
 			expect(tooltip._view.y).toBeCloseToPixel(155);
 		});
 
@@ -341,7 +341,7 @@ describe('Core.Tooltip', function() {
 			}]
 		}));
 
-		expect(tooltip._view.x).toBeCloseToPixel(263);
+		expect(tooltip._view.x).toBeCloseToPixel(266);
 		expect(tooltip._view.y).toBeCloseToPixel(312);
 	});
 
@@ -494,7 +494,7 @@ describe('Core.Tooltip', function() {
 			}]
 		}));
 
-		expect(tooltip._view.x).toBeCloseToPixel(211);
+		expect(tooltip._view.x).toBeCloseToPixel(214);
 		expect(tooltip._view.y).toBeCloseToPixel(190);
 	});
 
@@ -574,7 +574,7 @@ describe('Core.Tooltip', function() {
 			}]
 		}));
 
-		expect(tooltip._view.x).toBeCloseToPixel(263);
+		expect(tooltip._view.x).toBeCloseToPixel(266);
 		expect(tooltip._view.y).toBeCloseToPixel(155);
 	});
 
diff --git a/test/specs/scale.category.tests.js b/test/specs/scale.category.tests.js
index 8d8d32cd424..1665235ae8d 100644
--- a/test/specs/scale.category.tests.js
+++ b/test/specs/scale.category.tests.js
@@ -30,11 +30,7 @@ describe('Category scale tests', function() {
 			},
 			position: 'bottom',
 			offset: false,
-			scaleLabel: {
-				display: false,
-				labelString: '',
-				lineHeight: 1.2
-			},
+			scaleLabel: Chart.defaults.scale.scaleLabel,
 			ticks: {
 				beginAtZero: false,
 				minRotation: 0,
@@ -215,7 +211,7 @@ describe('Category scale tests', function() {
 		});
 
 		var xScale = chart.scales.xScale0;
-		expect(xScale.getPixelForValue(0, 0, 0)).toBeCloseToPixel(23);
+		expect(xScale.getPixelForValue(0, 0, 0)).toBeCloseToPixel(23 + 6); // plus lineHeight
 		expect(xScale.getValueForPixel(23)).toBe(0);
 
 		expect(xScale.getPixelForValue(0, 4, 0)).toBeCloseToPixel(487);
@@ -224,7 +220,7 @@ describe('Category scale tests', function() {
 		xScale.options.offset = true;
 		chart.update();
 
-		expect(xScale.getPixelForValue(0, 0, 0)).toBeCloseToPixel(69);
+		expect(xScale.getPixelForValue(0, 0, 0)).toBeCloseToPixel(69 + 6); // plus lineHeight
 		expect(xScale.getValueForPixel(69)).toBe(0);
 
 		expect(xScale.getPixelForValue(0, 4, 0)).toBeCloseToPixel(441);
@@ -258,8 +254,8 @@ describe('Category scale tests', function() {
 		});
 
 		var xScale = chart.scales.xScale0;
-		expect(xScale.getPixelForValue('tick_1', 0, 0)).toBeCloseToPixel(23);
-		expect(xScale.getPixelForValue('tick_1', 1, 0)).toBeCloseToPixel(139);
+		expect(xScale.getPixelForValue('tick_1', 0, 0)).toBeCloseToPixel(23 + 6); // plus lineHeight
+		expect(xScale.getPixelForValue('tick_1', 1, 0)).toBeCloseToPixel(143);
 	});
 
 	it ('Should get the correct pixel for a value when horizontal and zoomed', function() {
@@ -293,13 +289,13 @@ describe('Category scale tests', function() {
 		});
 
 		var xScale = chart.scales.xScale0;
-		expect(xScale.getPixelForValue(0, 1, 0)).toBeCloseToPixel(23);
+		expect(xScale.getPixelForValue(0, 1, 0)).toBeCloseToPixel(23 + 6); // plus lineHeight
 		expect(xScale.getPixelForValue(0, 3, 0)).toBeCloseToPixel(496);
 
 		xScale.options.offset = true;
 		chart.update();
 
-		expect(xScale.getPixelForValue(0, 1, 0)).toBeCloseToPixel(102);
+		expect(xScale.getPixelForValue(0, 1, 0)).toBeCloseToPixel(102 + 6); // plus lineHeight
 		expect(xScale.getPixelForValue(0, 3, 0)).toBeCloseToPixel(417);
 	});
 
diff --git a/test/specs/scale.linear.tests.js b/test/specs/scale.linear.tests.js
index ed6f9c1f96e..60dd07698c0 100644
--- a/test/specs/scale.linear.tests.js
+++ b/test/specs/scale.linear.tests.js
@@ -28,11 +28,7 @@ describe('Linear Scale', function() {
 			},
 			position: 'left',
 			offset: false,
-			scaleLabel: {
-				display: false,
-				labelString: '',
-				lineHeight: 1.2
-			},
+			scaleLabel: Chart.defaults.scale.scaleLabel,
 			ticks: {
 				beginAtZero: false,
 				minRotation: 0,
@@ -695,8 +691,8 @@ describe('Linear Scale', function() {
 
 		var xScale = chart.scales.xScale0;
 		expect(xScale.getPixelForValue(1, 0, 0)).toBeCloseToPixel(501); // right - paddingRight
-		expect(xScale.getPixelForValue(-1, 0, 0)).toBeCloseToPixel(31); // left + paddingLeft
-		expect(xScale.getPixelForValue(0, 0, 0)).toBeCloseToPixel(266); // halfway*/
+		expect(xScale.getPixelForValue(-1, 0, 0)).toBeCloseToPixel(31 + 6); // left + paddingLeft + lineSpace
+		expect(xScale.getPixelForValue(0, 0, 0)).toBeCloseToPixel(266 + 6 / 2); // halfway*/
 
 		expect(xScale.getValueForPixel(501)).toBeCloseTo(1, 1e-2);
 		expect(xScale.getValueForPixel(31)).toBeCloseTo(-1, 1e-2);
@@ -754,7 +750,7 @@ describe('Linear Scale', function() {
 		expect(xScale.paddingBottom).toBeCloseToPixel(0);
 		expect(xScale.paddingLeft).toBeCloseToPixel(0);
 		expect(xScale.paddingRight).toBeCloseToPixel(0);
-		expect(xScale.width).toBeCloseToPixel(468);
+		expect(xScale.width).toBeCloseToPixel(468 - 6); // minus lineSpace
 		expect(xScale.height).toBeCloseToPixel(28);
 
 		var yScale = chart.scales.yScale0;
@@ -762,7 +758,7 @@ describe('Linear Scale', function() {
 		expect(yScale.paddingBottom).toBeCloseToPixel(0);
 		expect(yScale.paddingLeft).toBeCloseToPixel(0);
 		expect(yScale.paddingRight).toBeCloseToPixel(0);
-		expect(yScale.width).toBeCloseToPixel(30);
+		expect(yScale.width).toBeCloseToPixel(30 + 6); // plus lineSpace
 		expect(yScale.height).toBeCloseToPixel(452);
 
 		// Extra size when scale label showing
@@ -774,15 +770,15 @@ describe('Linear Scale', function() {
 		expect(xScale.paddingBottom).toBeCloseToPixel(0);
 		expect(xScale.paddingLeft).toBeCloseToPixel(0);
 		expect(xScale.paddingRight).toBeCloseToPixel(0);
-		expect(xScale.width).toBeCloseToPixel(454);
-		expect(xScale.height).toBeCloseToPixel(42);
+		expect(xScale.width).toBeCloseToPixel(440);
+		expect(xScale.height).toBeCloseToPixel(50);
 
 		expect(yScale.paddingTop).toBeCloseToPixel(0);
 		expect(yScale.paddingBottom).toBeCloseToPixel(0);
 		expect(yScale.paddingLeft).toBeCloseToPixel(0);
 		expect(yScale.paddingRight).toBeCloseToPixel(0);
-		expect(yScale.width).toBeCloseToPixel(44);
-		expect(yScale.height).toBeCloseToPixel(438);
+		expect(yScale.width).toBeCloseToPixel(58);
+		expect(yScale.height).toBeCloseToPixel(430);
 	});
 
 	it('should fit correctly when display is turned off', function() {
diff --git a/test/specs/scale.logarithmic.tests.js b/test/specs/scale.logarithmic.tests.js
index 98d0fbf09c4..9640b1d3d62 100644
--- a/test/specs/scale.logarithmic.tests.js
+++ b/test/specs/scale.logarithmic.tests.js
@@ -27,11 +27,7 @@ describe('Logarithmic Scale tests', function() {
 			},
 			position: 'left',
 			offset: false,
-			scaleLabel: {
-				display: false,
-				labelString: '',
-				lineHeight: 1.2
-			},
+			scaleLabel: Chart.defaults.scale.scaleLabel,
 			ticks: {
 				beginAtZero: false,
 				minRotation: 0,
@@ -720,9 +716,9 @@ describe('Logarithmic Scale tests', function() {
 
 		var xScale = chart.scales.xScale;
 		expect(xScale.getPixelForValue(80, 0, 0)).toBeCloseToPixel(495); // right - paddingRight
-		expect(xScale.getPixelForValue(1, 0, 0)).toBeCloseToPixel(37);   // left + paddingLeft
-		expect(xScale.getPixelForValue(10, 0, 0)).toBeCloseToPixel(278); // halfway
-		expect(xScale.getPixelForValue(0, 0, 0)).toBeCloseToPixel(37);   // 0 is invalid, put it on the left.
+		expect(xScale.getPixelForValue(1, 0, 0)).toBeCloseToPixel(37 + 6); // left + paddingLeft + lineSpace
+		expect(xScale.getPixelForValue(10, 0, 0)).toBeCloseToPixel(278 + 6 / 2); // halfway
+		expect(xScale.getPixelForValue(0, 0, 0)).toBeCloseToPixel(37 + 6); // 0 is invalid, put it on the left.
 
 		expect(xScale.getValueForPixel(495)).toBeCloseToPixel(80);
 		expect(xScale.getValueForPixel(48)).toBeCloseTo(1, 1e-4);
diff --git a/test/specs/scale.radialLinear.tests.js b/test/specs/scale.radialLinear.tests.js
index 70c75f02ad7..707ce0b7c52 100644
--- a/test/specs/scale.radialLinear.tests.js
+++ b/test/specs/scale.radialLinear.tests.js
@@ -40,11 +40,7 @@ describe('Test the radial linear scale', function() {
 			},
 			position: 'chartArea',
 			offset: false,
-			scaleLabel: {
-				display: false,
-				labelString: '',
-				lineHeight: 1.2
-			},
+			scaleLabel: Chart.defaults.scale.scaleLabel,
 			ticks: {
 				backdropColor: 'rgba(255,255,255,0.75)',
 				backdropPaddingY: 2,
diff --git a/test/specs/scale.time.tests.js b/test/specs/scale.time.tests.js
index 3c757243d56..b6554e60d9a 100755
--- a/test/specs/scale.time.tests.js
+++ b/test/specs/scale.time.tests.js
@@ -73,11 +73,7 @@ describe('Time scale tests', function() {
 			},
 			position: 'bottom',
 			offset: false,
-			scaleLabel: {
-				display: false,
-				labelString: '',
-				lineHeight: 1.2
-			},
+			scaleLabel: Chart.defaults.scale.scaleLabel,
 			bounds: 'data',
 			distribution: 'linear',
 			ticks: {