From: Evert Timberg <evert.timberg@gmail.com>
Date: Sun, 27 Sep 2015 23:40:38 +0000 (-0400)
Subject: Fix broken helper test
X-Git-Tag: 2.0.0-alpha4~12^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db3b5c1735216fecc6721fc271c6d2dd922adbd7;p=thirdparty%2FChart.js.git

Fix broken helper test
---

diff --git a/test/core.helpers.tests.js b/test/core.helpers.tests.js
index d832f0e25..4ceb1b2d0 100644
--- a/test/core.helpers.tests.js
+++ b/test/core.helpers.tests.js
@@ -210,18 +210,19 @@ describe('Core helper tests', function() {
 					type: 'linear',
 					axisProp: 456
 				}, {
-					type: 'linear',
 					display: true,
-					position: "right",
+
 					gridLines: {
-						show: true,
 						color: "rgba(0, 0, 0, 0.1)",
-						lineWidth: 1,
 						drawOnChartArea: true,
-						drawTicks: true,
-						zeroLineWidth: 1,
+						drawTicks: true, // draw ticks extending towards the label
+						lineWidth: 1,
+						offsetGridLines: false,
+						show: true,
 						zeroLineColor: "rgba(0,0,0,0.25)",
+						zeroLineWidth: 1,
 					},
+					position: "right",
 					scaleLabel: {
 						fontColor: '#666',
 						fontFamily: 'Helvetica Neue',
@@ -230,32 +231,35 @@ describe('Core helper tests', function() {
 						labelString: '',
 						show: false,
 					},
-					reverse: false,
-					beginAtZero: false,
-					override: null,
-					labels: {
-						show: true,
-						mirror: false,
-						padding: 10,
-						template: "<%=value.toLocaleString()%>",
+					ticks: {
+						beginAtZero: false,
+						fontColor: "#666",
+						fontFamily: "Helvetica Neue",
 						fontSize: 12,
 						fontStyle: "normal",
-						fontColor: "#666",
-						fontFamily: "Helvetica Neue"
-					}
+						maxRotation: 90,
+						minRotation: 20,
+						mirror: false,
+						padding: 10,
+						reverse: false,
+						show: true,
+						template: "<%=value%>"
+					},
+					type: 'linear'
 				}, {
-					type: 'linear',
 					display: true,
-					position: "left",
+
 					gridLines: {
-						show: true,
 						color: "rgba(0, 0, 0, 0.1)",
-						lineWidth: 1,
 						drawOnChartArea: true,
-						drawTicks: true,
-						zeroLineWidth: 1,
+						drawTicks: true, // draw ticks extending towards the label
+						lineWidth: 1,
+						offsetGridLines: false,
+						show: true,
 						zeroLineColor: "rgba(0,0,0,0.25)",
+						zeroLineWidth: 1,
 					},
+					position: "left",
 					scaleLabel: {
 						fontColor: '#666',
 						fontFamily: 'Helvetica Neue',
@@ -264,19 +268,21 @@ describe('Core helper tests', function() {
 						labelString: '',
 						show: false,
 					},
-					reverse: false,
-					beginAtZero: false,
-					override: null,
-					labels: {
-						show: true,
-						mirror: false,
-						padding: 10,
-						template: "<%=value.toLocaleString()%>",
+					ticks: {
+						beginAtZero: false,
+						fontColor: "#666",
+						fontFamily: "Helvetica Neue",
 						fontSize: 12,
 						fontStyle: "normal",
-						fontColor: "#666",
-						fontFamily: "Helvetica Neue"
-					}
+						maxRotation: 90,
+						minRotation: 20,
+						mirror: false,
+						padding: 10,
+						reverse: false,
+						show: true,
+						template: "<%=value%>"
+					},
+					type: 'linear'
 				}]
 			}
 		});