Skip to content
This repository was archived by the owner on Jul 29, 2024. It is now read-only.

Commit f2b6b49

Browse files
abhijeethpcnishina
authored andcommitted
chore(cleanup): fix lints and removes unnecessary assignment (#5184)
- fixed unused assignment in runner cli - convert switch to conditional in launcher
1 parent 8d05098 commit f2b6b49

File tree

2 files changed

+46
-49
lines changed

2 files changed

+46
-49
lines changed

lib/launcher.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ class TaskResults {
5555
let processFailures = this.totalProcessFailures();
5656
this.results_.forEach((result: any) => {
5757
let capabilities = result.capabilities;
58-
let shortName = (capabilities.browserName) ? capabilities.browserName : '';
59-
shortName = (capabilities.logName) ?
58+
let shortName = (capabilities.logName) ?
6059
capabilities.logName :
6160
(capabilities.browserName) ? capabilities.browserName : '';
6261
shortName += (capabilities.version) ? capabilities.version : '';

lib/runnerCli.ts

Lines changed: 45 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -10,52 +10,50 @@ import {Runner} from './runner';
1010
let logger = new Logger('runnerCli');
1111

1212
process.on('message', (m: any) => {
13-
switch (m.command) {
14-
case 'run':
15-
if (!m.capabilities) {
16-
throw new Error('Run message missing capabilities');
17-
}
18-
// Merge in config file options.
19-
let configParser = new ConfigParser();
20-
if (m.configFile) {
21-
configParser.addFileConfig(m.configFile);
22-
}
23-
if (m.additionalConfig) {
24-
configParser.addConfig(m.additionalConfig);
25-
}
26-
let config = configParser.getConfig();
27-
Logger.set(config);
28-
29-
// Grab capabilities to run from launcher.
30-
config.capabilities = m.capabilities;
31-
32-
// Get specs to be executed by this runner
33-
config.specs = m.specs;
34-
35-
// Launch test run.
36-
let runner = new Runner(config);
37-
38-
// Pipe events back to the launcher.
39-
runner.on('testPass', () => {
40-
process.send({event: 'testPass'});
41-
});
42-
runner.on('testFail', () => {
43-
process.send({event: 'testFail'});
44-
});
45-
runner.on('testsDone', (results: any) => {
46-
process.send({event: 'testsDone', results: results});
47-
});
48-
49-
runner.run()
50-
.then((exitCode: number) => {
51-
process.exit(exitCode);
52-
})
53-
.catch((err: Error) => {
54-
logger.info(err.message);
55-
process.exit(1);
56-
});
57-
break;
58-
default:
59-
throw new Error('command ' + m.command + ' is invalid');
13+
if (m.command === 'run') {
14+
if (!m.capabilities) {
15+
throw new Error('Run message missing capabilities');
16+
}
17+
// Merge in config file options.
18+
let configParser = new ConfigParser();
19+
if (m.configFile) {
20+
configParser.addFileConfig(m.configFile);
21+
}
22+
if (m.additionalConfig) {
23+
configParser.addConfig(m.additionalConfig);
24+
}
25+
let config = configParser.getConfig();
26+
Logger.set(config);
27+
28+
// Grab capabilities to run from launcher.
29+
config.capabilities = m.capabilities;
30+
31+
// Get specs to be executed by this runner
32+
config.specs = m.specs;
33+
34+
// Launch test run.
35+
let runner = new Runner(config);
36+
37+
// Pipe events back to the launcher.
38+
runner.on('testPass', () => {
39+
process.send({event: 'testPass'});
40+
});
41+
runner.on('testFail', () => {
42+
process.send({event: 'testFail'});
43+
});
44+
runner.on('testsDone', (results: any) => {
45+
process.send({event: 'testsDone', results: results});
46+
});
47+
48+
runner.run()
49+
.then((exitCode: number) => {
50+
process.exit(exitCode);
51+
})
52+
.catch((err: Error) => {
53+
logger.info(err.message);
54+
process.exit(1);
55+
});
56+
} else {
57+
throw new Error('command ' + m.command + ' is invalid');
6058
}
6159
});

0 commit comments

Comments
 (0)