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

trying to get more unit tests working

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-05-03 17:00:48 +02:00
parent 8fe4422d21
commit f4568ef589
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/panels/graphite/module.js
View File

@ -19,6 +19,9 @@ define([
'kbn', 'kbn',
'moment', 'moment',
'./timeSeries', './timeSeries',
'services/filterSrv',
'services/annotationsSrv',
'services/datasourceSrv',
'jquery.flot', 'jquery.flot',
'jquery.flot.events', 'jquery.flot.events',
'jquery.flot.selection', 'jquery.flot.selection',

3
src/test/specs/graph-panel-controller-specs.js
View File

@ -1,5 +1,5 @@
/*define([ /*define([
//'services/all' 'panels/graphite/module'
], function() { ], function() {
'use strict'; 'use strict';
@ -26,5 +26,6 @@
}); });
}); });
}); });
}); });
*/ */

12
src/test/test-main.js
View File

@ -26,9 +26,10 @@ require.config({
crypto: '../vendor/crypto.min', crypto: '../vendor/crypto.min',
spectrum: '../vendor/spectrum', spectrum: '../vendor/spectrum',
jquery: '../vendor/jquery/jquery-1.8.0', jquery: '../vendor/jquery/jquery-1.8.0',
bootstrap: '../vendor/bootstrap/bootstrap', bootstrap: '../vendor/bootstrap/bootstrap',
'bootstrap-tagsinput': '../vendor/tagsinput/bootstrap-tagsinput',
'jquery-ui': '../vendor/jquery/jquery-ui-1.10.3', 'jquery-ui': '../vendor/jquery/jquery-ui-1.10.3',
@ -94,6 +95,9 @@ require.config({
'bindonce': ['angular'], 'bindonce': ['angular'],
'angular-strap': ['angular', 'bootstrap','timepicker', 'datepicker'], 'angular-strap': ['angular', 'bootstrap','timepicker', 'datepicker'],
'bootstrap-tagsinput': ['jquery'],
timepicker: ['jquery', 'bootstrap'], timepicker: ['jquery', 'bootstrap'],
datepicker: ['jquery', 'bootstrap'], datepicker: ['jquery', 'bootstrap'],
@ -118,13 +122,15 @@ require([
angular.module('kibana', []); angular.module('kibana', []);
angular.module('kibana.services', ['$strap.directives']); angular.module('kibana.services', ['$strap.directives']);
angular.module('kibana.panels', []);
angular.module('kibana.filters', []);
require([ require([
'specs/lexer-specs', 'specs/lexer-specs',
'specs/parser-specs', 'specs/parser-specs',
'specs/gfunc-specs', 'specs/gfunc-specs',
'specs/filterSrv-specs', 'specs/filterSrv-specs',
'specs/kbn-format-specs' 'specs/kbn-format-specs',
], function () { ], function () {
window.__karma__.start(); window.__karma__.start();
}); });