Merge pull request #5179 from opf/housekeeping/karma

Update karma

frontend/modules/run-karma.js

@@ -44,7 +44,9 @@ function runKarma(successCallback, errorCallback) {
     process.exit(exitCode);
   };
 
-  karma.server.start(settings, callback);
+
+  var server = new karma.Server(settings, callback);
+  server.start();
 }
 
 module.exports = runKarma;

frontend/package.json

@@ -7,8 +7,8 @@
     "chai": "^3.5.0",
     "chai-as-promised": "^5.3.0",
     "exec": "0.0.6",
-    "json2htmlcov": "~0.1.1",
     "jquery-mockjax": "~2.2.1",
+    "json2htmlcov": "~0.1.1",
     "karma": "~0.12.3",
     "karma-chai": "~0.1.0",
     "karma-chai-as-promised": "^0.1.2",
@@ -17,7 +17,7 @@
     "karma-coverage": "^0.2.3",
     "karma-firefox-launcher": "~0.1.3",
     "karma-junit-reporter": "~0.2.2",
-    "karma-mocha": "~0.1.3",
+    "karma-mocha": "^1.3.0",
     "karma-ng-html2js-preprocessor": "^0.1.2",
     "karma-phantomjs-launcher": "~1.0.2",
     "mocha": "~1.18.2",
@@ -36,13 +36,13 @@
     "angular-aria": "~1.5.9",
     "angular-busy": "~4.1.1",
     "angular-cache": "~4.6.0",
-    "angular-context-menu": "opf/angular-context-menu#a908eccaec323cd66973d58af4965694bdff16a1",
+    "angular-context-menu": "github:opf/angular-context-menu#a908eccaec323cd66973d58af4965694bdff16a1",
     "angular-dragula": "~1.2.8",
     "angular-elastic": "2.5.0",
     "angular-i18n": "~1.3.0",
-    "angular-modal": "finnlabs/angular-modal#d45eb9ceb720b8785613ba89ba0f14f8ab197569",
+    "angular-modal": "github:finnlabs/angular-modal#d45eb9ceb720b8785613ba89ba0f14f8ab197569",
     "angular-sanitize": "~1.3.14",
-    "angular-truncate": "sparkalow/angular-truncate#fdf60fda265042d12e9414b5354b2cc52f1419de",
+    "angular-truncate": "github:sparkalow/angular-truncate#fdf60fda265042d12e9414b5354b2cc52f1419de",
     "angular-ui-bootstrap": "^2.2.0",
     "angular-ui-router": "~0.3.1",
     "atoa": "^1.0.0",
@@ -67,6 +67,7 @@
     "jquery-ujs": "^1.2.2",
     "jquery.caret": "^0.3.1",
     "json5": "^0.5.0",
+    "karma": "^1.4.1",
     "lodash": "^2.4.2",
     "moment": "~2.10.6",
     "moment-timezone": "0.4.x",