From 29b54d663803c73f5521a484ffba0182b24b3f89 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Tue, 4 Nov 2014 14:01:25 +0000
Subject: Update karma.conf.js to A: actually run the tests, and B: generate
 JUnit XML.

---
 webclient/test/karma.conf.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'webclient/test')

diff --git a/webclient/test/karma.conf.js b/webclient/test/karma.conf.js
index 22c4eaaafa..df63ae8267 100644
--- a/webclient/test/karma.conf.js
+++ b/webclient/test/karma.conf.js
@@ -23,6 +23,8 @@ module.exports = function(config) {
       '../js/angular-animate.js',
       '../js/angular-sanitize.js',
       '../js/ng-infinite-scroll-matrix.js',
+      '../js/ui-bootstrap*',
+      '../js/elastic.js',  
       '../login/**/*.*',
       '../room/**/*.*',
       '../components/**/*.*',
@@ -35,6 +37,11 @@ module.exports = function(config) {
       './unit/**/*.js'
     ],
 
+    plugins: [
+        'karma-*',
+        require('./node_modules/karma-junit-reporter')
+    ],
+
 
     // list of files to exclude
     exclude: [
@@ -50,8 +57,11 @@ module.exports = function(config) {
     // test results reporter to use
     // possible values: 'dots', 'progress'
     // available reporters: https://npmjs.org/browse/keyword/karma-reporter
-    reporters: ['progress'],
-
+    reporters: ['progress', 'junit'],
+    junitReporter: {
+        outputFile: 'test-results.xml',
+        suite: ''
+    },
 
     // web server port
     port: 9876,
@@ -77,6 +87,6 @@ module.exports = function(config) {
 
     // Continuous Integration mode
     // if true, Karma captures browsers, runs the tests and exits
-    singleRun: false
+    singleRun: true
   });
 };
-- 
cgit 1.4.1