beginAtZero and linear scales with no data should play nice

diff --git a/src/scales/scale.linear.js b/src/scales/scale.linear.js
index 90fcab9fec8158416f730f4e53e133b6e5d04449..e3a7ab8b0b7536b3ab3a5159ecda4529cdfe4d8f 100644 (file)
--- a/src/scales/scale.linear.js
+++ b/src/scales/scale.linear.js
@@ -147,8 +147,11 @@ module.exports = function(Chart) {
                        }
 
                        if (this.min === this.max) {
-                               this.min--;
                                this.max++;
+
+                               if (!this.options.ticks.beginAtZero) {
+                                       this.min--;
+                               }
                        }
                },
                buildTicks: function() {

diff --git a/test/scale.linear.tests.js b/test/scale.linear.tests.js
index 40e60ce86eb680282f58d64df360405ac03e9f1e..8785ed2f3295305f6f74945936355a24149c4d5d 100644 (file)
--- a/test/scale.linear.tests.js
+++ b/test/scale.linear.tests.js
@@ -409,6 +409,31 @@ describe('Linear Scale', function() {
                expect(chartInstance.scales.yScale0.max).toBe(1);
        });
 
+       it('Should ensure that the scale has a max and min that are not equal when beginAtZero is set', function() {
+               chartInstance = window.acquireChart({
+                       type: 'bar',
+                       data: {
+                               datasets: [],
+                               labels: ['a', 'b', 'c', 'd', 'e', 'f']
+                       },
+                       options: {
+                               scales: {
+                                       yAxes: [{
+                                               id: 'yScale0',
+                                               type: 'linear',
+                                               ticks: {
+                                                       beginAtZero: true
+                                               }
+                                       }]
+                               }
+                       }
+               });
+
+               expect(chartInstance.scales.yScale0).not.toEqual(undefined); // must construct
+               expect(chartInstance.scales.yScale0.min).toBe(0);
+               expect(chartInstance.scales.yScale0.max).toBe(1);
+       });
+
        it('Should use the suggestedMin and suggestedMax options', function() {
                chartInstance = window.acquireChart({
                        type: 'bar',