github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Seperate out the relative from formatter, add relative tests

Browse source
This commit is contained in:
Rashid Khan 2014-05-20 10:31:22 -04:00
parent 21f883471f
commit 9ed5dba47b
2 changed files with 88 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/kibana/directives/timepicker.js
View file

@ -98,18 +98,20 @@ define(function (require) {
};
$scope.formatRelative = function () {
var parsed = datemath.parse('now-' + $scope.relative.count + $scope.relative.unit +
($scope.relative.round ? '/' + $scope.relative.unit: ''));
var parsed = datemath.parse(getRelativeString());
$scope.relative.preview = parsed ? parsed.format($scope.format) : undefined;
return parsed;
};
$scope.applyRelative = function () {
$scope.from = 'now-' + $scope.relative.count + $scope.relative.unit +
($scope.relative.round ? '/' + $scope.relative.unit : '');
$scope.from = getRelativeString();
$scope.to = 'now';
};
var getRelativeString = function () {
return 'now-' + $scope.relative.count + $scope.relative.unit + ($scope.relative.round ? '/' + $scope.relative.unit : '');
};
$scope.applyAbsolute = function () {
$scope.from = moment($scope.absolute.from);
$scope.to = moment($scope.absolute.to);

82
test/unit/specs/directives/timepicker.js
View file

@ -151,6 +151,88 @@ define(function (require) {
done();
});
it('rounds the preview down to the unit when rounding is enabled', function (done) {
// Enable rounding
$scope.relative.round = true;
$scope.relative.count = 0;
_.each($scope.units, function (longUnit, shortUnit) {
$scope.relative.count = 0;
$scope.relative.unit = shortUnit;
$scope.formatRelative();
// The preview should match the start of the unit eg, the start of the minute
expect($scope.relative.preview).to.be(moment().startOf(longUnit).format($scope.format));
});
done();
});
it('does not round the preview down to the unit when rounding is disable', function (done) {
// Disable rounding
$scope.relative.round = false;
$scope.relative.count = 0;
_.each($scope.units, function (longUnit, shortUnit) {
$scope.relative.unit = shortUnit;
$scope.formatRelative();
// The preview should match the start of the unit eg, the start of the minute
expect($scope.relative.preview).to.be(moment().format($scope.format));
});
done();
});
it('has a $scope.applyRelative() that sets from and to based on relative.round, relative.count and relative.unit', function (done) {
// Enable rounding
$scope.relative.round = false;
$scope.relative.count = 5;
_.each($scope.units, function (longUnit, shortUnit) {
$scope.relative.unit = shortUnit;
$scope.applyRelative();
expect($scope.from).to.be('now-' + $scope.relative.count + $scope.relative.unit);
expect($scope.to).to.be('now');
});
$scope.relative.round = true;
_.each($scope.units, function (longUnit, shortUnit) {
$scope.relative.unit = shortUnit;
$scope.applyRelative();
expect($scope.from).to.be('now-' + $scope.relative.count + $scope.relative.unit + '/' + $scope.relative.unit);
expect($scope.to).to.be('now');
});
done();
});
it('updates the input fields when the scope variables are changed', function (done) {
var input = $elem.find('.kbn-timepicker-section input[ng-model="relative.count"]');
var select = $elem.find('.kbn-timepicker-section select[ng-model="relative.unit"]');
$scope.relative.count = 5;
$scope.$digest();
expect(input.val()).to.be('5');
// Should update
var i = 0;
_.each($scope.units, function (longUnit, shortUnit) {
$scope.relative.unit = shortUnit;
$scope.$digest();
expect(select.val()).to.be(i.toString());
i++;
});
done();
});
});
});