IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

typescript: fixed issue with tslint in testsW

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-05-17 13:43:17 +02:00
parent d261f33c3d
commit 87f5222907
3 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/features/panel/metrics_ds_selector.ts
View File

@ -13,7 +13,7 @@ var template = `
<i class="icon-gf icon-gf-datasources"></i>
</label>
<label class="gf-form-label">
Panel data source
Data Source
</label>
<metric-segment segment="ctrl.dsSegment"
@ -22,7 +22,7 @@ var template = `
</div>
<div class="gf-form gf-form--offset-1">
<button class="btn btn-inverse gf-form-btn" ng-click="ctrl.addDataQuery()" ng-hide="ctrl.current.meta.mixed">
<button class="btn btn-secondary gf-form-btn" ng-click="ctrl.addDataQuery()" ng-hide="ctrl.current.meta.mixed">
<i class="fa fa-plus"></i>&nbsp;
Add query
</button>

38
public/test/core/utils/rangeutil_specs.ts
View File

@ -1,4 +1,4 @@
import {describe, beforeEach, it, sinon, expect} from 'test/lib/common'
import {describe, beforeEach, it, sinon, expect} from 'test/lib/common';
import * as rangeUtil from 'app/core/utils/rangeutil';
import _ from 'lodash';
@ -9,33 +9,33 @@ describe("rangeUtil", () => {
describe("Can get range grouped list of ranges", () => {
it('when custom settings should return default range list', () => {
var groups = rangeUtil.getRelativeTimesList({time_options: []}, 'Last 5 minutes');
expect(_.keys(groups).length).to.be(4)
expect(groups[3][0].active).to.be(true)
expect(_.keys(groups).length).to.be(4);
expect(groups[3][0].active).to.be(true);
});
});
describe("Can get range text described", () => {
it('should handle simple old expression with only amount and unit', () => {
var info = rangeUtil.describeTextRange('5m');
expect(info.display).to.be('Last 5 minutes')
expect(info.display).to.be('Last 5 minutes');
});
it('should have singular when amount is 1', () => {
var info = rangeUtil.describeTextRange('1h');
expect(info.display).to.be('Last 1 hour')
expect(info.display).to.be('Last 1 hour');
});
it('should handle non default amount', () => {
var info = rangeUtil.describeTextRange('13h');
expect(info.display).to.be('Last 13 hours')
expect(info.from).to.be('now-13h')
expect(info.display).to.be('Last 13 hours');
expect(info.from).to.be('now-13h');
});
it('should handle non default future amount', () => {
var info = rangeUtil.describeTextRange('+3h');
expect(info.display).to.be('Next 3 hours')
expect(info.from).to.be('now')
expect(info.to).to.be('now+3h')
expect(info.display).to.be('Next 3 hours');
expect(info.from).to.be('now');
expect(info.to).to.be('now+3h');
});
it('should handle now/d', () => {
@ -52,47 +52,47 @@ describe("rangeUtil", () => {
describe("Can get date range described", () => {
it('Date range with simple ranges', () => {
var text = rangeUtil.describeTimeRange({from: 'now-1h', to: 'now'});
expect(text).to.be('Last 1 hour')
expect(text).to.be('Last 1 hour');
});
it('Date range with rounding ranges', () => {
var text = rangeUtil.describeTimeRange({from: 'now/d+6h', to: 'now'});
expect(text).to.be('now/d+6h to now')
expect(text).to.be('now/d+6h to now');
});
it('Date range with absolute to now', () => {
var text = rangeUtil.describeTimeRange({from: moment([2014,10,10,2,3,4]), to: 'now'});
expect(text).to.be('Nov 10, 2014 02:03:04 to a few seconds ago')
expect(text).to.be('Nov 10, 2014 02:03:04 to a few seconds ago');
});
it('Date range with absolute to relative', () => {
var text = rangeUtil.describeTimeRange({from: moment([2014,10,10,2,3,4]), to: 'now-1d'});
expect(text).to.be('Nov 10, 2014 02:03:04 to a day ago')
expect(text).to.be('Nov 10, 2014 02:03:04 to a day ago');
});
it('Date range with relative to absolute', () => {
var text = rangeUtil.describeTimeRange({from: 'now-7d', to: moment([2014,10,10,2,3,4])});
expect(text).to.be('7 days ago to Nov 10, 2014 02:03:04')
expect(text).to.be('7 days ago to Nov 10, 2014 02:03:04');
});
it('Date range with non matching default ranges', () => {
var text = rangeUtil.describeTimeRange({from: 'now-13h', to: 'now'});
expect(text).to.be('Last 13 hours')
expect(text).to.be('Last 13 hours');
});
it('Date range with from and to both are in now-* format', () => {
var text = rangeUtil.describeTimeRange({from: 'now-6h', to: 'now-3h'});
expect(text).to.be('now-6h to now-3h')
expect(text).to.be('now-6h to now-3h');
});
it('Date range with from and to both are either in now-* or now/* format', () => {
var text = rangeUtil.describeTimeRange({from: 'now/d+6h', to: 'now-3h'});
expect(text).to.be('now/d+6h to now-3h')
expect(text).to.be('now/d+6h to now-3h');
});
it('Date range with from and to both are either in now-* or now+* format', () => {
var text = rangeUtil.describeTimeRange({from: 'now-6h', to: 'now+1h'});
expect(text).to.be('now-6h to now+1h')
expect(text).to.be('now-6h to now+1h');
});
});

3
tsconfig.json
View File

@ -17,7 +17,8 @@
"moduleResolution": "classic"
},
"include": [
"public/app/**/*.ts"
"public/app/**/*.ts",
"public/test/**/*.ts"
],
"exclude": [
"public/vendor/**/*",