@git.zone/tstest 1.0.96 ā 1.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist_ts/00_commitinfo_data.js +2 -2
- package/dist_ts/index.d.ts +5 -0
- package/dist_ts/index.js +61 -4
- package/dist_ts/tstest.classes.tap.combinator.d.ts +3 -0
- package/dist_ts/tstest.classes.tap.combinator.js +14 -40
- package/dist_ts/tstest.classes.tap.parser.d.ts +3 -1
- package/dist_ts/tstest.classes.tap.parser.js +42 -18
- package/dist_ts/tstest.classes.tap.testresult.d.ts +1 -1
- package/dist_ts/tstest.classes.testdirectory.d.ts +9 -7
- package/dist_ts/tstest.classes.testdirectory.js +47 -8
- package/dist_ts/tstest.classes.tstest.d.ts +8 -3
- package/dist_ts/tstest.classes.tstest.js +35 -34
- package/dist_ts/tstest.logging.d.ts +48 -0
- package/dist_ts/tstest.logging.js +228 -0
- package/package.json +12 -12
- package/readme.plan.md +199 -0
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/index.ts +65 -3
- package/ts/tstest.classes.tap.combinator.ts +19 -41
- package/ts/tstest.classes.tap.parser.ts +44 -47
- package/ts/tstest.classes.testdirectory.ts +59 -14
- package/ts/tstest.classes.tstest.ts +42 -36
- package/ts/tstest.logging.ts +285 -0
|
@@ -5,8 +5,10 @@ import { coloredString as cs } from '@push.rocks/consolecolor';
|
|
|
5
5
|
import { TestDirectory } from './tstest.classes.testdirectory.js';
|
|
6
6
|
import { TapCombinator } from './tstest.classes.tap.combinator.js';
|
|
7
7
|
import { TapParser } from './tstest.classes.tap.parser.js';
|
|
8
|
+
import { TestExecutionMode } from './index.js';
|
|
9
|
+
import { TsTestLogger } from './tstest.logging.js';
|
|
8
10
|
export class TsTest {
|
|
9
|
-
constructor(cwdArg,
|
|
11
|
+
constructor(cwdArg, testPathArg, executionModeArg, logOptions = {}) {
|
|
10
12
|
this.smartshellInstance = new plugins.smartshell.Smartshell({
|
|
11
13
|
executor: 'bash',
|
|
12
14
|
pathDirectories: [paths.binDirectory],
|
|
@@ -14,54 +16,47 @@ export class TsTest {
|
|
|
14
16
|
});
|
|
15
17
|
this.smartbrowserInstance = new plugins.smartbrowser.SmartBrowser();
|
|
16
18
|
this.tsbundleInstance = new plugins.tsbundle.TsBundle();
|
|
17
|
-
this.
|
|
19
|
+
this.executionMode = executionModeArg;
|
|
20
|
+
this.testDir = new TestDirectory(cwdArg, testPathArg, executionModeArg);
|
|
21
|
+
this.logger = new TsTestLogger(logOptions);
|
|
18
22
|
}
|
|
19
23
|
async run() {
|
|
20
24
|
const fileNamesToRun = await this.testDir.getTestFilePathArray();
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
console.log(`${logPrefixes.TsTestPrefix} ${cs(fileName, 'orange')}`);
|
|
26
|
-
}
|
|
27
|
-
console.log('-'.repeat(48));
|
|
28
|
-
console.log(''); // force new line
|
|
29
|
-
const tapCombinator = new TapCombinator(); // lets create the TapCombinator
|
|
25
|
+
// Log test discovery
|
|
26
|
+
this.logger.testDiscovery(fileNamesToRun.length, this.testDir.testPath, this.executionMode);
|
|
27
|
+
const tapCombinator = new TapCombinator(this.logger); // lets create the TapCombinator
|
|
28
|
+
let fileIndex = 0;
|
|
30
29
|
for (const fileNameArg of fileNamesToRun) {
|
|
30
|
+
fileIndex++;
|
|
31
31
|
switch (true) {
|
|
32
32
|
case process.env.CI && fileNameArg.includes('.nonci.'):
|
|
33
|
-
|
|
34
|
-
console.log(`not running testfile ${fileNameArg}, since we are CI and file name includes '.nonci.' tag`);
|
|
35
|
-
console.log('!!!!!!!!!!!');
|
|
33
|
+
this.logger.tapOutput(`Skipping ${fileNameArg} - marked as non-CI`);
|
|
36
34
|
break;
|
|
37
35
|
case fileNameArg.endsWith('.browser.ts') || fileNameArg.endsWith('.browser.nonci.ts'):
|
|
38
|
-
const tapParserBrowser = await this.runInChrome(fileNameArg);
|
|
36
|
+
const tapParserBrowser = await this.runInChrome(fileNameArg, fileIndex, fileNamesToRun.length);
|
|
39
37
|
tapCombinator.addTapParser(tapParserBrowser);
|
|
40
38
|
break;
|
|
41
39
|
case fileNameArg.endsWith('.both.ts') || fileNameArg.endsWith('.both.nonci.ts'):
|
|
42
|
-
|
|
43
|
-
const tapParserBothBrowser = await this.runInChrome(fileNameArg);
|
|
40
|
+
this.logger.sectionStart('Part 1: Chrome');
|
|
41
|
+
const tapParserBothBrowser = await this.runInChrome(fileNameArg, fileIndex, fileNamesToRun.length);
|
|
44
42
|
tapCombinator.addTapParser(tapParserBothBrowser);
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
const tapParserBothNode = await this.runInNode(fileNameArg);
|
|
43
|
+
this.logger.sectionEnd();
|
|
44
|
+
this.logger.sectionStart('Part 2: Node');
|
|
45
|
+
const tapParserBothNode = await this.runInNode(fileNameArg, fileIndex, fileNamesToRun.length);
|
|
49
46
|
tapCombinator.addTapParser(tapParserBothNode);
|
|
47
|
+
this.logger.sectionEnd();
|
|
50
48
|
break;
|
|
51
49
|
default:
|
|
52
|
-
const tapParserNode = await this.runInNode(fileNameArg);
|
|
50
|
+
const tapParserNode = await this.runInNode(fileNameArg, fileIndex, fileNamesToRun.length);
|
|
53
51
|
tapCombinator.addTapParser(tapParserNode);
|
|
54
52
|
break;
|
|
55
53
|
}
|
|
56
|
-
console.log(cs(`^`.repeat(16), 'cyan'));
|
|
57
|
-
console.log(''); // force new line
|
|
58
54
|
}
|
|
59
55
|
tapCombinator.evaluate();
|
|
60
56
|
}
|
|
61
|
-
async runInNode(fileNameArg) {
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
const tapParser = new TapParser(fileNameArg + ':node');
|
|
57
|
+
async runInNode(fileNameArg, index, total) {
|
|
58
|
+
this.logger.testFileStart(fileNameArg, 'node.js', index, total);
|
|
59
|
+
const tapParser = new TapParser(fileNameArg + ':node', this.logger);
|
|
65
60
|
// tsrun options
|
|
66
61
|
let tsrunOptions = '';
|
|
67
62
|
if (process.argv.includes('--web')) {
|
|
@@ -71,9 +66,8 @@ export class TsTest {
|
|
|
71
66
|
await tapParser.handleTapProcess(execResultStreaming.childProcess);
|
|
72
67
|
return tapParser;
|
|
73
68
|
}
|
|
74
|
-
async runInChrome(fileNameArg) {
|
|
75
|
-
|
|
76
|
-
console.log(`${cs(`= `.repeat(32), 'cyan')}`);
|
|
69
|
+
async runInChrome(fileNameArg, index, total) {
|
|
70
|
+
this.logger.testFileStart(fileNameArg, 'chromium', index, total);
|
|
77
71
|
// lets get all our paths sorted
|
|
78
72
|
const tsbundleCacheDirPath = plugins.path.join(paths.cwd, './.nogit/tstest_cache');
|
|
79
73
|
const bundleFileName = fileNameArg.replace('/', '__') + '.js';
|
|
@@ -105,11 +99,18 @@ export class TsTest {
|
|
|
105
99
|
server.addRoute('*', new plugins.typedserver.servertools.HandlerStatic(tsbundleCacheDirPath));
|
|
106
100
|
await server.start();
|
|
107
101
|
// lets handle realtime comms
|
|
108
|
-
const tapParser = new TapParser(fileNameArg + ':chrome');
|
|
102
|
+
const tapParser = new TapParser(fileNameArg + ':chrome', this.logger);
|
|
109
103
|
const wss = new plugins.ws.WebSocketServer({ port: 8080 });
|
|
110
104
|
wss.on('connection', (ws) => {
|
|
111
105
|
ws.on('message', (message) => {
|
|
112
|
-
|
|
106
|
+
const messageStr = message.toString();
|
|
107
|
+
if (messageStr.startsWith('console:')) {
|
|
108
|
+
const [, level, ...messageParts] = messageStr.split(':');
|
|
109
|
+
this.logger.browserConsole(messageParts.join(':'), level);
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
tapParser.handleTapLog(messageStr);
|
|
113
|
+
}
|
|
113
114
|
});
|
|
114
115
|
});
|
|
115
116
|
// lets do the browser bit
|
|
@@ -176,4 +177,4 @@ export class TsTest {
|
|
|
176
177
|
}
|
|
177
178
|
async runInDeno() { }
|
|
178
179
|
}
|
|
179
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tstest.classes.tstest.js","sourceRoot":"","sources":["../ts/tstest.classes.tstest.ts"],"names":[],"mappings":"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"}
|
|
180
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tstest.classes.tstest.js","sourceRoot":"","sources":["../ts/tstest.classes.tstest.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
export interface LogOptions {
|
|
2
|
+
quiet?: boolean;
|
|
3
|
+
verbose?: boolean;
|
|
4
|
+
noColor?: boolean;
|
|
5
|
+
json?: boolean;
|
|
6
|
+
logFile?: string;
|
|
7
|
+
}
|
|
8
|
+
export interface TestFileResult {
|
|
9
|
+
file: string;
|
|
10
|
+
passed: number;
|
|
11
|
+
failed: number;
|
|
12
|
+
total: number;
|
|
13
|
+
duration: number;
|
|
14
|
+
tests: Array<{
|
|
15
|
+
name: string;
|
|
16
|
+
passed: boolean;
|
|
17
|
+
duration: number;
|
|
18
|
+
error?: string;
|
|
19
|
+
}>;
|
|
20
|
+
}
|
|
21
|
+
export interface TestSummary {
|
|
22
|
+
totalFiles: number;
|
|
23
|
+
totalTests: number;
|
|
24
|
+
totalPassed: number;
|
|
25
|
+
totalFailed: number;
|
|
26
|
+
totalDuration: number;
|
|
27
|
+
fileResults: TestFileResult[];
|
|
28
|
+
}
|
|
29
|
+
export declare class TsTestLogger {
|
|
30
|
+
private options;
|
|
31
|
+
private startTime;
|
|
32
|
+
private fileResults;
|
|
33
|
+
private currentFileResult;
|
|
34
|
+
constructor(options?: LogOptions);
|
|
35
|
+
private format;
|
|
36
|
+
private log;
|
|
37
|
+
sectionStart(title: string): void;
|
|
38
|
+
sectionEnd(): void;
|
|
39
|
+
progress(current: number, total: number, message: string): void;
|
|
40
|
+
testDiscovery(count: number, pattern: string, executionMode: string): void;
|
|
41
|
+
testFileStart(filename: string, runtime: string, index: number, total: number): void;
|
|
42
|
+
testResult(testName: string, passed: boolean, duration: number, error?: string): void;
|
|
43
|
+
testFileEnd(passed: number, failed: number, duration: number): void;
|
|
44
|
+
tapOutput(message: string, isError?: boolean): void;
|
|
45
|
+
browserConsole(message: string, level?: string): void;
|
|
46
|
+
summary(): void;
|
|
47
|
+
error(message: string, file?: string, stack?: string): void;
|
|
48
|
+
}
|
|
@@ -0,0 +1,228 @@
|
|
|
1
|
+
import { coloredString as cs } from '@push.rocks/consolecolor';
|
|
2
|
+
import * as plugins from './tstest.plugins.js';
|
|
3
|
+
export class TsTestLogger {
|
|
4
|
+
constructor(options = {}) {
|
|
5
|
+
this.fileResults = [];
|
|
6
|
+
this.currentFileResult = null;
|
|
7
|
+
this.options = options;
|
|
8
|
+
this.startTime = Date.now();
|
|
9
|
+
}
|
|
10
|
+
format(text, color) {
|
|
11
|
+
if (this.options.noColor || !color) {
|
|
12
|
+
return text;
|
|
13
|
+
}
|
|
14
|
+
return cs(text, color);
|
|
15
|
+
}
|
|
16
|
+
log(message) {
|
|
17
|
+
if (this.options.json)
|
|
18
|
+
return;
|
|
19
|
+
console.log(message);
|
|
20
|
+
if (this.options.logFile) {
|
|
21
|
+
// TODO: Implement file logging
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
// Section separators
|
|
25
|
+
sectionStart(title) {
|
|
26
|
+
if (this.options.quiet || this.options.json)
|
|
27
|
+
return;
|
|
28
|
+
this.log(this.format(`\nāāā ${title} āāā`, 'cyan'));
|
|
29
|
+
}
|
|
30
|
+
sectionEnd() {
|
|
31
|
+
if (this.options.quiet || this.options.json)
|
|
32
|
+
return;
|
|
33
|
+
this.log(this.format('ā'.repeat(50), 'dim'));
|
|
34
|
+
}
|
|
35
|
+
// Progress indication
|
|
36
|
+
progress(current, total, message) {
|
|
37
|
+
if (this.options.quiet || this.options.json)
|
|
38
|
+
return;
|
|
39
|
+
const percentage = Math.round((current / total) * 100);
|
|
40
|
+
const filled = Math.round((current / total) * 20);
|
|
41
|
+
const empty = 20 - filled;
|
|
42
|
+
this.log(this.format(`\nš Progress: ${current}/${total} (${percentage}%)`, 'cyan'));
|
|
43
|
+
this.log(this.format(`[${'ā'.repeat(filled)}${'ā'.repeat(empty)}] ${message}`, 'dim'));
|
|
44
|
+
}
|
|
45
|
+
// Test discovery
|
|
46
|
+
testDiscovery(count, pattern, executionMode) {
|
|
47
|
+
if (this.options.json) {
|
|
48
|
+
console.log(JSON.stringify({ event: 'discovery', count, pattern, executionMode }));
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
if (this.options.quiet) {
|
|
52
|
+
this.log(`Found ${count} tests`);
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
this.log(this.format(`\nš Test Discovery`, 'bold'));
|
|
56
|
+
this.log(this.format(` Mode: ${executionMode}`, 'dim'));
|
|
57
|
+
this.log(this.format(` Pattern: ${pattern}`, 'dim'));
|
|
58
|
+
this.log(this.format(` Found: ${count} test file(s)`, 'green'));
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
// Test execution
|
|
62
|
+
testFileStart(filename, runtime, index, total) {
|
|
63
|
+
this.currentFileResult = {
|
|
64
|
+
file: filename,
|
|
65
|
+
passed: 0,
|
|
66
|
+
failed: 0,
|
|
67
|
+
total: 0,
|
|
68
|
+
duration: 0,
|
|
69
|
+
tests: []
|
|
70
|
+
};
|
|
71
|
+
if (this.options.json) {
|
|
72
|
+
console.log(JSON.stringify({ event: 'fileStart', filename, runtime, index, total }));
|
|
73
|
+
return;
|
|
74
|
+
}
|
|
75
|
+
if (this.options.quiet)
|
|
76
|
+
return;
|
|
77
|
+
this.log(this.format(`\nā¶ļø ${filename} (${index}/${total})`, 'blue'));
|
|
78
|
+
this.log(this.format(` Runtime: ${runtime}`, 'dim'));
|
|
79
|
+
}
|
|
80
|
+
testResult(testName, passed, duration, error) {
|
|
81
|
+
if (this.currentFileResult) {
|
|
82
|
+
this.currentFileResult.tests.push({ name: testName, passed, duration, error });
|
|
83
|
+
this.currentFileResult.total++;
|
|
84
|
+
if (passed) {
|
|
85
|
+
this.currentFileResult.passed++;
|
|
86
|
+
}
|
|
87
|
+
else {
|
|
88
|
+
this.currentFileResult.failed++;
|
|
89
|
+
}
|
|
90
|
+
this.currentFileResult.duration += duration;
|
|
91
|
+
}
|
|
92
|
+
if (this.options.json) {
|
|
93
|
+
console.log(JSON.stringify({ event: 'testResult', testName, passed, duration, error }));
|
|
94
|
+
return;
|
|
95
|
+
}
|
|
96
|
+
const icon = passed ? 'ā
' : 'ā';
|
|
97
|
+
const color = passed ? 'green' : 'red';
|
|
98
|
+
if (this.options.quiet) {
|
|
99
|
+
this.log(`${icon} ${testName}`);
|
|
100
|
+
}
|
|
101
|
+
else {
|
|
102
|
+
this.log(this.format(` ${icon} ${testName} (${duration}ms)`, color));
|
|
103
|
+
if (error && !passed) {
|
|
104
|
+
this.log(this.format(` ${error}`, 'red'));
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
testFileEnd(passed, failed, duration) {
|
|
109
|
+
if (this.currentFileResult) {
|
|
110
|
+
this.fileResults.push(this.currentFileResult);
|
|
111
|
+
this.currentFileResult = null;
|
|
112
|
+
}
|
|
113
|
+
if (this.options.json) {
|
|
114
|
+
console.log(JSON.stringify({ event: 'fileEnd', passed, failed, duration }));
|
|
115
|
+
return;
|
|
116
|
+
}
|
|
117
|
+
if (!this.options.quiet) {
|
|
118
|
+
const total = passed + failed;
|
|
119
|
+
const status = failed === 0 ? 'PASSED' : 'FAILED';
|
|
120
|
+
const color = failed === 0 ? 'green' : 'red';
|
|
121
|
+
this.log(this.format(` Summary: ${passed}/${total} ${status}`, color));
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
// TAP output forwarding
|
|
125
|
+
tapOutput(message, isError = false) {
|
|
126
|
+
if (this.options.json)
|
|
127
|
+
return;
|
|
128
|
+
if (this.options.verbose || isError) {
|
|
129
|
+
const prefix = isError ? ' ā ļø ' : ' ';
|
|
130
|
+
const color = isError ? 'red' : 'dim';
|
|
131
|
+
this.log(this.format(`${prefix}${message}`, color));
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
// Browser console
|
|
135
|
+
browserConsole(message, level = 'log') {
|
|
136
|
+
if (this.options.json) {
|
|
137
|
+
console.log(JSON.stringify({ event: 'browserConsole', message, level }));
|
|
138
|
+
return;
|
|
139
|
+
}
|
|
140
|
+
if (!this.options.quiet) {
|
|
141
|
+
const prefix = level === 'error' ? 'šā' : 'š';
|
|
142
|
+
const color = level === 'error' ? 'red' : 'magenta';
|
|
143
|
+
this.log(this.format(` ${prefix} ${message}`, color));
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
// Final summary
|
|
147
|
+
summary() {
|
|
148
|
+
const totalDuration = Date.now() - this.startTime;
|
|
149
|
+
const summary = {
|
|
150
|
+
totalFiles: this.fileResults.length,
|
|
151
|
+
totalTests: this.fileResults.reduce((sum, r) => sum + r.total, 0),
|
|
152
|
+
totalPassed: this.fileResults.reduce((sum, r) => sum + r.passed, 0),
|
|
153
|
+
totalFailed: this.fileResults.reduce((sum, r) => sum + r.failed, 0),
|
|
154
|
+
totalDuration,
|
|
155
|
+
fileResults: this.fileResults
|
|
156
|
+
};
|
|
157
|
+
if (this.options.json) {
|
|
158
|
+
console.log(JSON.stringify({ event: 'summary', summary }));
|
|
159
|
+
return;
|
|
160
|
+
}
|
|
161
|
+
if (this.options.quiet) {
|
|
162
|
+
const status = summary.totalFailed === 0 ? 'PASSED' : 'FAILED';
|
|
163
|
+
this.log(`\nSummary: ${summary.totalPassed}/${summary.totalTests} | ${totalDuration}ms | ${status}`);
|
|
164
|
+
return;
|
|
165
|
+
}
|
|
166
|
+
// Detailed summary
|
|
167
|
+
this.log(this.format('\nš Test Summary', 'bold'));
|
|
168
|
+
this.log(this.format('āāāāāāāāāāāāāāāāāāāāāāāāāāāāāāāāāā', 'dim'));
|
|
169
|
+
this.log(this.format(`ā Total Files: ${summary.totalFiles.toString().padStart(14)} ā`, 'white'));
|
|
170
|
+
this.log(this.format(`ā Total Tests: ${summary.totalTests.toString().padStart(14)} ā`, 'white'));
|
|
171
|
+
this.log(this.format(`ā Passed: ${summary.totalPassed.toString().padStart(14)} ā`, 'green'));
|
|
172
|
+
this.log(this.format(`ā Failed: ${summary.totalFailed.toString().padStart(14)} ā`, summary.totalFailed > 0 ? 'red' : 'green'));
|
|
173
|
+
this.log(this.format(`ā Duration: ${totalDuration.toString().padStart(14)}ms ā`, 'white'));
|
|
174
|
+
this.log(this.format('āāāāāāāāāāāāāāāāāāāāāāāāāāāāāāāāāā', 'dim'));
|
|
175
|
+
// File results
|
|
176
|
+
if (summary.totalFailed > 0) {
|
|
177
|
+
this.log(this.format('\nā Failed Tests:', 'red'));
|
|
178
|
+
this.fileResults.forEach(fileResult => {
|
|
179
|
+
if (fileResult.failed > 0) {
|
|
180
|
+
this.log(this.format(`\n ${fileResult.file}`, 'yellow'));
|
|
181
|
+
fileResult.tests.filter(t => !t.passed).forEach(test => {
|
|
182
|
+
this.log(this.format(` ā ${test.name}`, 'red'));
|
|
183
|
+
if (test.error) {
|
|
184
|
+
this.log(this.format(` ${test.error}`, 'dim'));
|
|
185
|
+
}
|
|
186
|
+
});
|
|
187
|
+
}
|
|
188
|
+
});
|
|
189
|
+
}
|
|
190
|
+
// Performance metrics
|
|
191
|
+
if (this.options.verbose) {
|
|
192
|
+
const avgDuration = Math.round(totalDuration / summary.totalTests);
|
|
193
|
+
const slowestTest = this.fileResults
|
|
194
|
+
.flatMap(r => r.tests)
|
|
195
|
+
.sort((a, b) => b.duration - a.duration)[0];
|
|
196
|
+
this.log(this.format('\nā±ļø Performance Metrics:', 'cyan'));
|
|
197
|
+
this.log(this.format(` Average per test: ${avgDuration}ms`, 'white'));
|
|
198
|
+
if (slowestTest) {
|
|
199
|
+
this.log(this.format(` Slowest test: ${slowestTest.name} (${slowestTest.duration}ms)`, 'yellow'));
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
// Final status
|
|
203
|
+
const status = summary.totalFailed === 0 ? 'ALL TESTS PASSED! š' : 'SOME TESTS FAILED! ā';
|
|
204
|
+
const statusColor = summary.totalFailed === 0 ? 'green' : 'red';
|
|
205
|
+
this.log(this.format(`\n${status}`, statusColor));
|
|
206
|
+
}
|
|
207
|
+
// Error display
|
|
208
|
+
error(message, file, stack) {
|
|
209
|
+
if (this.options.json) {
|
|
210
|
+
console.log(JSON.stringify({ event: 'error', message, file, stack }));
|
|
211
|
+
return;
|
|
212
|
+
}
|
|
213
|
+
if (this.options.quiet) {
|
|
214
|
+
console.error(`ERROR: ${message}`);
|
|
215
|
+
}
|
|
216
|
+
else {
|
|
217
|
+
this.log(this.format('\nā ļø Error', 'red'));
|
|
218
|
+
if (file)
|
|
219
|
+
this.log(this.format(` File: ${file}`, 'yellow'));
|
|
220
|
+
this.log(this.format(` ${message}`, 'red'));
|
|
221
|
+
if (stack && this.options.verbose) {
|
|
222
|
+
this.log(this.format(` Stack:`, 'dim'));
|
|
223
|
+
this.log(this.format(stack.split('\n').map(line => ` ${line}`).join('\n'), 'dim'));
|
|
224
|
+
}
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tstest.logging.js","sourceRoot":"","sources":["../ts/tstest.logging.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@git.zone/tstest",
|
|
3
|
-
"version": "1.0
|
|
3
|
+
"version": "1.2.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "a test utility to run tests that match test/**/*.ts",
|
|
6
6
|
"main": "dist_ts/index.js",
|
|
@@ -12,24 +12,24 @@
|
|
|
12
12
|
"tstest": "./cli.js"
|
|
13
13
|
},
|
|
14
14
|
"devDependencies": {
|
|
15
|
-
"@git.zone/tsbuild": "^2.
|
|
16
|
-
"@types/node": "^22.
|
|
15
|
+
"@git.zone/tsbuild": "^2.5.1",
|
|
16
|
+
"@types/node": "^22.15.18"
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@api.global/typedserver": "^3.0.
|
|
20
|
-
"@git.zone/tsbundle": "^2.
|
|
19
|
+
"@api.global/typedserver": "^3.0.74",
|
|
20
|
+
"@git.zone/tsbundle": "^2.2.5",
|
|
21
21
|
"@git.zone/tsrun": "^1.3.3",
|
|
22
22
|
"@push.rocks/consolecolor": "^2.0.2",
|
|
23
23
|
"@push.rocks/smartbrowser": "^2.0.8",
|
|
24
24
|
"@push.rocks/smartdelay": "^3.0.5",
|
|
25
|
-
"@push.rocks/smartfile": "^11.
|
|
26
|
-
"@push.rocks/smartlog": "^3.0.
|
|
27
|
-
"@push.rocks/smartpromise": "^4.2.
|
|
28
|
-
"@push.rocks/smartshell": "^3.2.
|
|
29
|
-
"@push.rocks/tapbundle": "^
|
|
30
|
-
"@types/ws": "^8.
|
|
25
|
+
"@push.rocks/smartfile": "^11.2.0",
|
|
26
|
+
"@push.rocks/smartlog": "^3.0.9",
|
|
27
|
+
"@push.rocks/smartpromise": "^4.2.3",
|
|
28
|
+
"@push.rocks/smartshell": "^3.2.3",
|
|
29
|
+
"@push.rocks/tapbundle": "^6.0.3",
|
|
30
|
+
"@types/ws": "^8.18.1",
|
|
31
31
|
"figures": "^6.1.0",
|
|
32
|
-
"ws": "^8.18.
|
|
32
|
+
"ws": "^8.18.2"
|
|
33
33
|
},
|
|
34
34
|
"files": [
|
|
35
35
|
"ts/**/*",
|