Category scale tests

diff --git a/src/scales/scale.category.js b/src/scales/scale.category.js
index ea51cfd1418cc99f516026ff2e5bda3fb38b6c25..a2e569d4cfaa5e5ee3f9b4851e16ee2644694c25 100644 (file)
--- a/src/scales/scale.category.js
+++ b/src/scales/scale.category.js
@@ -29,7 +29,15 @@
 
                 return this.left + Math.round(valueOffset);
             } else {
-                return this.top + (index * (this.height / this.labels.length));
+                var innerHeight = this.height - (this.paddingTop + this.paddingBottom);
+                var valueHeight = innerHeight / Math.max((this.data.labels.length - ((this.options.gridLines.offsetGridLines) ? 0 : 1)), 1);
+                var valueOffset = (valueHeight * index) + this.paddingTop;
+
+                if (this.options.gridLines.offsetGridLines && includeOffset) {
+                    valueOffset += (valueHeight / 2);
+                }
+
+                return this.top + Math.round(valueOffset);
             }
         },
     });

diff --git a/test/scale.category.tests.js b/test/scale.category.tests.js
new file mode 100644 (file)
index 0000000..799fa55
--- /dev/null
+++ b/test/scale.category.tests.js
@@ -0,0 +1,189 @@
+// Test the category scale
+
+describe('Category scale tests', function() {
+       it('Should register the constructor with the scale service', function() {
+               var Constructor = Chart.scaleService.getScaleConstructor('category');
+               expect(Constructor).not.toBe(undefined);
+               expect(typeof Constructor).toBe('function');
+       });
+
+       it('Should have the correct default config', function() {
+               var defaultConfig = Chart.scaleService.getScaleDefaults('category');
+               expect(defaultConfig).toEqual({
+                       display: true,
+
+                       gridLines: {
+                               color: "rgba(0, 0, 0, 0.1)",
+                               drawOnChartArea: true,
+                               drawTicks: true, // draw ticks extending towards the label
+                               lineWidth: 1,
+                               offsetGridLines: false,
+                               show: true,
+                               zeroLineColor: "rgba(0,0,0,0.25)",
+                               zeroLineWidth: 1,
+                       },
+                       position: "bottom",
+                       scaleLabel: {
+                               fontColor: '#666',
+                               fontFamily: 'Helvetica Neue',
+                               fontSize: 12,
+                               fontStyle: 'normal',
+                               labelString: '',
+                               show: false,
+                       },
+                       ticks: {
+                               beginAtZero: false,
+                               fontColor: "#666",
+                               fontFamily: "Helvetica Neue",
+                               fontSize: 12,
+                               fontStyle: "normal",
+                               maxRotation: 90,
+                               minRotation: 20,
+                               mirror: false,
+                               padding: 10,
+                               reverse: false,
+                               show: true,
+                               template: "<%=value%>"
+                       }
+               });
+       });
+
+       it('Should generate ticks from the data labales', function() {
+               var scaleID = 'myScale';
+
+               var mockData = {
+                       datasets: [{
+                               yAxisID: scaleID,
+                               data: [10, 5, 0, 25, 78]
+                       }],
+                       labels: ['tick1', 'tick2', 'tick3', 'tick4', 'tick5']
+               };
+
+               var config = Chart.helpers.clone(Chart.scaleService.getScaleDefaults('category'));
+               var Constructor = Chart.scaleService.getScaleConstructor('category');
+               var scale = new Constructor({
+                       ctx: {},
+                       options: config,
+                       data: mockData,
+                       id: scaleID
+               });
+
+               scale.buildTicks();
+               expect(scale.ticks).toEqual(mockData.labels);
+       });
+
+       it ('Should get the correct pixel for a value when horizontal', function() {
+               var scaleID = 'myScale';
+
+               var mockData = {
+                       datasets: [{
+                               yAxisID: scaleID,
+                               data: [10, 5, 0, 25, 78]
+                       }],
+                       labels: ['tick1', 'tick2', 'tick3', 'tick4', 'tick_last']
+               };
+
+               var mockContext = window.createMockContext();
+               var config = Chart.helpers.clone(Chart.scaleService.getScaleDefaults('category'));
+               config.gridLines.offsetGridLines = true;
+               var Constructor = Chart.scaleService.getScaleConstructor('category');
+               var scale = new Constructor({
+                       ctx: mockContext,
+                       options: config,
+                       data: mockData,
+                       id: scaleID
+               });
+
+               var minSize = scale.update(200, 100);
+
+               expect(scale.width).toBe(200);
+               expect(scale.height).toBe(28);
+               expect(scale.paddingTop).toBe(0);
+               expect(scale.paddingBottom).toBe(0);
+               expect(scale.paddingLeft).toBe(28);
+               expect(scale.paddingRight).toBe(48);
+               expect(scale.labelRotation).toBe(0);
+
+               expect(minSize).toEqual({
+                       width: 200,
+                       height: 28,
+               });
+
+               scale.left = 5;
+               scale.top = 5;
+               scale.right = 205;
+               scale.bottom = 33;
+
+               expect(scale.getPixelForValue(0, 0, 0, false)).toBe(33);
+               expect(scale.getPixelForValue(0, 0, 0, true)).toBe(45);
+
+               expect(scale.getPixelForValue(0, 4, 0, false)).toBe(132);
+               expect(scale.getPixelForValue(0, 4, 0, true)).toBe(145);
+
+               config.gridLines.offsetGridLines = false;
+
+               expect(scale.getPixelForValue(0, 0, 0, false)).toBe(33);
+               expect(scale.getPixelForValue(0, 0, 0, true)).toBe(33);
+
+               expect(scale.getPixelForValue(0, 4, 0, false)).toBe(157);
+               expect(scale.getPixelForValue(0, 4, 0, true)).toBe(157);
+       });
+
+       it ('should get the correct pixel for a value when vertical', function() {
+               var scaleID = 'myScale';
+
+               var mockData = {
+                       datasets: [{
+                               yAxisID: scaleID,
+                               data: [10, 5, 0, 25, 78]
+                       }],
+                       labels: ['tick1', 'tick2', 'tick3', 'tick4', 'tick_last']
+               };
+
+               var mockContext = window.createMockContext();
+               var config = Chart.helpers.clone(Chart.scaleService.getScaleDefaults('category'));
+               config.gridLines.offsetGridLines = true;
+               config.position = "left";
+               var Constructor = Chart.scaleService.getScaleConstructor('category');
+               var scale = new Constructor({
+                       ctx: mockContext,
+                       options: config,
+                       data: mockData,
+                       id: scaleID
+               });
+
+               var minSize = scale.update(100, 200);
+
+               expect(scale.width).toBe(100);
+               expect(scale.height).toBe(200);
+               expect(scale.paddingTop).toBe(6);
+               expect(scale.paddingBottom).toBe(6);
+               expect(scale.paddingLeft).toBe(0);
+               expect(scale.paddingRight).toBe(0);
+               expect(scale.labelRotation).toBe(0);
+
+               expect(minSize).toEqual({
+                       width: 100,
+                       height: 200,
+               });
+
+               scale.left = 5;
+               scale.top = 5;
+               scale.right = 105;
+               scale.bottom = 205;
+
+               expect(scale.getPixelForValue(0, 0, 0, false)).toBe(11);
+               expect(scale.getPixelForValue(0, 0, 0, true)).toBe(30);
+
+               expect(scale.getPixelForValue(0, 4, 0, false)).toBe(161);
+               expect(scale.getPixelForValue(0, 4, 0, true)).toBe(180);
+
+               config.gridLines.offsetGridLines = false;
+
+               expect(scale.getPixelForValue(0, 0, 0, false)).toBe(11);
+               expect(scale.getPixelForValue(0, 0, 0, true)).toBe(11);
+
+               expect(scale.getPixelForValue(0, 4, 0, false)).toBe(199);
+               expect(scale.getPixelForValue(0, 4, 0, true)).toBe(199);
+       });
+});
\ No newline at end of file