Merge branch 'feature/karma-electron' into develop

Author: dweber019

package.json

@@ -115,6 +115,7 @@
     "compression-webpack-plugin": "0.3.2",
     "concurrently": "3.1.0",
     "cross-env": "3.1.3",
+    "electron": "1.4.5",
     "favicons-webpack-plugin": "0.0.7",
     "fs": "0.0.1-security",
     "http-server": "0.9.0",
@@ -123,6 +124,7 @@
     "jasmine-core": "2.5.2",
     "karma": "1.3.0",
     "karma-coverage": "1.1.1",
+    "karma-electron": "^5.1.1",
     "karma-firefox-launcher": "1.0.0",
     "karma-jasmine": "1.0.2",
     "karma-mocha-reporter": "2.2.1",
@@ -131,13 +133,12 @@
     "karma-webpack": "1.8.0",
     "ncp": "^2.0.0",
     "rimraf": "^2.5.4",
-    "typescript": "^2.1",
     "ts-node": "^1.7.0",
+    "typescript": "^2.1",
     "wait-on": "2.0.1",
-    "webpack": "2.1.0-beta.27",
     "wallaby-webpack": "0.0.26",
+    "webpack": "2.1.0-beta.27",
     "webpack-dev-server": ">=2.1.0-beta.0 || ^2.1.0",
-    "webpack-notifier": "1.4.1",
-    "electron": "1.4.5"
+    "webpack-notifier": "1.4.1"
   }
 }

test/karma.conf.js

@@ -88,10 +88,15 @@ module.exports = function(config) {
      * available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
      */
     browsers: [
-      'Firefox',
+      // 'Firefox',
+      'Electron'
       // TODO: https://www.npmjs.com/package/karma-electron
     ],
 
+    client: {
+      useIframe: false
+    },
+
     /*
      * Continuous Integration mode
      * if true, Karma captures browsers, runs the tests and exits