From 7c66f0d74920089e43dd549cb373784706748ba0 Mon Sep 17 00:00:00 2001
From: Tim Buckley <timothy.jas.buckley@hp.com>
Date: Mon, 3 Aug 2015 15:16:26 -0600
Subject: [PATCH] Minor adjustments to karma config and npm packages

---
 karma.conf.js | 10 ++++++++--
 package.json  |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/karma.conf.js b/karma.conf.js
index d996584..fec1688 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -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'
         ],
 
 
diff --git a/package.json b/package.json
index 398bd0e..de6460c 100644
--- a/package.json
+++ b/package.json
@@ -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"
   },