github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 09:19:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

correcting issues based on pr reviews

Browse source
This commit is contained in:
Shelby Sturgis 2015-05-14 22:10:21 -07:00
parent e5f0d0b31c
commit aefa3c7037
2 changed files with 12 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/kibana/components/vislib/lib/y_axis.js
View file

@ -120,6 +120,8 @@ define(function (require) {
.range([height, 0]);
if (!this._isUserDefined()) this.yScale.nice(); // round extents when not user defined
// Prevents bars from going off the chart when the y extents are within the domain range
if (this._attr.type === 'histogram') this.yScale.clamp(true);
return this.yScale;
};

50
test/unit/specs/vislib/lib/y_axis.js
View file

@ -226,10 +226,6 @@ define(function (require) {
});
describe('validate user defined values', function () {
var newDomain;
var min;
var max;
beforeEach(function () {
yAxis._attr.mode = 'stacked';
yAxis._attr.setYExtents = false;
@ -237,8 +233,8 @@ define(function (require) {
});
it('should throw a NaN error', function () {
min = 'Not a number';
max = 12;
var min = 'Not a number';
var max = 12;
expect(function () {
yAxis._validateUserExtents(min, max);
@ -251,7 +247,7 @@ define(function (require) {
domain = [];
domain[0] = yAxis._attr.yAxis.min = 20;
domain[1] = yAxis._attr.yAxis.max = 80;
newDomain = yAxis._validateUserExtents(domain);
var newDomain = yAxis._validateUserExtents(domain);
expect(newDomain[0]).to.be(domain[0] / 100);
expect(newDomain[1]).to.be(domain[1] / 100);
@ -259,7 +255,7 @@ define(function (require) {
it('should return the user defined value', function () {
domain = [20, 50];
newDomain = yAxis._validateUserExtents(domain);
var newDomain = yAxis._validateUserExtents(domain);
expect(newDomain[0]).to.be(domain[0]);
expect(newDomain[1]).to.be(domain[1]);
@ -267,12 +263,9 @@ define(function (require) {
});
describe('should throw an error when', function () {
var min;
var max;
it('min === max', function () {
min = 12;
max = 12;
var min = 12;
var max = 12;
expect(function () {
yAxis._validateAxisExtents(min, max);
@ -280,8 +273,8 @@ define(function (require) {
});
it('min > max', function () {
min = 30;
max = 10;
var min = 30;
var max = 10;
expect(function () {
yAxis._validateAxisExtents(min, max);
@ -290,39 +283,16 @@ define(function (require) {
});
});
//describe('formatAxisLabel method', function () {
// var num = 1e9;
// var val;
//
// describe('should not return a nice scale when defaultYExtents is true', function () {
// beforeEach(function () {
// createData(defaultGraphData);
// yAxis._attr.defaultYExtents = true;
// yAxis.getYAxis(height);
// yAxis.render();
// });
//
// it('not return a nice scale', function () {
// var min = _.min(_.flatten(defaultGraphData));
// var max = _.max(_.flatten(defaultGraphData));
// var domain = yAxis.yAxis.scale().domain();
// expect(domain[0]).to.be(min);
// expect(domain[1]).to.be(max);
// });
// });
//});
describe('getScaleType method', function () {
var fnNames = ['linear', 'log', 'square root'];
it('should return a function', function () {
fnNames.forEach(function (fnName) {
var isFunction = (typeof yAxis._getScaleType(fnName) === 'function');
expect(isFunction).to.be(true);
expect(typeof yAxis._getScaleType(fnName)).to.be('function');
});
// if no value is provided to the function, scale should default to a linear scale
expect(typeof yAxis._getScaleType()).to.be('function');
expect(typeof yAxis._getScaleType()).to.be(Function);
});
it('should throw an error if function name is undefined', function () {