From d8cf427425886f34df0fb707f7187e4d02c4d37c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 23 Mar 2014 07:03:25 +0100 Subject: [PATCH] more work on filterSrv unit tests --- src/test/specs/filterSrv-specs.js | 2 +- src/test/specs/graphiteTargetCtrl-specs.js | 37 +--------------------- tasks/options/karma.js | 7 +++- 3 files changed, 8 insertions(+), 38 deletions(-) diff --git a/src/test/specs/filterSrv-specs.js b/src/test/specs/filterSrv-specs.js index f4a38065abd..bfd5faf3329 100644 --- a/src/test/specs/filterSrv-specs.js +++ b/src/test/specs/filterSrv-specs.js @@ -28,7 +28,7 @@ define([ }); }); - describe.only('filterOptionSelected', function() { + describe('filterOptionSelected', function() { beforeEach(function() { _filterSrv.add({ name: 'test' }); _filterSrv.filterOptionSelected(_filterSrv.list[0], { value: 'muuuu' }); diff --git a/src/test/specs/graphiteTargetCtrl-specs.js b/src/test/specs/graphiteTargetCtrl-specs.js index f4a38065abd..8516438a210 100644 --- a/src/test/specs/graphiteTargetCtrl-specs.js +++ b/src/test/specs/graphiteTargetCtrl-specs.js @@ -4,7 +4,7 @@ define([ 'services/filterSrv' ], function(dashboardMock, _) { - describe('filterSrv', function() { + describe('graphiteTargetCtrl', function() { var _filterSrv; beforeEach(module('kibana.services')); @@ -21,40 +21,5 @@ define([ _filterSrv.add({ name: 'test', current: { value: 'oogle' } }); _filterSrv.init(); }); - - it('should initialize template data', function() { - var target = _filterSrv.applyFilterToTarget('this.[[test]].filters'); - expect(target).to.be('this.oogle.filters'); - }); }); - - describe.only('filterOptionSelected', function() { - beforeEach(function() { - _filterSrv.add({ name: 'test' }); - _filterSrv.filterOptionSelected(_filterSrv.list[0], { value: 'muuuu' }); - }); - it('should set current value and update template data', function() { - var target = _filterSrv.applyFilterToTarget('this.[[test]].filters'); - expect(target).to.be('this.muuuu.filters'); - }); - }); - - describe('timeRange', function() { - it('should return unparsed when parse is false', function() { - _filterSrv.setTime({from: 'now', to: 'now-1h' }); - var time = _filterSrv.timeRange(false); - expect(time.from).to.be('now'); - expect(time.to).to.be('now-1h'); - }); - - it('should return parsed when parse is true', function() { - _filterSrv.setTime({from: 'now', to: 'now-1h' }); - var time = _filterSrv.timeRange(true); - expect(_.isDate(time.from)).to.be(true); - expect(_.isDate(time.to)).to.be(true); - }); - }); - - }); - }); diff --git a/tasks/options/karma.js b/tasks/options/karma.js index 39f93b5be08..67fce60144e 100644 --- a/tasks/options/karma.js +++ b/tasks/options/karma.js @@ -3,6 +3,11 @@ module.exports = function(config) { dev: { configFile: 'src/test/karma.conf.js', singleRun: false, + browsers: ['PhantomJS'] + }, + debug: { + configFile: 'src/test/karma.conf.js', + singleRun: true, browsers: ['Chrome'] }, test: { @@ -11,4 +16,4 @@ module.exports = function(config) { browsers: ['PhantomJS'] } }; -}; \ No newline at end of file +};