From b46499985147eae78bd63dea96978008ba8d8912 Mon Sep 17 00:00:00 2001
From: Evert Timberg <evert.timberg+github@gmail.com>
Date: Sun, 5 Jan 2020 15:50:24 -0500
Subject: [PATCH] Bar chart defaults to begin at zero (#6917)

* Bar chart defaults to begin at zero

* Add bar beginAtZero test
---
 src/controllers/controller.bar.js             |   1 +
 .../bar-default-begin-at-zero.js              |  29 ++++++++++++++++++
 .../bar-default-begin-at-zero.png             | Bin 0 -> 5944 bytes
 test/specs/controller.bar.tests.js            |   6 ++--
 test/specs/scale.linear.tests.js              |   8 +++--
 5 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 test/fixtures/controller.bar/bar-default-begin-at-zero.js
 create mode 100644 test/fixtures/controller.bar/bar-default-begin-at-zero.png

diff --git a/src/controllers/controller.bar.js b/src/controllers/controller.bar.js
index 760c80e40..2326d0b94 100644
--- a/src/controllers/controller.bar.js
+++ b/src/controllers/controller.bar.js
@@ -22,6 +22,7 @@ defaults._set('bar', {
 		},
 		y: {
 			type: 'linear',
+			beginAtZero: true,
 		}
 	}
 });
diff --git a/test/fixtures/controller.bar/bar-default-begin-at-zero.js b/test/fixtures/controller.bar/bar-default-begin-at-zero.js
new file mode 100644
index 000000000..1f3e21d97
--- /dev/null
+++ b/test/fixtures/controller.bar/bar-default-begin-at-zero.js
@@ -0,0 +1,29 @@
+module.exports = {
+	config: {
+		type: 'bar',
+		data: {
+			labels: [0, 1, 3, 4],
+			datasets: [
+				{
+					data: [5, 20, 1, 10],
+					backgroundColor: '#00ff00',
+					borderColor: '#ff0000'
+				}
+			]
+		},
+		options: {
+			legend: false,
+			title: false,
+			scales: {
+				x: {display: false},
+				y: {display: false}
+			}
+		}
+	},
+	options: {
+		canvas: {
+			height: 256,
+			width: 512
+		}
+	}
+};
diff --git a/test/fixtures/controller.bar/bar-default-begin-at-zero.png b/test/fixtures/controller.bar/bar-default-begin-at-zero.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ec05955cb661f7e9ef53801a46e4e0c1b4473e7
GIT binary patch
literal 5944
zc-rlbZ%7ki9DslCwX1n^sClK9qG{zK0&NCT*`_W`((SY&BJeDRC8jtm2(|5|C9OXe
z34vjD6=YCpQBj1oBUr1{G8RSjXA>o(45zEua@}=NANtydzSR4Ed0%+m-}8GMjIlsX
z&7lB5UAV?j3P8wD1j_01<vRLk8^CO-(2%=+ciG1mxve#Q8w^ABS{|iseRW7Vr_)~9
zWLDkYSzVQs=dB(+b*0YbxWv5HS;P6h8w&Ajphu_ENuifjVbLKtzlA3PtjSp$j}*~C
zRw3%A+1XeItcU%{H}xnugAYXz%5W4Sh3EbTf)d6P?s$3V)dp0GXn!1dg+++;(W9q&
zi%_tQPs|6q(<HFanBYw3A>27MrKW@xTBjb64f)j_GZ`>i#0Pyer;B))`AeZY$Pxa>
zsZ+Ms7l3|RnVMk`Y$&q5J!du23@!$8*9m203<E9w{heokem9G2T3)PZQEDK+qQX=H
z)F(=xdvYO>ub{bk+N)g}AnQq<H^$oM$-zh4U#z1!;x@rBT@E1{k>&UM#}-j~dl}N4
z_ZZ6eb3}%@;tNgk`kr6g^(cO+w&4K5@Ed`8pA{3I$^*{9IXDOB;2fNTbN>CD0q24g
z$+gjP%trE;Yl=ODCNXCdxO`b|<$c?hcZK3C?(VH+#VWq`lNr&?p2V~iY2WGeknI2P
zENcmO_emScL>lW3apAa@&Jh-AE^hW*1FFC@Tc4RdkV#Ck@%31a<yem8SpFB}(m4o%
z=(R$6b3jrI4=+ep`AR$%g?L=%tm~(4?m%0V&rGX)KR$RTBulOP_iY$sj4{R-|9_aB
zlvu0PDh^w$Zd-xRYZHT^zVYttuh+xL_QqRp=S!3j8!#oU3W2fAj5^92d-qC5gnO+4
zTmPVYv?JI9D@&!p30XOkLkSW0+-rl9a>rP<<c{3a_{brTr+tn}(#hj*&H^6)lW|GS
WCTuTi-lAOv@+n+xG<4^cH+=`9Sn*T<

literal 0
Hc-jL100001

diff --git a/test/specs/controller.bar.tests.js b/test/specs/controller.bar.tests.js
index 317dc946f..e7d36c3fc 100644
--- a/test/specs/controller.bar.tests.js
+++ b/test/specs/controller.bar.tests.js
@@ -708,7 +708,8 @@ describe('Chart.controllers.bar', function() {
 					},
 					y: {
 						type: 'linear',
-						display: false
+						display: false,
+						beginAtZero: false
 					}
 				}
 			}
@@ -773,7 +774,8 @@ describe('Chart.controllers.bar', function() {
 					},
 					y: {
 						type: 'linear',
-						display: false
+						display: false,
+						beginAtZero: false
 					}
 				}
 			}
diff --git a/test/specs/scale.linear.tests.js b/test/specs/scale.linear.tests.js
index cad0e5181..389235f5f 100644
--- a/test/specs/scale.linear.tests.js
+++ b/test/specs/scale.linear.tests.js
@@ -210,7 +210,8 @@ describe('Linear Scale', function() {
 			options: {
 				scales: {
 					y: {
-						type: 'linear'
+						type: 'linear',
+						beginAtZero: false
 					}
 				}
 			}
@@ -673,6 +674,7 @@ describe('Linear Scale', function() {
 				scales: {
 					y: {
 						type: 'linear',
+						beginAtZero: false
 					}
 				}
 			}
@@ -751,7 +753,9 @@ describe('Linear Scale', function() {
 			},
 			options: {
 				scales: {
-					y: {}
+					y: {
+						beginAtZero: false
+					}
 				}
 			}
 		});
-- 
2.47.2