@git.zone/tstest 1.5.0 → 1.8.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 +1 -1
- package/dist_ts/index.js +9 -2
- package/dist_ts/tstest.classes.tap.parser.d.ts +4 -0
- package/dist_ts/tstest.classes.tap.parser.js +114 -24
- package/dist_ts/tstest.classes.testdirectory.d.ts +10 -0
- package/dist_ts/tstest.classes.testdirectory.js +31 -1
- package/dist_ts/tstest.classes.tstest.d.ts +3 -1
- package/dist_ts/tstest.classes.tstest.js +52 -27
- package/dist_ts_tapbundle/index.d.ts +1 -0
- package/dist_ts_tapbundle/index.js +2 -1
- package/dist_ts_tapbundle/tapbundle.classes.tap.d.ts +54 -1
- package/dist_ts_tapbundle/tapbundle.classes.tap.js +288 -24
- package/dist_ts_tapbundle/tapbundle.classes.taptest.d.ts +7 -1
- package/dist_ts_tapbundle/tapbundle.classes.taptest.js +75 -27
- package/dist_ts_tapbundle/tapbundle.classes.taptools.d.ts +81 -1
- package/dist_ts_tapbundle/tapbundle.classes.taptools.js +180 -2
- package/dist_ts_tapbundle/ts_tapbundle/00_commitinfo_data.d.ts +8 -0
- package/dist_ts_tapbundle/ts_tapbundle/00_commitinfo_data.js +9 -0
- package/dist_ts_tapbundle/ts_tapbundle/index.d.ts +6 -0
- package/dist_ts_tapbundle/ts_tapbundle/index.js +7 -0
- package/dist_ts_tapbundle/ts_tapbundle/tapbundle.classes.pretask.d.ts +10 -0
- package/dist_ts_tapbundle/ts_tapbundle/tapbundle.classes.pretask.js +13 -0
- package/dist_ts_tapbundle/ts_tapbundle/tapbundle.classes.tap.d.ts +104 -0
- package/dist_ts_tapbundle/ts_tapbundle/tapbundle.classes.tap.js +401 -0
- package/dist_ts_tapbundle/ts_tapbundle/tapbundle.classes.taptest.d.ts +38 -0
- package/dist_ts_tapbundle/ts_tapbundle/tapbundle.classes.taptest.js +110 -0
- package/dist_ts_tapbundle/ts_tapbundle/tapbundle.classes.taptools.d.ts +109 -0
- package/dist_ts_tapbundle/ts_tapbundle/tapbundle.classes.taptools.js +241 -0
- package/dist_ts_tapbundle/ts_tapbundle/tapbundle.classes.tapwrap.d.ts +8 -0
- package/dist_ts_tapbundle/ts_tapbundle/tapbundle.classes.tapwrap.js +7 -0
- package/dist_ts_tapbundle/ts_tapbundle/tapbundle.plugins.d.ts +8 -0
- package/dist_ts_tapbundle/ts_tapbundle/tapbundle.plugins.js +10 -0
- package/dist_ts_tapbundle/ts_tapbundle/tapbundle.tapcreator.d.ts +3 -0
- package/dist_ts_tapbundle/ts_tapbundle/tapbundle.tapcreator.js +5 -0
- package/dist_ts_tapbundle/ts_tapbundle/webhelpers.d.ts +7 -0
- package/dist_ts_tapbundle/ts_tapbundle/webhelpers.js +35 -0
- package/dist_ts_tapbundle/ts_tapbundle_node/classes.pathinject.d.ts +5 -0
- package/dist_ts_tapbundle/ts_tapbundle_node/classes.pathinject.js +13 -0
- package/dist_ts_tapbundle/ts_tapbundle_node/plugins.d.ts +11 -0
- package/dist_ts_tapbundle/ts_tapbundle_node/plugins.js +14 -0
- package/dist_ts_tapbundle_node/ts_tapbundle/tapbundle.classes.taptest.d.ts +38 -0
- package/dist_ts_tapbundle_node/ts_tapbundle/tapbundle.classes.taptest.js +110 -0
- package/dist_ts_tapbundle_node/ts_tapbundle/tapbundle.classes.taptools.d.ts +109 -0
- package/dist_ts_tapbundle_node/ts_tapbundle/tapbundle.classes.taptools.js +241 -0
- package/dist_ts_tapbundle_node/ts_tapbundle/tapbundle.plugins.d.ts +8 -0
- package/dist_ts_tapbundle_node/ts_tapbundle/tapbundle.plugins.js +10 -0
- package/dist_ts_tapbundle_node/ts_tapbundle/tapbundle.tapcreator.d.ts +3 -0
- package/dist_ts_tapbundle_node/ts_tapbundle/tapbundle.tapcreator.js +5 -0
- package/dist_ts_tapbundle_node/ts_tapbundle_node/classes.pathinject.d.ts +5 -0
- package/dist_ts_tapbundle_node/ts_tapbundle_node/classes.pathinject.js +13 -0
- package/dist_ts_tapbundle_node/ts_tapbundle_node/classes.tapnodetools.d.ts +25 -0
- package/dist_ts_tapbundle_node/ts_tapbundle_node/classes.tapnodetools.js +81 -0
- package/dist_ts_tapbundle_node/ts_tapbundle_node/classes.testfileprovider.d.ts +6 -0
- package/dist_ts_tapbundle_node/ts_tapbundle_node/classes.testfileprovider.js +16 -0
- package/dist_ts_tapbundle_node/ts_tapbundle_node/index.d.ts +2 -0
- package/dist_ts_tapbundle_node/ts_tapbundle_node/index.js +3 -0
- package/dist_ts_tapbundle_node/ts_tapbundle_node/paths.d.ts +2 -0
- package/dist_ts_tapbundle_node/ts_tapbundle_node/paths.js +4 -0
- package/dist_ts_tapbundle_node/ts_tapbundle_node/plugins.d.ts +11 -0
- package/dist_ts_tapbundle_node/ts_tapbundle_node/plugins.js +14 -0
- package/package.json +11 -8
- package/readme.md +141 -0
- package/readme.plan.md +253 -30
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/index.ts +8 -1
- package/ts/tstest.classes.tap.parser.ts +111 -25
- package/ts/tstest.classes.testdirectory.ts +39 -0
- package/ts/tstest.classes.tstest.ts +61 -27
|
@@ -1,6 +1,36 @@
|
|
|
1
1
|
import { type IPreTaskFunction } from './tapbundle.classes.pretask.js';
|
|
2
2
|
import { TapTest, type ITestFunction } from './tapbundle.classes.taptest.js';
|
|
3
|
+
export interface ITestSuite {
|
|
4
|
+
description: string;
|
|
5
|
+
tests: TapTest<any>[];
|
|
6
|
+
beforeEach?: ITestFunction<any>;
|
|
7
|
+
afterEach?: ITestFunction<any>;
|
|
8
|
+
parent?: ITestSuite;
|
|
9
|
+
children: ITestSuite[];
|
|
10
|
+
}
|
|
11
|
+
declare class TestBuilder<T> {
|
|
12
|
+
private _tap;
|
|
13
|
+
private _tags;
|
|
14
|
+
private _priority;
|
|
15
|
+
private _retryCount?;
|
|
16
|
+
private _timeoutMs?;
|
|
17
|
+
constructor(tap: Tap<T>);
|
|
18
|
+
tags(...tags: string[]): this;
|
|
19
|
+
priority(level: 'high' | 'medium' | 'low'): this;
|
|
20
|
+
retry(count: number): this;
|
|
21
|
+
timeout(ms: number): this;
|
|
22
|
+
test(description: string, testFunction: ITestFunction<T>): TapTest<T>;
|
|
23
|
+
testOnly(description: string, testFunction: ITestFunction<T>): TapTest<T>;
|
|
24
|
+
testSkip(description: string, testFunction: ITestFunction<T>): TapTest<T>;
|
|
25
|
+
}
|
|
3
26
|
export declare class Tap<T> {
|
|
27
|
+
private _skipCount;
|
|
28
|
+
private _filterTags;
|
|
29
|
+
constructor();
|
|
30
|
+
tags(...tags: string[]): TestBuilder<T>;
|
|
31
|
+
priority(level: 'high' | 'medium' | 'low'): TestBuilder<T>;
|
|
32
|
+
retry(count: number): TestBuilder<T>;
|
|
33
|
+
timeout(ms: number): TestBuilder<T>;
|
|
4
34
|
/**
|
|
5
35
|
* skips a test
|
|
6
36
|
* tests marked with tap.skip.test() are never executed
|
|
@@ -18,6 +48,8 @@ export declare class Tap<T> {
|
|
|
18
48
|
private _tapPreTasks;
|
|
19
49
|
private _tapTests;
|
|
20
50
|
private _tapTestsOnly;
|
|
51
|
+
private _currentSuite;
|
|
52
|
+
private _rootSuites;
|
|
21
53
|
/**
|
|
22
54
|
* Normal test function, will run one by one
|
|
23
55
|
* @param testDescription - A description of what the test does
|
|
@@ -31,12 +63,32 @@ export declare class Tap<T> {
|
|
|
31
63
|
* @param testFunction - A Function that returns a Promise and resolves or rejects
|
|
32
64
|
*/
|
|
33
65
|
testParallel(testDescription: string, testFunction: ITestFunction<T>): void;
|
|
66
|
+
/**
|
|
67
|
+
* Create a test suite for grouping related tests
|
|
68
|
+
*/
|
|
69
|
+
describe(description: string, suiteFunction: () => void): void;
|
|
70
|
+
/**
|
|
71
|
+
* Set up a function to run before each test in the current suite
|
|
72
|
+
*/
|
|
73
|
+
beforeEach(setupFunction: ITestFunction<any>): void;
|
|
74
|
+
/**
|
|
75
|
+
* Set up a function to run after each test in the current suite
|
|
76
|
+
*/
|
|
77
|
+
afterEach(teardownFunction: ITestFunction<any>): void;
|
|
78
|
+
/**
|
|
79
|
+
* collect all tests from suites
|
|
80
|
+
*/
|
|
81
|
+
private _collectTests;
|
|
34
82
|
/**
|
|
35
83
|
* starts the test evaluation
|
|
36
84
|
*/
|
|
37
85
|
start(optionsArg?: {
|
|
38
86
|
throwOnError: boolean;
|
|
39
87
|
}): Promise<void>;
|
|
88
|
+
/**
|
|
89
|
+
* Run tests in a suite with lifecycle hooks
|
|
90
|
+
*/
|
|
91
|
+
private _runSuite;
|
|
40
92
|
stopForcefully(codeArg?: number, directArg?: boolean): Promise<void>;
|
|
41
93
|
/**
|
|
42
94
|
* handle errors
|
|
@@ -48,4 +100,5 @@ export declare class Tap<T> {
|
|
|
48
100
|
*/
|
|
49
101
|
fail(message?: string): never;
|
|
50
102
|
}
|
|
51
|
-
export declare
|
|
103
|
+
export declare const tap: Tap<unknown>;
|
|
104
|
+
export {};
|
|
@@ -1,8 +1,78 @@
|
|
|
1
1
|
import * as plugins from './tapbundle.plugins.js';
|
|
2
2
|
import { PreTask } from './tapbundle.classes.pretask.js';
|
|
3
3
|
import { TapTest } from './tapbundle.classes.taptest.js';
|
|
4
|
+
class TestBuilder {
|
|
5
|
+
constructor(tap) {
|
|
6
|
+
this._tags = [];
|
|
7
|
+
this._priority = 'medium';
|
|
8
|
+
this._tap = tap;
|
|
9
|
+
}
|
|
10
|
+
tags(...tags) {
|
|
11
|
+
this._tags = tags;
|
|
12
|
+
return this;
|
|
13
|
+
}
|
|
14
|
+
priority(level) {
|
|
15
|
+
this._priority = level;
|
|
16
|
+
return this;
|
|
17
|
+
}
|
|
18
|
+
retry(count) {
|
|
19
|
+
this._retryCount = count;
|
|
20
|
+
return this;
|
|
21
|
+
}
|
|
22
|
+
timeout(ms) {
|
|
23
|
+
this._timeoutMs = ms;
|
|
24
|
+
return this;
|
|
25
|
+
}
|
|
26
|
+
test(description, testFunction) {
|
|
27
|
+
const test = this._tap.test(description, testFunction, 'normal');
|
|
28
|
+
// Apply settings to the test
|
|
29
|
+
if (this._tags.length > 0) {
|
|
30
|
+
test.tags = this._tags;
|
|
31
|
+
}
|
|
32
|
+
test.priority = this._priority;
|
|
33
|
+
if (this._retryCount !== undefined) {
|
|
34
|
+
test.tapTools.retry(this._retryCount);
|
|
35
|
+
}
|
|
36
|
+
if (this._timeoutMs !== undefined) {
|
|
37
|
+
test.timeoutMs = this._timeoutMs;
|
|
38
|
+
}
|
|
39
|
+
return test;
|
|
40
|
+
}
|
|
41
|
+
testOnly(description, testFunction) {
|
|
42
|
+
const test = this._tap.test(description, testFunction, 'only');
|
|
43
|
+
// Apply settings to the test
|
|
44
|
+
if (this._tags.length > 0) {
|
|
45
|
+
test.tags = this._tags;
|
|
46
|
+
}
|
|
47
|
+
test.priority = this._priority;
|
|
48
|
+
if (this._retryCount !== undefined) {
|
|
49
|
+
test.tapTools.retry(this._retryCount);
|
|
50
|
+
}
|
|
51
|
+
if (this._timeoutMs !== undefined) {
|
|
52
|
+
test.timeoutMs = this._timeoutMs;
|
|
53
|
+
}
|
|
54
|
+
return test;
|
|
55
|
+
}
|
|
56
|
+
testSkip(description, testFunction) {
|
|
57
|
+
const test = this._tap.test(description, testFunction, 'skip');
|
|
58
|
+
// Apply settings to the test
|
|
59
|
+
if (this._tags.length > 0) {
|
|
60
|
+
test.tags = this._tags;
|
|
61
|
+
}
|
|
62
|
+
test.priority = this._priority;
|
|
63
|
+
if (this._retryCount !== undefined) {
|
|
64
|
+
test.tapTools.retry(this._retryCount);
|
|
65
|
+
}
|
|
66
|
+
if (this._timeoutMs !== undefined) {
|
|
67
|
+
test.timeoutMs = this._timeoutMs;
|
|
68
|
+
}
|
|
69
|
+
return test;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
4
72
|
export class Tap {
|
|
5
73
|
constructor() {
|
|
74
|
+
this._skipCount = 0;
|
|
75
|
+
this._filterTags = [];
|
|
6
76
|
/**
|
|
7
77
|
* skips a test
|
|
8
78
|
* tests marked with tap.skip.test() are never executed
|
|
@@ -10,9 +80,11 @@ export class Tap {
|
|
|
10
80
|
this.skip = {
|
|
11
81
|
test: (descriptionArg, functionArg) => {
|
|
12
82
|
console.log(`skipped test: ${descriptionArg}`);
|
|
83
|
+
this._skipCount++;
|
|
13
84
|
},
|
|
14
85
|
testParallel: (descriptionArg, functionArg) => {
|
|
15
86
|
console.log(`skipped test: ${descriptionArg}`);
|
|
87
|
+
this._skipCount++;
|
|
16
88
|
},
|
|
17
89
|
};
|
|
18
90
|
/**
|
|
@@ -26,6 +98,29 @@ export class Tap {
|
|
|
26
98
|
this._tapPreTasks = [];
|
|
27
99
|
this._tapTests = [];
|
|
28
100
|
this._tapTestsOnly = [];
|
|
101
|
+
this._currentSuite = null;
|
|
102
|
+
this._rootSuites = [];
|
|
103
|
+
// Get filter tags from environment
|
|
104
|
+
if (typeof process !== 'undefined' && process.env && process.env.TSTEST_FILTER_TAGS) {
|
|
105
|
+
this._filterTags = process.env.TSTEST_FILTER_TAGS.split(',');
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
// Fluent test builder
|
|
109
|
+
tags(...tags) {
|
|
110
|
+
const builder = new TestBuilder(this);
|
|
111
|
+
return builder.tags(...tags);
|
|
112
|
+
}
|
|
113
|
+
priority(level) {
|
|
114
|
+
const builder = new TestBuilder(this);
|
|
115
|
+
return builder.priority(level);
|
|
116
|
+
}
|
|
117
|
+
retry(count) {
|
|
118
|
+
const builder = new TestBuilder(this);
|
|
119
|
+
return builder.retry(count);
|
|
120
|
+
}
|
|
121
|
+
timeout(ms) {
|
|
122
|
+
const builder = new TestBuilder(this);
|
|
123
|
+
return builder.timeout(ms);
|
|
29
124
|
}
|
|
30
125
|
/**
|
|
31
126
|
* Normal test function, will run one by one
|
|
@@ -38,11 +133,19 @@ export class Tap {
|
|
|
38
133
|
testFunction,
|
|
39
134
|
parallel: false,
|
|
40
135
|
});
|
|
41
|
-
|
|
42
|
-
|
|
136
|
+
// No options applied here - use the fluent builder syntax instead
|
|
137
|
+
// If we're in a suite, add test to the suite
|
|
138
|
+
if (this._currentSuite) {
|
|
139
|
+
this._currentSuite.tests.push(localTest);
|
|
43
140
|
}
|
|
44
|
-
else
|
|
45
|
-
|
|
141
|
+
else {
|
|
142
|
+
// Otherwise add to global test list
|
|
143
|
+
if (modeArg === 'normal') {
|
|
144
|
+
this._tapTests.push(localTest);
|
|
145
|
+
}
|
|
146
|
+
else if (modeArg === 'only') {
|
|
147
|
+
this._tapTestsOnly.push(localTest);
|
|
148
|
+
}
|
|
46
149
|
}
|
|
47
150
|
return localTest;
|
|
48
151
|
}
|
|
@@ -55,11 +158,76 @@ export class Tap {
|
|
|
55
158
|
* @param testFunction - A Function that returns a Promise and resolves or rejects
|
|
56
159
|
*/
|
|
57
160
|
testParallel(testDescription, testFunction) {
|
|
58
|
-
|
|
161
|
+
const localTest = new TapTest({
|
|
59
162
|
description: testDescription,
|
|
60
163
|
testFunction,
|
|
61
164
|
parallel: true,
|
|
62
|
-
})
|
|
165
|
+
});
|
|
166
|
+
if (this._currentSuite) {
|
|
167
|
+
this._currentSuite.tests.push(localTest);
|
|
168
|
+
}
|
|
169
|
+
else {
|
|
170
|
+
this._tapTests.push(localTest);
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
/**
|
|
174
|
+
* Create a test suite for grouping related tests
|
|
175
|
+
*/
|
|
176
|
+
describe(description, suiteFunction) {
|
|
177
|
+
const suite = {
|
|
178
|
+
description,
|
|
179
|
+
tests: [],
|
|
180
|
+
children: [],
|
|
181
|
+
parent: this._currentSuite,
|
|
182
|
+
};
|
|
183
|
+
// Add to parent or root
|
|
184
|
+
if (this._currentSuite) {
|
|
185
|
+
this._currentSuite.children.push(suite);
|
|
186
|
+
}
|
|
187
|
+
else {
|
|
188
|
+
this._rootSuites.push(suite);
|
|
189
|
+
}
|
|
190
|
+
// Execute suite function in context
|
|
191
|
+
const previousSuite = this._currentSuite;
|
|
192
|
+
this._currentSuite = suite;
|
|
193
|
+
try {
|
|
194
|
+
suiteFunction();
|
|
195
|
+
}
|
|
196
|
+
finally {
|
|
197
|
+
this._currentSuite = previousSuite;
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
/**
|
|
201
|
+
* Set up a function to run before each test in the current suite
|
|
202
|
+
*/
|
|
203
|
+
beforeEach(setupFunction) {
|
|
204
|
+
if (this._currentSuite) {
|
|
205
|
+
this._currentSuite.beforeEach = setupFunction;
|
|
206
|
+
}
|
|
207
|
+
else {
|
|
208
|
+
throw new Error('beforeEach can only be used inside a describe block');
|
|
209
|
+
}
|
|
210
|
+
}
|
|
211
|
+
/**
|
|
212
|
+
* Set up a function to run after each test in the current suite
|
|
213
|
+
*/
|
|
214
|
+
afterEach(teardownFunction) {
|
|
215
|
+
if (this._currentSuite) {
|
|
216
|
+
this._currentSuite.afterEach = teardownFunction;
|
|
217
|
+
}
|
|
218
|
+
else {
|
|
219
|
+
throw new Error('afterEach can only be used inside a describe block');
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
/**
|
|
223
|
+
* collect all tests from suites
|
|
224
|
+
*/
|
|
225
|
+
_collectTests(suite, tests = []) {
|
|
226
|
+
tests.push(...suite.tests);
|
|
227
|
+
for (const childSuite of suite.children) {
|
|
228
|
+
this._collectTests(childSuite, tests);
|
|
229
|
+
}
|
|
230
|
+
return tests;
|
|
63
231
|
}
|
|
64
232
|
/**
|
|
65
233
|
* starts the test evaluation
|
|
@@ -67,15 +235,25 @@ export class Tap {
|
|
|
67
235
|
async start(optionsArg) {
|
|
68
236
|
// lets set the tapbundle promise
|
|
69
237
|
const smartenvInstance = new plugins.smartenv.Smartenv();
|
|
238
|
+
const globalPromise = plugins.smartpromise.defer();
|
|
70
239
|
smartenvInstance.isBrowser
|
|
71
|
-
? (globalThis.tapbundleDeferred =
|
|
240
|
+
? (globalThis.tapbundleDeferred = globalPromise)
|
|
72
241
|
: null;
|
|
242
|
+
// Also set tapPromise for backwards compatibility
|
|
243
|
+
smartenvInstance.isBrowser
|
|
244
|
+
? (globalThis.tapPromise = globalPromise.promise)
|
|
245
|
+
: null;
|
|
246
|
+
// Path helpers will be initialized by the Node.js environment if available
|
|
73
247
|
// lets continue with running the tests
|
|
74
248
|
const promiseArray = [];
|
|
249
|
+
// Collect all tests including those in suites
|
|
250
|
+
let allTests = [...this._tapTests];
|
|
251
|
+
for (const suite of this._rootSuites) {
|
|
252
|
+
this._collectTests(suite, allTests);
|
|
253
|
+
}
|
|
75
254
|
// safeguard against empty test array
|
|
76
|
-
if (this.
|
|
255
|
+
if (allTests.length === 0 && this._tapTestsOnly.length === 0) {
|
|
77
256
|
console.log('no tests specified. Ending here!');
|
|
78
|
-
// TODO: throw proper error
|
|
79
257
|
return;
|
|
80
258
|
}
|
|
81
259
|
// determine which tests to run
|
|
@@ -84,16 +262,49 @@ export class Tap {
|
|
|
84
262
|
concerningTests = this._tapTestsOnly;
|
|
85
263
|
}
|
|
86
264
|
else {
|
|
87
|
-
concerningTests =
|
|
265
|
+
concerningTests = allTests;
|
|
266
|
+
}
|
|
267
|
+
// Filter tests by tags if specified
|
|
268
|
+
if (this._filterTags.length > 0) {
|
|
269
|
+
concerningTests = concerningTests.filter(test => {
|
|
270
|
+
// Skip tests without tags when filtering is active
|
|
271
|
+
if (!test.tags || test.tags.length === 0) {
|
|
272
|
+
return false;
|
|
273
|
+
}
|
|
274
|
+
// Check if test has any of the filter tags
|
|
275
|
+
return test.tags.some(tag => this._filterTags.includes(tag));
|
|
276
|
+
});
|
|
88
277
|
}
|
|
89
278
|
// lets run the pretasks
|
|
90
279
|
for (const preTask of this._tapPreTasks) {
|
|
91
280
|
await preTask.run();
|
|
92
281
|
}
|
|
282
|
+
// Count actual tests that will be run
|
|
93
283
|
console.log(`1..${concerningTests.length}`);
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
284
|
+
// Run tests from suites with lifecycle hooks
|
|
285
|
+
let testKey = 0;
|
|
286
|
+
// Run root suite tests with lifecycle hooks
|
|
287
|
+
if (this._rootSuites.length > 0) {
|
|
288
|
+
await this._runSuite(null, this._rootSuites, promiseArray, { testKey });
|
|
289
|
+
// Update testKey after running suite tests
|
|
290
|
+
for (const suite of this._rootSuites) {
|
|
291
|
+
const suiteTests = this._collectTests(suite);
|
|
292
|
+
testKey += suiteTests.length;
|
|
293
|
+
}
|
|
294
|
+
}
|
|
295
|
+
// Run non-suite tests (tests added directly without describe)
|
|
296
|
+
const nonSuiteTests = concerningTests.filter(test => {
|
|
297
|
+
// Check if test is not in any suite
|
|
298
|
+
for (const suite of this._rootSuites) {
|
|
299
|
+
const suiteTests = this._collectTests(suite);
|
|
300
|
+
if (suiteTests.includes(test)) {
|
|
301
|
+
return false;
|
|
302
|
+
}
|
|
303
|
+
}
|
|
304
|
+
return true;
|
|
305
|
+
});
|
|
306
|
+
for (const currentTest of nonSuiteTests) {
|
|
307
|
+
const testPromise = currentTest.run(testKey++);
|
|
97
308
|
if (currentTest.parallel) {
|
|
98
309
|
promiseArray.push(testPromise);
|
|
99
310
|
}
|
|
@@ -107,7 +318,7 @@ export class Tap {
|
|
|
107
318
|
const executionNotes = [];
|
|
108
319
|
// collect failed tests
|
|
109
320
|
for (const tapTest of concerningTests) {
|
|
110
|
-
if (tapTest.status !== 'success') {
|
|
321
|
+
if (tapTest.status !== 'success' && tapTest.status !== 'skipped') {
|
|
111
322
|
failReasons.push(`Test ${tapTest.testKey + 1} failed with status ${tapTest.status}:\n` +
|
|
112
323
|
`|| ${tapTest.description}\n` +
|
|
113
324
|
`|| for more information please take a look the logs above`);
|
|
@@ -118,22 +329,75 @@ export class Tap {
|
|
|
118
329
|
console.log(failReason);
|
|
119
330
|
}
|
|
120
331
|
if (optionsArg && optionsArg.throwOnError && failReasons.length > 0) {
|
|
121
|
-
if (!smartenvInstance.isBrowser)
|
|
332
|
+
if (!smartenvInstance.isBrowser && typeof process !== 'undefined')
|
|
122
333
|
process.exit(1);
|
|
123
334
|
}
|
|
124
335
|
if (smartenvInstance.isBrowser) {
|
|
125
|
-
|
|
336
|
+
globalPromise.resolve();
|
|
337
|
+
}
|
|
338
|
+
}
|
|
339
|
+
/**
|
|
340
|
+
* Run tests in a suite with lifecycle hooks
|
|
341
|
+
*/
|
|
342
|
+
async _runSuite(parentSuite, suites, promiseArray, context) {
|
|
343
|
+
for (const suite of suites) {
|
|
344
|
+
// Run beforeEach from parent suites
|
|
345
|
+
const beforeEachFunctions = [];
|
|
346
|
+
let currentSuite = suite;
|
|
347
|
+
while (currentSuite) {
|
|
348
|
+
if (currentSuite.beforeEach) {
|
|
349
|
+
beforeEachFunctions.unshift(currentSuite.beforeEach);
|
|
350
|
+
}
|
|
351
|
+
currentSuite = currentSuite.parent || null;
|
|
352
|
+
}
|
|
353
|
+
// Run tests in this suite
|
|
354
|
+
for (const test of suite.tests) {
|
|
355
|
+
// Create wrapper test function that includes lifecycle hooks
|
|
356
|
+
const originalFunction = test.testFunction;
|
|
357
|
+
test.testFunction = async (tapTools) => {
|
|
358
|
+
// Run all beforeEach hooks
|
|
359
|
+
for (const beforeEach of beforeEachFunctions) {
|
|
360
|
+
await beforeEach(tapTools);
|
|
361
|
+
}
|
|
362
|
+
// Run the actual test
|
|
363
|
+
const result = await originalFunction(tapTools);
|
|
364
|
+
// Run afterEach hooks in reverse order
|
|
365
|
+
const afterEachFunctions = [];
|
|
366
|
+
currentSuite = suite;
|
|
367
|
+
while (currentSuite) {
|
|
368
|
+
if (currentSuite.afterEach) {
|
|
369
|
+
afterEachFunctions.push(currentSuite.afterEach);
|
|
370
|
+
}
|
|
371
|
+
currentSuite = currentSuite.parent || null;
|
|
372
|
+
}
|
|
373
|
+
for (const afterEach of afterEachFunctions) {
|
|
374
|
+
await afterEach(tapTools);
|
|
375
|
+
}
|
|
376
|
+
return result;
|
|
377
|
+
};
|
|
378
|
+
const testPromise = test.run(context.testKey++);
|
|
379
|
+
if (test.parallel) {
|
|
380
|
+
promiseArray.push(testPromise);
|
|
381
|
+
}
|
|
382
|
+
else {
|
|
383
|
+
await testPromise;
|
|
384
|
+
}
|
|
385
|
+
}
|
|
386
|
+
// Recursively run child suites
|
|
387
|
+
await this._runSuite(suite, suite.children, promiseArray, context);
|
|
126
388
|
}
|
|
127
389
|
}
|
|
128
390
|
async stopForcefully(codeArg = 0, directArg = false) {
|
|
129
391
|
console.log(`tap stopping forcefully! Code: ${codeArg} / Direct: ${directArg}`);
|
|
130
|
-
if (
|
|
131
|
-
|
|
132
|
-
}
|
|
133
|
-
else {
|
|
134
|
-
setTimeout(() => {
|
|
392
|
+
if (typeof process !== 'undefined') {
|
|
393
|
+
if (directArg) {
|
|
135
394
|
process.exit(codeArg);
|
|
136
|
-
}
|
|
395
|
+
}
|
|
396
|
+
else {
|
|
397
|
+
setTimeout(() => {
|
|
398
|
+
process.exit(codeArg);
|
|
399
|
+
}, 10);
|
|
400
|
+
}
|
|
137
401
|
}
|
|
138
402
|
}
|
|
139
403
|
/**
|
|
@@ -150,5 +414,5 @@ export class Tap {
|
|
|
150
414
|
throw new Error(message);
|
|
151
415
|
}
|
|
152
416
|
}
|
|
153
|
-
export
|
|
154
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFwYnVuZGxlLmNsYXNzZXMudGFwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHNfdGFwYnVuZGxlL3RhcGJ1bmRsZS5jbGFzc2VzLnRhcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLHdCQUF3QixDQUFDO0FBRWxELE9BQU8sRUFBeUIsT0FBTyxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDaEYsT0FBTyxFQUFFLE9BQU8sRUFBc0IsTUFBTSxnQ0FBZ0MsQ0FBQztBQUM3RSxNQUFNLE9BQU8sR0FBRztJQUFoQjtRQUNFOzs7V0FHRztRQUNJLFNBQUksR0FBRztZQUNaLElBQUksRUFBRSxDQUFDLGNBQXNCLEVBQUUsV0FBNkIsRUFBRSxFQUFFO2dCQUM5RCxPQUFPLENBQUMsR0FBRyxDQUFDLGlCQUFpQixjQUFjLEVBQUUsQ0FBQyxDQUFDO1lBQ2pELENBQUM7WUFDRCxZQUFZLEVBQUUsQ0FBQyxjQUFzQixFQUFFLFdBQTZCLEVBQUUsRUFBRTtnQkFDdEUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsY0FBYyxFQUFFLENBQUMsQ0FBQztZQUNqRCxDQUFDO1NBQ0YsQ0FBQztRQUVGOztXQUVHO1FBQ0ksU0FBSSxHQUFHO1lBQ1osSUFBSSxFQUFFLENBQUMsY0FBc0IsRUFBRSxlQUFpQyxFQUFFLEVBQUU7Z0JBQ2xFLElBQUksQ0FBQyxJQUFJLENBQUMsY0FBYyxFQUFFLGVBQWUsRUFBRSxNQUFNLENBQUMsQ0FBQztZQUNyRCxDQUFDO1NBQ0YsQ0FBQztRQUVNLGlCQUFZLEdBQWMsRUFBRSxDQUFDO1FBQzdCLGNBQVMsR0FBbUIsRUFBRSxDQUFDO1FBQy9CLGtCQUFhLEdBQW1CLEVBQUUsQ0FBQztJQTZJN0MsQ0FBQztJQTNJQzs7OztPQUlHO0lBQ0ksSUFBSSxDQUNULGVBQXVCLEVBQ3ZCLFlBQThCLEVBQzlCLFVBQXNDLFFBQVE7UUFFOUMsTUFBTSxTQUFTLEdBQUcsSUFBSSxPQUFPLENB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
|
|
417
|
+
export const tap = new Tap();
|
|
418
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tapbundle.classes.tap.js","sourceRoot":"","sources":["../ts_tapbundle/tapbundle.classes.tap.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { TapTools } from './tapbundle.classes.taptools.js';
|
|
2
2
|
import { HrtMeasurement } from '@push.rocks/smarttime';
|
|
3
|
-
export type TTestStatus = 'success' | 'error' | 'pending' | 'errorAfterSuccess' | 'timeout';
|
|
3
|
+
export type TTestStatus = 'success' | 'error' | 'pending' | 'errorAfterSuccess' | 'timeout' | 'skipped';
|
|
4
4
|
export interface ITestFunction<T> {
|
|
5
5
|
(tapTools?: TapTools): Promise<T>;
|
|
6
6
|
}
|
|
@@ -13,6 +13,12 @@ export declare class TapTest<T = unknown> {
|
|
|
13
13
|
tapTools: TapTools;
|
|
14
14
|
testFunction: ITestFunction<T>;
|
|
15
15
|
testKey: number;
|
|
16
|
+
timeoutMs?: number;
|
|
17
|
+
isTodo: boolean;
|
|
18
|
+
todoReason?: string;
|
|
19
|
+
tags: string[];
|
|
20
|
+
priority: 'high' | 'medium' | 'low';
|
|
21
|
+
fileName?: string;
|
|
16
22
|
private testDeferred;
|
|
17
23
|
testPromise: Promise<TapTest<T>>;
|
|
18
24
|
private testResultDeferred;
|