From 31b120331704dbc3d505a454b1ef3931d02f4b28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Mon, 7 Jul 2014 19:04:22 +0200
Subject: [PATCH] fixed failing unit test

---
 src/test/mocks/dashboard-mock.js  | 63 ++++++++++++++++---------------
 src/test/specs/filterSrv-specs.js | 13 +++----
 src/test/test-main.js             |  1 -
 3 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/src/test/mocks/dashboard-mock.js b/src/test/mocks/dashboard-mock.js
index ecc851e9de8..97858ceac23 100644
--- a/src/test/mocks/dashboard-mock.js
+++ b/src/test/mocks/dashboard-mock.js
@@ -5,37 +5,40 @@ define([],
   return {
     create: function() {
       return {
-        refresh: function() {},
-        set_interval: function(value) { this.current.refresh = value; },
+        emit_refresh: function() {},
+        set_interval: function(value) { this.refresh = value; },
 
-        current: {
-          title: "",
-          tags: [],
-          style: "dark",
-          timezone: 'browser',
-          editable: true,
-          failover: false,
-          panel_hints: true,
-          rows: [],
-          pulldowns: [ { type: 'templating' },  { type: 'annotations' } ],
-          nav: [ { type: 'timepicker' } ],
-          services: {},
-          loader: {
-            save_gist: false,
-            save_elasticsearch: true,
-            save_local: true,
-            save_default: true,
-            save_temp: true,
-            save_temp_ttl_enable: true,
-            save_temp_ttl: '30d',
-            load_gist: false,
-            load_elasticsearch: true,
-            load_elasticsearch_size: 20,
-            load_local: false,
-            hide: false
-          },
-          refresh: true
-        }
+        title: "",
+        tags: [],
+        style: "dark",
+        timezone: 'browser',
+        editable: true,
+        failover: false,
+        panel_hints: true,
+        rows: [],
+        pulldowns: [ { type: 'templating' },  { type: 'annotations' } ],
+        nav: [ { type: 'timepicker' } ],
+        services: {
+          filter: {
+            time: {},
+            list: []
+          }
+        },
+        loader: {
+          save_gist: false,
+          save_elasticsearch: true,
+          save_local: true,
+          save_default: true,
+          save_temp: true,
+          save_temp_ttl_enable: true,
+          save_temp_ttl: '30d',
+          load_gist: false,
+          load_elasticsearch: true,
+          load_elasticsearch_size: 20,
+          load_local: false,
+          hide: false
+        },
+        refresh: true
       };
     }
   };
diff --git a/src/test/specs/filterSrv-specs.js b/src/test/specs/filterSrv-specs.js
index 10edcdff31a..66f9bb3e5cc 100644
--- a/src/test/specs/filterSrv-specs.js
+++ b/src/test/specs/filterSrv-specs.js
@@ -12,7 +12,6 @@ define([
     beforeEach(module('kibana.services'));
     beforeEach(module(function($provide){
       _dashboard = dashboardMock.create();
-      $provide.value('dashboard', _dashboard);
     }));
 
     beforeEach(inject(function(filterSrv) {
@@ -20,7 +19,7 @@ define([
     }));
 
     beforeEach(function() {
-      _filterSrv.init(_dashboard.current);
+      _filterSrv.init(_dashboard);
     });
 
     describe('init', function() {
@@ -68,18 +67,18 @@ define([
 
     describe('setTime', function() {
       it('should return disable refresh for absolute times', function() {
-        _dashboard.current.refresh = true;
+        _dashboard.refresh = true;
 
         _filterSrv.setTime({from: '2011-01-01', to: '2015-01-01' });
-        expect(_dashboard.current.refresh).to.be(false);
+        expect(_dashboard.refresh).to.be(false);
       });
 
       it('should restore refresh after relative time range is set', function() {
-        _dashboard.current.refresh = true;
+        _dashboard.refresh = true;
         _filterSrv.setTime({from: '2011-01-01', to: '2015-01-01' });
-        expect(_dashboard.current.refresh).to.be(false);
+        expect(_dashboard.refresh).to.be(false);
         _filterSrv.setTime({from: '2011-01-01', to: 'now' });
-        expect(_dashboard.current.refresh).to.be(true);
+        expect(_dashboard.refresh).to.be(true);
       });
     });
 
diff --git a/src/test/test-main.js b/src/test/test-main.js
index 0056aacf4a1..ef1bf281835 100644
--- a/src/test/test-main.js
+++ b/src/test/test-main.js
@@ -104,7 +104,6 @@ require([
   'angularMocks',
   'jquery',
   'underscore',
-  'elasticjs',
   'bootstrap',
   'angular-sanitize',
   'angular-strap',