From d6d7d9d549d8322837262846740a792b78e9f199 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul@snyman.info>
Date: Mon, 26 Aug 2019 14:35:49 -0700
Subject: [PATCH 1/5] Move to Chromium for JS tests

---
 karma.conf.js | 2 +-
 package.json  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/karma.conf.js b/karma.conf.js
index 0ba1a1c45..58a43f55e 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -60,7 +60,7 @@ module.exports = function(config) {
 
     // start these browsers
     // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-    browsers: ["Firefox"],
+    browsers: ["Chromium"],
 
     // Continuous Integration mode
     // if true, Karma captures browsers, runs the tests and exits
diff --git a/package.json b/package.json
index c5ab381d4..3515aaa38 100644
--- a/package.json
+++ b/package.json
@@ -9,9 +9,10 @@
   "dependencies": {
     "jasmine-core": "^2.6.4",
     "karma": "^3.1.4",
+    "karma-chrome-launcher": "^3.1.0",
     "karma-coverage": "^1.1.2",
-    "karma-jasmine": "^1.1.0",
     "karma-firefox-launcher": "^1.2.0",
+    "karma-jasmine": "^1.1.0",
     "karma-log-reporter": "0.0.4"
   },
   "scripts": {

From 24b1620da925e221aa3aa770c9947407d05f9bef Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul@snyman.info>
Date: Mon, 26 Aug 2019 14:47:44 -0700
Subject: [PATCH 2/5] Streamline some config for KarmaJS to see if we can
 figure out why it is hanging in Jenkins

---
 karma.conf.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/karma.conf.js b/karma.conf.js
index 58a43f55e..099ced84f 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -26,7 +26,7 @@ module.exports = function(config) {
       // source files, that you wanna generate coverage for 
       // do not include tests or libraries 
       // (these files will be instrumented by Istanbul) 
-      "display.js": ["coverage"]
+      // "display.js": ["coverage"]
     },
 
     // test results reporter to use
@@ -35,10 +35,10 @@ module.exports = function(config) {
     reporters: ["progress", "coverage"],
 
     // configure the coverateReporter 
-    coverageReporter: {
+    /* coverageReporter: {
       type : "html",
       dir : "htmlcov/"
-    },
+    }, */
 
     // web server port
     port: 9876,
@@ -64,7 +64,7 @@ module.exports = function(config) {
 
     // Continuous Integration mode
     // if true, Karma captures browsers, runs the tests and exits
-    singleRun: false,
+    singleRun: true,
 
     // Concurrency level
     // how many browser should be started simultaneous

From 02e7235fd93549655fe9e9c0221dd152c02f7302 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul@snyman.info>
Date: Mon, 26 Aug 2019 14:57:18 -0700
Subject: [PATCH 3/5] Change to reporters suggested by Karma

---
 karma.conf.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/karma.conf.js b/karma.conf.js
index 099ced84f..fe4578a1f 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -32,13 +32,16 @@ module.exports = function(config) {
     // test results reporter to use
     // possible values: "dots", "progress"
     // available reporters: https://npmjs.org/browse/keyword/karma-reporter
-    reporters: ["progress", "coverage"],
+    reporters: ["dots", "junit"],
 
     // configure the coverateReporter 
     /* coverageReporter: {
       type : "html",
       dir : "htmlcov/"
     }, */
+    junitReporter: {
+      outputFile: "test-results.xml"
+    }
 
     // web server port
     port: 9876,

From d69b031e54e7e135d1093a2653098206255c7ea3 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul@snyman.info>
Date: Mon, 26 Aug 2019 15:06:12 -0700
Subject: [PATCH 4/5] sdist build wasn't including the Karma config *facepalm*

---
 MANIFEST.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MANIFEST.in b/MANIFEST.in
index 35544222d..7d49455e8 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -17,3 +17,4 @@ include LICENSE
 include README.txt
 include openlp/.version
 include package.json
+include karma.conf.js

From 12b0852d14dc78c9974b26e0a27a3a2f18ed9481 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul@snyman.info>
Date: Mon, 26 Aug 2019 15:16:45 -0700
Subject: [PATCH 5/5] Fix syntax error in karma config and add junit reporter

---
 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 fe4578a1f..3c8adea3d 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -41,7 +41,7 @@ module.exports = function(config) {
     }, */
     junitReporter: {
       outputFile: "test-results.xml"
-    }
+    },
 
     // web server port
     port: 9876,
diff --git a/package.json b/package.json
index 3515aaa38..cb989407f 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     "karma-coverage": "^1.1.2",
     "karma-firefox-launcher": "^1.2.0",
     "karma-jasmine": "^1.1.0",
+    "karma-junit-reporter": "^1.2.0",
     "karma-log-reporter": "0.0.4"
   },
   "scripts": {