From a767fd957701db4292917db4df3a9adf1e3da832 Mon Sep 17 00:00:00 2001
From: Nico Rehwaldt <nico.rehwaldt@camunda.com>
Date: Thu, 12 Mar 2020 11:29:03 +0100
Subject: [PATCH] test(project): remove legacy CI hacks

---
 test/config/karma.distro.js | 33 +++++-----------------------
 test/config/karma.unit.js   | 43 +++++++++----------------------------
 2 files changed, 15 insertions(+), 61 deletions(-)

diff --git a/test/config/karma.distro.js b/test/config/karma.distro.js
index fc2582f2..bed3d370 100644
--- a/test/config/karma.distro.js
+++ b/test/config/karma.distro.js
@@ -2,28 +2,16 @@
 
 // configures browsers to run test against
 // any of [ 'ChromeHeadless', 'Chrome', 'Firefox', 'IE', 'PhantomJS' ]
-var browsers =
-  (process.env.TEST_BROWSERS || 'PhantomJS')
-    .replace(/^\s+|\s+$/, '')
-    .split(/\s*,\s*/g)
-    .map(function(browser) {
-      if (browser === 'ChromeHeadless') {
-        process.env.CHROME_BIN = require('puppeteer').executablePath();
-
-        // workaround https://github.com/GoogleChrome/puppeteer/issues/290
-        if (process.platform === 'linux') {
-          return 'ChromeHeadless_Linux';
-        }
-      }
-
-      return browser;
-    });
+var browsers = (process.env.TEST_BROWSERS || 'PhantomJS').split(',');
 
+// use puppeteer provided Chrome for testing
+process.env.CHROME_BIN = require('puppeteer').executablePath();
 
 var VARIANT = process.env.VARIANT;
 
 var NODE_ENV = process.env.NODE_ENV;
 
+
 module.exports = function(karma) {
   karma.set({
 
@@ -46,18 +34,7 @@ module.exports = function(karma) {
 
     reporters: [ 'progress' ],
 
-    customLaunchers: {
-      ChromeHeadless_Linux: {
-        base: 'ChromeHeadless',
-        flags: [
-          '--no-sandbox',
-          '--disable-setuid-sandbox'
-        ],
-        debug: true
-      }
-    },
-
-    browsers: browsers,
+    browsers,
 
     browserNoActivityTimeout: 30000,
 
diff --git a/test/config/karma.unit.js b/test/config/karma.unit.js
index d8a99b82..d4f66c7d 100644
--- a/test/config/karma.unit.js
+++ b/test/config/karma.unit.js
@@ -1,31 +1,19 @@
-var coverage = process.env.COVERAGE;
+/* global process */
 
 var path = require('path');
 
-var basePath = '../../';
-
-var absoluteBasePath = path.resolve(path.join(__dirname, basePath));
-
-/* global process */
+var coverage = process.env.COVERAGE;
 
 // configures browsers to run test against
 // any of [ 'ChromeHeadless', 'Chrome', 'Firefox', 'IE', 'PhantomJS' ]
-var browsers =
-  (process.env.TEST_BROWSERS || 'PhantomJS')
-    .replace(/^\s+|\s+$/, '')
-    .split(/\s*,\s*/g)
-    .map(function(browser) {
-      if (browser === 'ChromeHeadless') {
-        process.env.CHROME_BIN = require('puppeteer').executablePath();
+var browsers = (process.env.TEST_BROWSERS || 'PhantomJS').split(',');
 
-        // workaround https://github.com/GoogleChrome/puppeteer/issues/290
-        if (process.platform === 'linux') {
-          return 'ChromeHeadless_Linux';
-        }
-      }
+// use puppeteer provided Chrome for testing
+process.env.CHROME_BIN = require('puppeteer').executablePath();
 
-      return browser;
-    });
+var basePath = '../..';
+
+var absoluteBasePath = path.resolve(path.join(__dirname, basePath));
 
 var suite = coverage ? 'test/coverageBundle.js' : 'test/testBundle.js';
 
@@ -33,7 +21,7 @@ var suite = coverage ? 'test/coverageBundle.js' : 'test/testBundle.js';
 module.exports = function(karma) {
   karma.set({
 
-    basePath: basePath,
+    basePath,
 
     frameworks: [
       'mocha',
@@ -50,24 +38,13 @@ module.exports = function(karma) {
 
     reporters: [ 'progress' ].concat(coverage ? 'coverage' : []),
 
-    customLaunchers: {
-      ChromeHeadless_Linux: {
-        base: 'ChromeHeadless',
-        flags: [
-          '--no-sandbox',
-          '--disable-setuid-sandbox'
-        ],
-        debug: true
-      }
-    },
-
     coverageReporter: {
       reporters: [
         { type: 'lcov', subdir: '.' }
       ]
     },
 
-    browsers: browsers,
+    browsers,
 
     browserNoActivityTimeout: 30000,