Skip to content

Commit 78dc3af

Browse files
committed
test(karma): Changed config to make it runnable via IDE
1 parent d036d9d commit 78dc3af

File tree

6 files changed

+12
-79
lines changed

6 files changed

+12
-79
lines changed

config/docker-compose.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

config/karma.conf.js

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,14 @@ const path = require('path');
33
const webpackConfig = require('./karma.webpack.config');
44
const snapshotConfig = require('./karma.snapshot.config');
55
const deepmerge = require('deepmerge');
6-
const ip = require('ip');
7-
const ci = require('ci-info');
86

97
process.env.NODE_ENV = 'test';
108
process.env.BABEL_ENV = 'test';
119

12-
const gridUrl = `http://${ci.JENKINS ? 'hub' : 'localhost'}:4444/wd/hub`;
13-
1410
module.exports = function(config) {
11+
const coverage = !!process.argv.find((item) => item === '--coverage');
1512
let coverageConfig = {};
16-
if (config.coverage) {
13+
if (coverage) {
1714
coverageConfig = {
1815
reporters: ['coverage-istanbul'],
1916
coverageIstanbulReporter: {
@@ -23,30 +20,18 @@ module.exports = function(config) {
2320
};
2421
}
2522

26-
const browsers = [];
27-
if (ci.JENKINS || config.useSelenium) {
28-
browsers.push('selenium_chrome');
29-
console.log(`Using Selenium Grid URL: '${gridUrl}'`);
30-
} else {
31-
browsers.push('ChromeHeadless');
32-
}
23+
const browsers = ['ChromeHeadless'];
3324

3425
const finalConfig = deepmerge.all([
35-
webpackConfig(config),
26+
webpackConfig(),
3627
snapshotConfig,
3728
coverageConfig,
3829
{
30+
browserNoActivityTimeout: 20000,
3931
basePath: path.join(PATHS.packages, 'fiori3'),
40-
customLaunchers: {
41-
selenium_chrome: {
42-
base: 'SeleniumGrid',
43-
gridUrl,
44-
browserName: 'chrome'
45-
}
46-
},
4732
browsers,
4833
frameworks: ['mocha', 'chai'],
49-
files: ['test/testRunner.js'],
34+
files: [path.join(PATHS.packages, 'fiori3', 'test', 'testRunner.js')],
5035
preprocessors: {
5136
'test/testRunner.js': ['webpack', 'sourcemap']
5237
},
@@ -56,14 +41,10 @@ module.exports = function(config) {
5641
showDiff: true // Leverage the really good mocha diff
5742
},
5843
port: 9876,
59-
hostname: ip.address(),
60-
listenAddress: ip.address(),
6144
colors: true,
62-
logLevel: config.LOG_INFO,
6345
autoWatch: false,
6446
singleRun: true
6547
}
6648
]);
67-
68-
return finalConfig;
49+
config.set(finalConfig);
6950
};

config/karma.snapshot.config.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@ function snapshotPathResolver(browserName, basePath, suiteName) {
1111
}
1212

1313
module.exports = {
14-
browserNoActivityTimeout: 20000,
1514
frameworks: ['snapshot', 'mocha-snapshot'],
16-
files: ['__karma_snapshots__/**/*.md'],
15+
files: ['__karma_snapshots__/*.md'],
1716
preprocessors: {
18-
'__karma_snapshots__/**/*.md': ['snapshot']
17+
'__karma_snapshots__/*.md': ['snapshot']
1918
},
2019
snapshot: {
2120
update: !!process.env.UPDATE,
22-
prune: true,
21+
prune: !!process.env.PRUNE,
2322
// format: 'indented-md',
2423
pathResolver: snapshotPathResolver.bind(null, 'ChromeHeadless')
2524
}

package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"test": "npm-run-all --sequential test:clean test:jest:coverage test:karma test:combineCoverage",
1414
"test:coveralls": "npm run test && cat ./coverage/lcov.info | coveralls",
1515
"test:clean": "node scripts/test/clean.js",
16-
"test:karma": "cd ./packages/fiori3 && node scripts/test/karma.js --coverage && cd ../../",
16+
"test:karma": "karma start ./config/karma.conf.js --coverage",
1717
"test:jest": "jest --config=config/jest.config.js --env=jsdom",
1818
"test:jest:coverage": "jest --config=config/jest.config.js --env=jsdom --coverage && node scripts/test/renameJestFile.js",
1919
"test:combineCoverage": "nyc report --reporter=html --reporter=clover --reporter=lcov --temp-dir coverage/partial",
@@ -51,7 +51,6 @@
5151
"chai": "^4.2.0",
5252
"chai-karma-snapshot": "^0.8.0",
5353
"chalk": "^2.4.2",
54-
"ci-info": "^2.0.0",
5554
"cli-table": "^0.3.1",
5655
"coveralls": "^3.0.3",
5756
"cross-env": "^5.2.0",
@@ -71,7 +70,6 @@
7170
"gzip-size": "^5.1.0",
7271
"husky": "^2.2.0",
7372
"identity-obj-proxy": "^3.0.0",
74-
"ip": "^1.1.5",
7573
"istanbul-instrumenter-loader": "^3.0.1",
7674
"jest": "^24.8.0",
7775
"jest-canvas-mock": "^2.0.0-beta.1",

packages/fiori3/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
"scripts": {
1313
"generateWebComponents": "ts-node -O '{\"module\": \"commonjs\"}' --type-check -r esm ./scripts/wrapperGeneration/generateWebComponentWrappers --onlyStopForMerge && prettier --write --config ../../prettier.config.js \"src/webComponents/**/*.tsx\"",
1414
"build": "webpack --config ./scripts/wrapperGeneration/webpack.config.js",
15-
"test:karma": "node scripts/test/karma.js",
16-
"test:karma:coverage": "karma start ../../config/karma.conf.js --coverage",
15+
"test:karma": "karma start ../../config/karma.conf.js",
1716
"test:karma:update": "cross-env UPDATE=1 yarn run test:karma"
1817
},
1918
"dependencies": {

packages/fiori3/scripts/test/karma.js

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)