1 files changed, 6 insertions, 12 deletions
diff --git a/config/karma.config.js b/config/karma.config.js
index 2f571978e08..7ede745b591 100644
--- a/config/karma.config.js
+++ b/config/karma.config.js
@@ -5,9 +5,10 @@ var ROOT_PATH = path.resolve(__dirname, '..');
 
 // remove problematic plugins
 if (webpackConfig.plugins) {
-  webpackConfig.plugins = webpackConfig.plugins.filter(function (plugin) {
+  webpackConfig.plugins = webpackConfig.plugins.filter(function(plugin) {
     return !(
       plugin instanceof webpack.optimize.CommonsChunkPlugin ||
+      plugin instanceof webpack.optimize.ModuleConcatenationPlugin ||
       plugin instanceof webpack.DefinePlugin
     );
   });
@@ -17,6 +18,8 @@ webpackConfig.devtool = 'cheap-inline-source-map';
 
 // Karma configuration
 module.exports = function(config) {
+  process.env.TZ = 'Etc/UTC';
+
   var progressReporter = process.env.CI ? 'mocha' : 'progress';
 
   var karmaConfig = {
@@ -31,7 +34,7 @@ module.exports = function(config) {
           // escalated kernel privileges (e.g. docker run --cap-add=CAP_SYS_ADMIN)
           '--no-sandbox',
         ],
-      }
+      },
     },
     frameworks: ['jasmine'],
     files: [
@@ -52,7 +55,7 @@ module.exports = function(config) {
       reports: ['html', 'text-summary'],
       dir: 'coverage-javascript/',
       subdir: '.',
-      fixWebpackSourcePaths: true
+      fixWebpackSourcePaths: true,
     };
     karmaConfig.browserNoActivityTimeout = 60000; // 60 seconds
   }
@@ -66,14 +69,5 @@ module.exports = function(config) {
     karmaConfig.customLaunchers.ChromeHeadlessCustom.flags.push('--enable-logging', '--v=1');
   }
 
-  if (process.env.DEBUG) {
-    karmaConfig.logLevel = config.LOG_DEBUG;
-    process.env.CHROME_LOG_FILE = process.env.CHROME_LOG_FILE || 'chrome_debug.log';
-  }
-
-  if (process.env.CHROME_LOG_FILE) {
-    karmaConfig.customLaunchers.ChromeHeadlessCustom.flags.push('--enable-logging', '--v=1');
-  }
-
   config.set(karmaConfig);
 };