From: Simon Brunel <simonbrunel@users.noreply.github.com>
Date: Tue, 6 Sep 2016 09:34:33 +0000 (+0200)
Subject: Fix time scale tests using the wrong chart instance
X-Git-Tag: v2.3.0-rc.1~1^2~4^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8254331eef9fe1dc9dc9c135dc08af8caccc0000;p=thirdparty%2FChart.js.git

Fix time scale tests using the wrong chart instance

Some tests were using the removed global `chartInstance` variable, so tests values were incorrect since against the wrong chart instance.
---

diff --git a/test/scale.time.tests.js b/test/scale.time.tests.js
index c76dde88a..c37910934 100755
--- a/test/scale.time.tests.js
+++ b/test/scale.time.tests.js
@@ -453,36 +453,24 @@ describe('Time scale tests', function() {
 		var xScale = chart.scales.xScale0;
 		expect(xScale.getLabelForIndex(0, 0)).toBe('2015-01-01T20:00:00');
 		expect(xScale.getLabelForIndex(6, 0)).toBe('2015-01-10T12:00');
-
 	});
+
 	it('should get the correct pixel for only one data in the dataset', function() {
 		var chart = window.acquireChart({
 			type: 'line',
 			data: {
 				labels: ["2016-05-27"],
 				datasets: [{
-					type: "line",
+					xAxisID: 'xScale0',
 					data: [5]
 				}]
 			},
 			options: {
 				scales: {
 					xAxes: [{
+						id: 'xScale0',
 						display: true,
-						type: "time",
-						time: {
-							displayFormats: {
-								"day": "YYYY-MM-DD"
-							}
-						}
-					}],
-					yAxes: [{
-						type: "linear",
-						ticks: {
-							reverse: true,
-							min: 0,
-							max: 10
-						}
+						type: "time"
 					}]
 				}
 			}
@@ -490,9 +478,9 @@ describe('Time scale tests', function() {
 
 		var xScale = chart.scales.xScale0;
 
-		expect(xScale.getPixelForValue('', 0, 0)).toBeCloseToPixel(78);
+		expect(xScale.getPixelForValue('', 0, 0)).toBeCloseToPixel(62);
 
-		expect(xScale.getValueForPixel(78)).toBeCloseToTime({
+		expect(xScale.getValueForPixel(62)).toBeCloseToTime({
 			value: moment(chart.data.labels[0]),
 			unit: 'day',
 			threshold: 0.75
@@ -505,13 +493,14 @@ describe('Time scale tests', function() {
 			data: {
 				labels: ["2016-06-26"],
 				datasets: [{
-					type: "line",
+					xAxisID: 'xScale0',
 					data: [5]
 				}]
 			},
 			options: {
 				scales: {
 					xAxes: [{
+						id: 'xScale0',
 						display: true,
 						type: "time",
 					}]
@@ -520,7 +509,6 @@ describe('Time scale tests', function() {
 		});
 
 		var xScale = chart.scales.xScale0;
-
 		var getOutOfBoundLabelMoment = function() {
 			xScale.getLabelMoment(12, 0);
 		};
@@ -534,13 +522,14 @@ describe('Time scale tests', function() {
 			data: {
 				labels: ["2016-06-26"],
 				datasets: [{
-					type: "line",
+					xAxisID: 'xScale0',
 					data: [5]
 				}]
 			},
 			options: {
 				scales: {
 					xAxes: [{
+						id: 'xScale0',
 						display: true,
 						type: "time",
 					}]