Commit 36b44d69 by Harald Kraemer

Moved init calls to setup method

parent dcea2c5f
...@@ -19,9 +19,12 @@ define([ ...@@ -19,9 +19,12 @@ define([
_filterSrv = filterSrv; _filterSrv = filterSrv;
})); }));
beforeEach(function() {
_filterSrv.init( _dashboard.current );
});
describe('init', function() { describe('init', function() {
beforeEach(function() { beforeEach(function() {
_filterSrv.init( _dashboard.current );
_filterSrv.addTemplateParameter({ name: 'test', current: { value: 'oogle' } }); _filterSrv.addTemplateParameter({ name: 'test', current: { value: 'oogle' } });
}); });
...@@ -33,7 +36,6 @@ define([ ...@@ -33,7 +36,6 @@ define([
describe('templateOptionSelected', function() { describe('templateOptionSelected', function() {
beforeEach(function() { beforeEach(function() {
_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 +47,6 @@ define([ ...@@ -45,7 +47,6 @@ 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.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 +54,6 @@ define([ ...@@ -53,7 +54,6 @@ define([
}); });
it('should return parsed when parse is true', function() { it('should return parsed when parse is true', function() {
_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,6 @@ define([ ...@@ -63,7 +63,6 @@ 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.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,7 +70,6 @@ define([ ...@@ -71,7 +70,6 @@ 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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment