Skip to content

Commit fab4ba2

Browse files
MSNevdyladanvmarchaud
authored
ci: [Bug] Web based karma tests are no longer running #1135 (#1137)
Co-authored-by: Daniel Dyla <[email protected]> Co-authored-by: Valentin Marchaud <[email protected]>
1 parent a93e58b commit fab4ba2

File tree

2 files changed

+7
-29
lines changed

2 files changed

+7
-29
lines changed

karma.conf.js

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Copyright The OpenTelemetry Authors
2+
* Copyright 2020, OpenTelemetry Authors
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -14,29 +14,10 @@
1414
* limitations under the License.
1515
*/
1616

17-
const webpack = require('webpack');
18-
1917
const karmaWebpackConfig = require('../../karma.webpack');
2018
const karmaBaseConfig = require('../../karma.base');
2119

2220
module.exports = (config) => {
23-
{
24-
const plugins = karmaWebpackConfig.plugins = [];
25-
plugins.push(new webpack.ProvidePlugin({
26-
process: 'process/browser',
27-
}));
28-
}
29-
30-
{
31-
const plugins = karmaBaseConfig.plugins = [];
32-
const toAdd = Object.keys(require('./package.json').devDependencies)
33-
.filter((packageName) => packageName.startsWith('karma-'))
34-
.map((packageName) => require(packageName));
35-
plugins.push(
36-
...toAdd
37-
);
38-
}
39-
4021
config.set(Object.assign({}, karmaBaseConfig, {
4122
webpack: karmaWebpackConfig
4223
}))

package.json

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,28 +48,25 @@
4848
"@opentelemetry/api": "^1.0.0"
4949
},
5050
"devDependencies": {
51-
"@jsdevtools/coverage-istanbul-loader": "3.0.5",
5251
"@opentelemetry/api": "^1.0.0",
5352
"@types/mocha": "8.2.3",
5453
"@types/node": "16.11.21",
5554
"@types/webpack-env": "1.16.2",
56-
"assert": "2.0.0",
5755
"gts": "3.1.0",
58-
"karma": "6.3.17",
59-
"karma-chrome-launcher": "3.1.1",
56+
"@jsdevtools/coverage-istanbul-loader": "3.0.5",
57+
"karma": "6.3.16",
58+
"karma-chrome-launcher": "3.1.0",
6059
"karma-coverage-istanbul-reporter": "3.0.3",
6160
"karma-mocha": "2.0.1",
62-
"karma-spec-reporter": "0.0.33",
63-
"karma-webpack": "5.0.0",
61+
"karma-spec-reporter": "0.0.32",
62+
"karma-webpack": "4.0.2",
6463
"mocha": "7.2.0",
6564
"nyc": "15.1.0",
66-
"process": "0.11.10",
6765
"rimraf": "3.0.2",
6866
"ts-loader": "8.3.0",
6967
"ts-mocha": "10.0.0",
7068
"typescript": "4.3.5",
71-
"webpack": "5.72.0",
72-
"webpack-cli": "4.9.2"
69+
"webpack": "4.46.0"
7370
},
7471
"dependencies": {
7572
"@opentelemetry/core": "^1.0.0"

0 commit comments

Comments
 (0)