From 9cf6c84013507ca42a3e76ac0975e210192f6965 Mon Sep 17 00:00:00 2001
From: Hannu Hartikainen <hannu.hartikainen@gmail.com>
Date: Tue, 8 Dec 2015 23:42:20 +0200
Subject: [PATCH] update karma and install some dependencies; fixes #696

---
 package.json | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 32f913d..cb05efc 100644
--- a/package.json
+++ b/package.json
@@ -6,33 +6,31 @@
   "repository": "https://github.com/glowing-bear/glowing-bear",
   "license": "GPLv3",
   "devDependencies": {
-    "karma": "~0.10",
-    "protractor": "~0.20.1",
-    "http-server": "^0.6.1",
     "bower": "^1.3.1",
-    "shelljs": "^0.2.6",
+    "http-server": "^0.6.1",
+    "jasmine-core": "^2.4.1",
     "jshint": "^2.5.2",
+    "karma": "~0.13",
+    "karma-jasmine": "^0.3.6",
     "karma-junit-reporter": "^0.2.2",
+    "karma-phantomjs-launcher": "^0.2.1",
+    "phantomjs": "^1.9.19",
+    "protractor": "~0.20.1",
+    "shelljs": "^0.2.6",
     "uglify-js": "^2.4"
   },
   "scripts": {
     "postinstall": "bower install",
-
     "minify": " uglifyjs js/localstorage.js js/weechat.js js/irc-utils.js js/glowingbear.js js/settings.js js/utils.js js/notifications.js js/filters.js js/handlers.js js/connection.js js/inputbar.js js/plugin-directive.js js/websockets.js js/models.js js/plugins.js -c -m --screw-ie8 -o min.js --source-map min.map",
-
     "prestart": "npm install",
     "start": "http-server -a localhost -p 8000",
-
     "pretest": "npm install",
     "test": "karma start test/karma.conf.js",
     "test-single-run": "karma start test/karma.conf.js  --single-run",
-
     "preupdate-webdriver": "npm install",
     "update-webdriver": "webdriver-manager update",
-
     "preprotractor": "npm run update-webdriver",
     "protractor": "protractor test/protractor-conf.js",
-
     "update-index-async": "node -e \"require('shelljs/global'); sed('-i', /\\/\\/@@NG_LOADER_START@@[\\s\\S]*\\/\\/@@NG_LOADER_END@@/, '//@@NG_LOADER_START@@\\n' + cat('app/bower_components/angular-loader/angular-loader.min.js') + '\\n//@@NG_LOADER_END@@', 'app/index-async.html');\""
   }
 }