Rebased and added tests

chartjs · Aug 21, 2017 · 27e14a4 · 27e14a4
1 parent b849a23
commit 27e14a4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 51 deletions.
diff --git a/test/specs/core.helpers.tests.js b/test/specs/core.helpers.tests.js
@@ -165,16 +165,8 @@ describe('Core helper tests', function() {
 						borderDashOffset: 0.0
 					},
 					position: 'left',
-<<<<<<< HEAD
 					offset: false,
-					scaleLabel: {
-						display: false,
-						labelString: '',
-						lineHeight: 1.2
-					},
-=======
 					scaleLabel: Chart.defaults.scale.scaleLabel,
->>>>>>> Implement scaleLabel padding
 					ticks: {
 						beginAtZero: false,
 						minRotation: 0,

diff --git 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
@@ -211,30 +211,17 @@ describe('Category scale tests', function() {
 		});
 
 		var xScale = chart.scales.xScale0;
-<<<<<<< HEAD
-		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, 0, 0, false)).toBeCloseToPixel(23+6); // plus lineHeight
-		expect(xScale.getPixelForValue(0, 0, 0, true)).toBeCloseToPixel(23+6);  // plus lineHeight
-		expect(xScale.getValueForPixel(33)).toBe(0);
->>>>>>> Implement scaleLabel padding
 
 		expect(xScale.getPixelForValue(0, 4, 0)).toBeCloseToPixel(487);
 		expect(xScale.getValueForPixel(487)).toBe(4);
 
 		xScale.options.offset = true;
 		chart.update();
 
-<<<<<<< HEAD
-		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, 0, 0, false)).toBeCloseToPixel(23+6); // plus lineHeight
-		expect(xScale.getPixelForValue(0, 0, 0, true)).toBeCloseToPixel(69+6);  // plus lineHeight
-		expect(xScale.getValueForPixel(33)).toBe(0);
-		expect(xScale.getValueForPixel(78)).toBe(0);
->>>>>>> Implement scaleLabel padding
 
 		expect(xScale.getPixelForValue(0, 4, 0)).toBeCloseToPixel(441);
 		expect(xScale.getValueForPixel(397)).toBe(4);
@@ -267,13 +254,8 @@ describe('Category scale tests', function() {
 		});
 
 		var xScale = chart.scales.xScale0;
-<<<<<<< HEAD
-		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, false)).toBeCloseToPixel(23+6);  // plus lineHeight
-		expect(xScale.getPixelForValue('tick_1', 1, 0, false)).toBeCloseToPixel(143);
->>>>>>> Implement scaleLabel padding
+		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() {
@@ -307,29 +289,14 @@ describe('Category scale tests', function() {
 		});
 
 		var xScale = chart.scales.xScale0;
-<<<<<<< HEAD
-		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);
-=======
-		expect(xScale.getPixelForValue(0, 1, 0, false)).toBeCloseToPixel(23+6); // plus lineHeight
-		expect(xScale.getPixelForValue(0, 1, 0, true)).toBeCloseToPixel(23+6);  // plus lineHeight
->>>>>>> Implement scaleLabel padding
 
 		xScale.options.offset = true;
 		chart.update();
 
-<<<<<<< HEAD
-		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);
-=======
-		xScale.options.gridLines.offsetGridLines = true;
-
-		expect(xScale.getPixelForValue(0, 1, 0, false)).toBeCloseToPixel(23+6); // plus lineHeight
-		expect(xScale.getPixelForValue(0, 1, 0, true)).toBeCloseToPixel(107);
-
-		expect(xScale.getPixelForValue(0, 3, 0, false)).toBeCloseToPixel(340);
-		expect(xScale.getPixelForValue(0, 3, 0, true)).toBeCloseToPixel(419);
->>>>>>> Implement scaleLabel padding
 	});
 
 	it ('should get the correct pixel for a value when vertical', function() {