Minor adjustments to karma config and npm packages

This commit is contained in:
Tim Buckley 2015-08-03 15:16:26 -06:00
parent 2eec3431ae
commit 7c66f0d749
2 changed files with 9 additions and 3 deletions

View File

@ -4,7 +4,7 @@
module.exports = function(config) {
config.set({
// base path that will be used to resolve all patterns (eg. files, exclude)
basePath: 'stackviz/static/js/',
basePath: 'stackviz/static/',
// frameworks to use
@ -14,7 +14,13 @@ module.exports = function(config) {
// list of files / patterns to load in the browser
files: [
'**/*.js'
'components/jquery/dist/jquery.js',
'components/datatables/media/js/jquery.dataTables.js',
'components/bootstrap/dist/js/bootstrap.js',
'components/metisMenu/dist/metisMenu.js',
'components/d3/d3.js',
'js/**/*.js',
'tests/**/*.js'
],

View File

@ -15,7 +15,7 @@
"karma-chrome-launcher": "0.1.8",
"karma-cli": "0.0.4",
"karma-coverage": "0.3.1",
"karma-jasmine": "0.3.5",
"karma-jasmine": "^0.3.6",
"karma-phantomjs-launcher": "0.2.0",
"phantomjs": "1.9.17"
},