From df33d402853dd6997cbd91df4a32267824ba7580 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 8 Aug 2017 19:04:25 +0100
Subject: [PATCH 1/2] Enable karma-sourcemap-loader

This turns (some) stacktraces back into something useful, so that unpicking
test failures is vaguely tractable
---
 karma.conf.js | 2 +-
 package.json  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/karma.conf.js b/karma.conf.js
index d834987e83..824fd21509 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -84,7 +84,7 @@ module.exports = function (config) {
         // available preprocessors:
         // https://npmjs.org/browse/keyword/karma-preprocessor
         preprocessors: {
-            '{src,test}/**/*.js': ['webpack'],
+            '{src,test}/**/*.js': ['webpack', 'sourcemap'],
         },
 
         // test results reporter to use
diff --git a/package.json b/package.json
index 3f31a3aca5..60ee2aecdf 100644
--- a/package.json
+++ b/package.json
@@ -119,6 +119,7 @@
     "karma-cli": "^0.1.2",
     "karma-junit-reporter": "^0.4.1",
     "karma-mocha": "^0.2.2",
+    "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^1.7.0",
     "matrix-mock-request": "^1.2.0",
     "matrix-react-test-utils": "^0.2.0",

From 06ef674597ec5219dc2e73e0e1d560771a9d10fb Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 8 Aug 2017 19:05:58 +0100
Subject: [PATCH 2/2] Enable fancy karma reporters

cargo-cult luke's stuff from react-sdk
---
 karma.conf.js | 14 ++++++++++++--
 package.json  |  5 ++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/karma.conf.js b/karma.conf.js
index 824fd21509..3b415b1ae6 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -88,9 +88,19 @@ module.exports = function (config) {
         },
 
         // test results reporter to use
-        // possible values: 'dots', 'progress'
         // available reporters: https://npmjs.org/browse/keyword/karma-reporter
-        reporters: ['progress', 'junit'],
+        reporters: ['logcapture', 'spec', 'junit', 'summary'],
+
+        specReporter: {
+            suppressErrorSummary: false, // do print error summary
+            suppressFailed: false, // do print information about failed tests
+            suppressPassed: false, // do print information about passed tests
+            showSpecTiming: true, // print the time elapsed for each spec
+        },
+
+        client: {
+            captureLogs: true,
+        },
 
         // web server port
         port: 9876,
diff --git a/package.json b/package.json
index 60ee2aecdf..bb35ce8990 100644
--- a/package.json
+++ b/package.json
@@ -114,12 +114,15 @@
     "fs-extra": "^0.30.0",
     "html-webpack-plugin": "^2.24.0",
     "json-loader": "^0.5.3",
-    "karma": "^0.13.22",
+    "karma": "^1.7.0",
     "karma-chrome-launcher": "^0.2.3",
     "karma-cli": "^0.1.2",
     "karma-junit-reporter": "^0.4.1",
+    "karma-logcapture-reporter": "0.0.1",
     "karma-mocha": "^0.2.2",
     "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.31",
+    "karma-summary-reporter": "^1.3.3",
     "karma-webpack": "^1.7.0",
     "matrix-mock-request": "^1.2.0",
     "matrix-react-test-utils": "^0.2.0",