AxisConfig

src/ui/public/vislib/__tests__/lib/axis_title.js

@@ -5,11 +5,13 @@ import ngMock from 'ng_mock';
 import expect from 'expect.js';
 import $ from 'jquery';
 import VislibLibAxisTitleProvider from 'ui/vislib/lib/axis_title';
+import VislibLibAxisConfigProvider from 'ui/vislib/lib/axis_config';
 import VislibLibDataProvider from 'ui/vislib/lib/data';
 import PersistedStatePersistedStateProvider from 'ui/persisted_state/persisted_state';
 
 describe('Vislib AxisTitle Class Test Suite', function () {
   let AxisTitle;
+  let AxisConfig;
   let Data;
   let PersistedState;
   let axisTitle;
@@ -79,27 +81,55 @@ describe('Vislib AxisTitle Class Test Suite', function () {
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
     AxisTitle = Private(VislibLibAxisTitleProvider);
+    AxisConfig = Private(VislibLibAxisConfigProvider);
     Data = Private(VislibLibDataProvider);
     PersistedState = Private(PersistedStatePersistedStateProvider);
 
     el = d3.select('body').append('div')
       .attr('class', 'vis-wrapper');
 
     el.append('div')
-      .attr('class', 'y-axis-title')
-      .style('height', '20px')
-      .style('width', '20px');
+      .attr('class', 'axis-wrapper-bottom')
+      .append('div')
+        .attr('class', 'axis-title y-axis-title')
+        .style('height', '20px')
+        .style('width', '20px');
 
     el.append('div')
-      .attr('class', 'x-axis-title')
-      .style('height', '20px')
-      .style('width', '20px');
+      .attr('class', 'axis-wrapper-left')
+      .append('div')
+        .attr('class', 'axis-title x-axis-title')
+        .style('height', '20px')
+        .style('width', '20px');
 
 
     dataObj = new Data(data, {}, new PersistedState());
-    xTitle = dataObj.get('xAxisLabel');
-    yTitle = dataObj.get('yAxisLabel');
-    axisTitle = new AxisTitle($('.vis-wrapper')[0], xTitle, yTitle);
+    const xAxisConfig = new AxisConfig({
+      position: 'bottom',
+      title: {
+        text: dataObj.get('xAxisLabel')
+      },
+      vis: {
+        el: el.node(),
+        _attr: {
+          type: 'histogram'
+        }
+      }
+    });
+    const yAxisConfig = new AxisConfig({
+      position: 'left',
+      title: {
+        text: dataObj.get('yAxisLabel')
+      },
+      vis: {
+        el: el.node(),
+        _attr: {
+          type: 'histogram'
+        }
+      }
+    });
+    xTitle = new AxisTitle(xAxisConfig);
+    yTitle = new AxisTitle(yAxisConfig);
   }));
 
   afterEach(function () {
@@ -108,7 +138,8 @@ describe('Vislib AxisTitle Class Test Suite', function () {
 
   describe('render Method', function () {
     beforeEach(function () {
-      axisTitle.render();
+      xTitle.render();//here
+      yTitle.render();
     });
 
     it('should append an svg to div', function () {
@@ -129,7 +160,7 @@ describe('Vislib AxisTitle Class Test Suite', function () {
 
   describe('draw Method', function () {
     it('should be a function', function () {
-      expect(_.isFunction(axisTitle.draw())).to.be(true);
+      expect(_.isFunction(xTitle.draw())).to.be(true);
     });
   });
 

src/ui/public/vislib/__tests__/lib/layout/layout.js

@@ -53,16 +53,16 @@ dateHistogramArray.forEach(function (data, i) {
     describe('createLayout Method', function () {
       it('should append all the divs', function () {
         expect($(vis.el).find('.vis-wrapper').length).to.be(1);
-        expect($(vis.el).find('.y-axis-col-wrapper').length).to.be(1);
+        expect($(vis.el).find('.y-axis-col-wrapper').length).to.be(2);
         expect($(vis.el).find('.vis-col-wrapper').length).to.be(1);
-        expect($(vis.el).find('.y-axis-col').length).to.be(1);
-        expect($(vis.el).find('.y-axis-title').length).to.be(1);
-        expect($(vis.el).find('.y-axis-div-wrapper').length).to.be(1);
-        expect($(vis.el).find('.y-axis-spacer-block').length).to.be(1);
+        expect($(vis.el).find('.y-axis-col').length).to.be(2);
+        expect($(vis.el).find('.y-axis-title').length).to.be(2);
+        expect($(vis.el).find('.y-axis-div-wrapper').length).to.be(2);
+        expect($(vis.el).find('.y-axis-spacer-block').length).to.be(4);
         expect($(vis.el).find('.chart-wrapper').length).to.be(numberOfCharts);
-        expect($(vis.el).find('.x-axis-wrapper').length).to.be(1);
-        expect($(vis.el).find('.x-axis-div-wrapper').length).to.be(1);
-        expect($(vis.el).find('.x-axis-title').length).to.be(1);
+        expect($(vis.el).find('.x-axis-wrapper').length).to.be(2);
+        expect($(vis.el).find('.x-axis-div-wrapper').length).to.be(2);
+        expect($(vis.el).find('.x-axis-title').length).to.be(2);
       });
     });
 

src/ui/public/vislib/__tests__/lib/x_axis.js

@@ -94,12 +94,16 @@ describe('Vislib xAxis Class Test Suite', function () {
     dataObj = new Data(data, {}, persistedState);
     xAxis = new Axis({
       type: 'category',
-      el: $('.x-axis-div')[0],
-      xValues: dataObj.xValues(),
-      ordered: dataObj.get('ordered'),
-      xAxisFormatter: dataObj.get('xAxisFormatter'),
-      _attr: {
-        margin: { top: 0, right: 0, bottom: 0, left: 0 }
+      vis: {
+        el: $('.x-axis-div')[0],
+        _attr: {
+          margin: { top: 0, right: 0, bottom: 0, left: 0 },
+          type: 'histogram'
+        }
+      },
+      data: dataObj,
+      labels: {
+        xAxisFormatter: dataObj.get('xAxisFormatter')
       }
     });
   }));
@@ -127,7 +131,7 @@ describe('Vislib xAxis Class Test Suite', function () {
     });
   });
 
-  describe('getScale, getDomain, getTimeDomain, getOrdinalDomain, and getRange Methods', function () {
+  describe('getScale, getDomain, getTimeDomain, and getRange Methods', function () {
     let ordered;
     let timeScale;
     let timeDomain;
@@ -137,28 +141,45 @@ describe('Vislib xAxis Class Test Suite', function () {
     let range;
 
     beforeEach(function () {
-      timeScale = xAxis.getScale();
-      timeDomain = xAxis.getDomain(timeScale);
-      range = xAxis.getRange(timeDomain, width);
-      xAxis.ordered = {};
-      ordinalScale = xAxis.getScale();
-      ordinalDomain = ordinalScale.domain(['this', 'should', 'be', 'an', 'array']);
       width = $('.x-axis-div').width();
+      xAxis.getAxis(width);
+      timeScale = xAxis.getScale();
+      timeDomain = xAxis.axisScale.getExtents();
+      range = xAxis.axisScale.getRange(width);
     });
 
     it('should return a function', function () {
       expect(_.isFunction(timeScale)).to.be(true);
-      expect(_.isFunction(ordinalScale)).to.be(true);
     });
 
     it('should return the correct domain', function () {
-      expect(_.isDate(timeDomain.domain()[0])).to.be(true);
-      expect(_.isDate(timeDomain.domain()[1])).to.be(true);
+      expect(_.isDate(timeScale.domain()[0])).to.be(true);
+      expect(_.isDate(timeScale.domain()[1])).to.be(true);
     });
 
     it('should return the min and max dates', function () {
-      expect(timeDomain.domain()[0].toDateString()).to.be(new Date(1408734060000).toDateString());
-      expect(timeDomain.domain()[1].toDateString()).to.be(new Date(1408734330000).toDateString());
+      expect(timeScale.domain()[0].toDateString()).to.be(new Date(1408734060000).toDateString());
+      expect(timeScale.domain()[1].toDateString()).to.be(new Date(1408734330000).toDateString());
+    });
+
+    it('should return the correct range', function () {
+      expect(range[0]).to.be(0);
+      expect(range[1]).to.be(width);
+    });
+  });
+
+  describe('getOrdinalDomain Method', function () {
+    let ordinalScale;
+    let ordinalDomain;
+    let width;
+
+    beforeEach(function () {
+      width = $('.x-axis-div').width();
+      xAxis.ordered = null;
+      xAxis.config.ordered = null;
+      xAxis.getAxis(width);
+      ordinalScale = xAxis.getScale();
+      ordinalDomain = ordinalScale.domain(['this', 'should', 'be', 'an', 'array']);
     });
 
     it('should return an ordinal scale', function () {
@@ -169,11 +190,6 @@ describe('Vislib xAxis Class Test Suite', function () {
     it('should return an array of values', function () {
       expect(_.isArray(ordinalDomain.domain())).to.be(true);
     });
-
-    it('should return the correct range', function () {
-      expect(range.range()[0]).to.be(0);
-      expect(range.range()[1]).to.be(width);
-    });
   });
 
   describe('getXScale Method', function () {
@@ -182,7 +198,8 @@ describe('Vislib xAxis Class Test Suite', function () {
 
     beforeEach(function () {
       width = $('.x-axis-div').width();
-      xScale = xAxis.getXScale(width);
+      xAxis.getAxis(width);
+      xScale = xAxis.getScale();
     });
 
     it('should return a function', function () {
@@ -206,19 +223,11 @@ describe('Vislib xAxis Class Test Suite', function () {
 
     beforeEach(function () {
       width = $('.x-axis-div').width();
-      xAxis.getXAxis(width);
-    });
-
-    it('should create an xAxis function on the xAxis class', function () {
-      expect(_.isFunction(xAxis.xAxis)).to.be(true);
-    });
-
-    it('should create an xScale function on the xAxis class', function () {
-      expect(_.isFunction(xAxis.xScale)).to.be(true);
+      xAxis.getAxis(width);
     });
 
-    it('should create an xAxisFormatter function on the xAxis class', function () {
-      expect(_.isFunction(xAxis.axisFormatter)).to.be(true);
+    it('should create an getScale function on the xAxis class', function () {
+      expect(_.isFunction(xAxis.getScale())).to.be(true);
     });
   });