From: Tore Lervik <tore@lervik.com>
Date: Mon, 21 Dec 2015 22:47:38 +0000 (+0100)
Subject: Fixed broken tests
X-Git-Tag: 2.0.0-beta2~9^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1816%2Fhead;p=thirdparty%2FChart.js.git

Fixed broken tests
---

diff --git a/test/core.helpers.tests.js b/test/core.helpers.tests.js
index 5547de774..0e18c7a5c 100644
--- a/test/core.helpers.tests.js
+++ b/test/core.helpers.tests.js
@@ -244,7 +244,8 @@ describe('Core helper tests', function() {
 						reverse: false,
 						display: true,
 						callback: merged.scales.yAxes[1].ticks.callback, // make it nicer, then check explicitly below
-						autoSkip: true
+						autoSkip: true,
+						autoSkipPadding: 20
 					},
 					type: 'linear'
 				}, {
@@ -281,7 +282,8 @@ describe('Core helper tests', function() {
 						reverse: false,
 						display: true,
 						callback: merged.scales.yAxes[2].ticks.callback, // make it nicer, then check explicitly below
-						autoSkip: true
+						autoSkip: true,
+						autoSkipPadding: 20
 					},
 					type: 'linear'
 				}]
diff --git a/test/scale.category.tests.js b/test/scale.category.tests.js
index 002b27fbc..e844e9aee 100644
--- a/test/scale.category.tests.js
+++ b/test/scale.category.tests.js
@@ -43,7 +43,8 @@ describe('Category scale tests', function() {
 				reverse: false,
 				display: true,
 				callback: defaultConfig.ticks.callback,  // make this nicer, then check explicitly below
-				autoSkip: true
+				autoSkip: true,
+				autoSkipPadding: 20
 			}
 		});
 
diff --git a/test/scale.linear.tests.js b/test/scale.linear.tests.js
index 64c4e3a44..5ca84951a 100644
--- a/test/scale.linear.tests.js
+++ b/test/scale.linear.tests.js
@@ -42,7 +42,8 @@ describe('Linear Scale', function() {
 				reverse: false,
 				display: true,
 				callback: defaultConfig.ticks.callback, // make this work nicer, then check below
-				autoSkip: true
+				autoSkip: true,
+				autoSkipPadding: 20
 			}
 		});
 
diff --git a/test/scale.logarithmic.tests.js b/test/scale.logarithmic.tests.js
index 29b077130..fac226a53 100644
--- a/test/scale.logarithmic.tests.js
+++ b/test/scale.logarithmic.tests.js
@@ -41,7 +41,8 @@ describe('Logarithmic Scale tests', function() {
 				reverse: false,
 				display: true,
 				callback: defaultConfig.ticks.callback, // make this nicer, then check explicitly below
-				autoSkip: true
+				autoSkip: true,
+				autoSkipPadding: 20
 			},
 		});
 
diff --git a/test/scale.radialLinear.tests.js b/test/scale.radialLinear.tests.js
index e165daa84..f0c48aa27 100644
--- a/test/scale.radialLinear.tests.js
+++ b/test/scale.radialLinear.tests.js
@@ -58,7 +58,8 @@ describe('Test the radial linear scale', function() {
 				showLabelBackdrop: true,
 				display: true,
 				callback: defaultConfig.ticks.callback, // make this nicer, then check explicitly below
-				autoSkip: true
+				autoSkip: true,
+				autoSkipPadding: 20
 			},
 		});
 
diff --git a/test/scale.time.tests.js b/test/scale.time.tests.js
index 912402e07..ed3810dc8 100644
--- a/test/scale.time.tests.js
+++ b/test/scale.time.tests.js
@@ -46,7 +46,8 @@ describe('Time scale tests', function() {
 				reverse: false,
 				display: true,
 				callback: defaultConfig.ticks.callback, // make this nicer, then check explicitly below,
-				autoSkip: true
+				autoSkip: true,
+				autoSkipPadding: 20
 			},
 			time: {
 				format: false,