From dcea2c5f4e51a3877ea2a6494856f8e1344263e2 Mon Sep 17 00:00:00 2001
From: Harald Kraemer <hkraemer@goodgamestudios.com>
Date: Tue, 20 May 2014 10:00:15 +0200
Subject: [PATCH] Fixed last test + a mistake in other tests setup

 - 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.
---
 src/test/specs/filterSrv-specs.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/test/specs/filterSrv-specs.js b/src/test/specs/filterSrv-specs.js
index beb9edf94b3..a6742bbed87 100644
--- a/src/test/specs/filterSrv-specs.js
+++ b/src/test/specs/filterSrv-specs.js
@@ -21,7 +21,7 @@ define([
 
     describe('init', function() {
       beforeEach(function() {
-        _filterSrv.init( _dashboard );
+        _filterSrv.init( _dashboard.current );
         _filterSrv.addTemplateParameter({ name: 'test', current: { value: 'oogle' } });
       });
 
@@ -33,7 +33,7 @@ define([
 
     describe('templateOptionSelected', function() {
       beforeEach(function() {
-        _filterSrv.init( _dashboard );
+        _filterSrv.init( _dashboard.current );
         _filterSrv.addTemplateParameter({ name: 'test' });
         _filterSrv.templateOptionSelected(_filterSrv.templateParameters[0], { value: 'muuuu' });
       });
@@ -45,7 +45,7 @@ define([
 
     describe('timeRange', function() {
       it('should return unparsed when parse is false', function() {
-        _filterSrv.init( _dashboard );
+        _filterSrv.init( _dashboard.current );
         _filterSrv.setTime({from: 'now', to: 'now-1h' });
         var time = _filterSrv.timeRange(false);
         expect(time.from).to.be('now');
@@ -53,7 +53,7 @@ define([
       });
 
       it('should return parsed when parse is true', function() {
-        _filterSrv.init( _dashboard );
+        _filterSrv.init( _dashboard.current );
         _filterSrv.setTime({from: 'now', to: 'now-1h' });
         var time = _filterSrv.timeRange(true);
         expect(_.isDate(time.from)).to.be(true);
@@ -63,7 +63,7 @@ define([
 
     describe('setTime', function() {
       it('should return disable refresh for absolute times', function() {
-        _filterSrv.init( _dashboard );
+        _filterSrv.init( _dashboard.current );
         _dashboard.current.refresh = true;
 
         _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() {
+        _filterSrv.init( _dashboard.current );
         _dashboard.current.refresh = true;
         _filterSrv.setTime({from: '2011-01-01', to: '2015-01-01' });
         expect(_dashboard.current.refresh).to.be(false);