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

develop: fixed more broken tests, couple still failing

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-09-07 15:21:26 +02:00
parent a38ded9e7e
commit 6ed1b084ce
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
public/test/test-main.js
View File

@ -42,6 +42,9 @@
"jquery.flot.gauge": "vendor/flot/jquery.flot.gauge", "jquery.flot.gauge": "vendor/flot/jquery.flot.gauge",
"d3": "vendor/d3/d3.js", "d3": "vendor/d3/d3.js",
"jquery.flot.dashes": "vendor/flot/jquery.flot.dashes", "jquery.flot.dashes": "vendor/flot/jquery.flot.dashes",
"jquery-ui": "vendor/jquery-ui/custom.js",
"gridstack": "vendor/npm/gridstack/dist/gridstack.js",
"gridstack.jquery-ui": "vendor/npm/gridstack/dist/gridstack.jQueryUI.js",
"ace": "vendor/npm/ace-builds/src-noconflict/ace", "ace": "vendor/npm/ace-builds/src-noconflict/ace",
}, },
@ -58,6 +61,18 @@
}, },
meta: { meta: {
'vendor/npm/jquery-ui/jquery-ui.js': {
format: 'amd',
deps: ['jquery'],
},
'vendor/npm/gridstack/dist/gridstack.js': {
format: 'global',
deps: ['jquery', 'jquery-ui', 'lodash'],
},
"vendor/npm/gridstack/dist/gridstack.jQueryUI.js": {
format: 'global',
deps: ['gridstack'],
},
'vendor/angular/angular.js': { 'vendor/angular/angular.js': {
format: 'global', format: 'global',
deps: ['jquery'], deps: ['jquery'],
@ -84,7 +99,7 @@
function file2moduleName(filePath) { function file2moduleName(filePath) {
return filePath.replace(/\\/g, '/') return filePath.replace(/\\/g, '/')
.replace(/^\/base\//, '') .replace(/^\/base\//, '')
.replace(/\.\w*$/, ''); .replace(/\.\w*$/, '');
} }
@ -113,12 +128,12 @@
// load specs // load specs
return Promise.all( return Promise.all(
Object.keys(window.__karma__.files) // All files served by Karma. Object.keys(window.__karma__.files) // All files served by Karma.
.filter(onlySpecFiles) .filter(onlySpecFiles)
.map(file2moduleName) .map(file2moduleName)
.map(function(path) { .map(function(path) {
// console.log(path); // console.log(path);
return System.import(path); return System.import(path);
})); }));
}).then(function() { }).then(function() {
window.__karma__.start(); window.__karma__.start();
}, function(error) { }, function(error) {