Merge branch 'main' into avm99963-monorail
Merged commit cd4b3b336f1f14afa02990fdc2eec5d9467a827e
GitOrigin-RevId: e67bbf185d5538e1472bb42e0abb2a141f88bac1
diff --git a/karma.conf.js b/karma.conf.js
index f8117ae..83306fa 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -4,8 +4,6 @@
* license that can be found in the LICENSE file.
*/
-const path = require('path');
-
process.env.CHROME_BIN = require('puppeteer').executablePath();
module.exports = function(config) {
@@ -23,6 +21,8 @@
ui: 'bdd',
checkLeaks: true,
globals: [
+ // Used for submitting Issue Wizard Feedback.
+ 'userfeedback',
'CS_env',
// __tsMonClient probably shouldn't be allowed to
// leak between tests, but locating the current source of these
@@ -62,7 +62,7 @@
// frameworks to use
// available frameworks: https://npmjs.org/browse/keyword/karma-adapter
- frameworks: ['parallel', 'mocha', 'sinon'],
+ frameworks: ['mocha', 'sinon', 'webpack'],
// list of files / patterns to load in the browser
@@ -89,21 +89,12 @@
'karma-coverage',
'karma-mocha',
'karma-mocha-reporter',
- 'karma-parallel',
'karma-sinon',
'karma-sourcemap-loader',
'karma-webpack',
'@chopsui/karma-reporter',
],
- parallelOptions: {
- // Our builder is on a VM with 8 CPUs, so force this
- // to run the same number of shards locally too.
- // Vary this number to stress test order dependencies.
- executors: isDebug ? 1 : 7, // Defaults to cpu-count - 1
- shardStrategy: 'round-robin',
- },
-
webpack: {
// webpack configuration
devtool: 'inline-source-map',