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

Fixed last test + a mistake in other tests setup

Browse Source 
- filterSrv expects the parameter to init to be the actual
   dashboard object (I'll depend on that later on), so
   I had to pass dashboard.current in there, instead of
   dashboard
 - in the last test, the problem was exactly that again.
This commit is contained in:
Harald Kraemer
2014-05-20 10:00:15 +02:00
parent ed76d718cd
commit dcea2c5f4e
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/test/specs/filterSrv-specs.js
View File

@@ -21,7 +21,7 @@ define([
describe('init', function() { describe('init', function() {
beforeEach(function() { beforeEach(function() {
_filterSrv.init( _dashboard ); _filterSrv.init( _dashboard.current );
_filterSrv.addTemplateParameter({ name: 'test', current: { value: 'oogle' } }); _filterSrv.addTemplateParameter({ name: 'test', current: { value: 'oogle' } });
}); });
@@ -33,7 +33,7 @@ define([
describe('templateOptionSelected', function() { describe('templateOptionSelected', function() {
beforeEach(function() { beforeEach(function() {
_filterSrv.init( _dashboard ); _filterSrv.init( _dashboard.current );
_filterSrv.addTemplateParameter({ name: 'test' }); _filterSrv.addTemplateParameter({ name: 'test' });
_filterSrv.templateOptionSelected(_filterSrv.templateParameters[0], { value: 'muuuu' }); _filterSrv.templateOptionSelected(_filterSrv.templateParameters[0], { value: 'muuuu' });
}); });
@@ -45,7 +45,7 @@ define([
describe('timeRange', function() { describe('timeRange', function() {
it('should return unparsed when parse is false', function() { it('should return unparsed when parse is false', function() {
_filterSrv.init( _dashboard ); _filterSrv.init( _dashboard.current );
_filterSrv.setTime({from: 'now', to: 'now-1h' }); _filterSrv.setTime({from: 'now', to: 'now-1h' });
var time = _filterSrv.timeRange(false); var time = _filterSrv.timeRange(false);
expect(time.from).to.be('now'); expect(time.from).to.be('now');
@@ -53,7 +53,7 @@ define([
}); });
it('should return parsed when parse is true', function() { it('should return parsed when parse is true', function() {
_filterSrv.init( _dashboard ); _filterSrv.init( _dashboard.current );
_filterSrv.setTime({from: 'now', to: 'now-1h' }); _filterSrv.setTime({from: 'now', to: 'now-1h' });
var time = _filterSrv.timeRange(true); var time = _filterSrv.timeRange(true);
expect(_.isDate(time.from)).to.be(true); expect(_.isDate(time.from)).to.be(true);
@@ -63,7 +63,7 @@ define([
describe('setTime', function() { describe('setTime', function() {
it('should return disable refresh for absolute times', function() { it('should return disable refresh for absolute times', function() {
_filterSrv.init( _dashboard ); _filterSrv.init( _dashboard.current );
_dashboard.current.refresh = true; _dashboard.current.refresh = true;
_filterSrv.setTime({from: '2011-01-01', to: '2015-01-01' }); _filterSrv.setTime({from: '2011-01-01', to: '2015-01-01' });
@@ -71,6 +71,7 @@ define([
}); });
it('should restore refresh after relative time range is set', function() { it('should restore refresh after relative time range is set', function() {
_filterSrv.init( _dashboard.current );
_dashboard.current.refresh = true; _dashboard.current.refresh = true;
_filterSrv.setTime({from: '2011-01-01', to: '2015-01-01' }); _filterSrv.setTime({from: '2011-01-01', to: '2015-01-01' });
expect(_dashboard.current.refresh).to.be(false); expect(_dashboard.current.refresh).to.be(false);