@git.zone/tstest 3.0.0 → 3.1.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_tapbundle/tapbundle.classes.posttask.d.ts +10 -0
- package/dist_ts_tapbundle/tapbundle.classes.posttask.js +13 -0
- package/dist_ts_tapbundle/tapbundle.classes.tap.d.ts +17 -2
- package/dist_ts_tapbundle/tapbundle.classes.tap.js +50 -3
- package/package.json +2 -2
- package/readme.hints.md +125 -0
- package/ts/00_commitinfo_data.ts +1 -1
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@git.zone/tstest',
|
|
6
|
-
version: '3.
|
|
6
|
+
version: '3.1.0',
|
|
7
7
|
description: 'a test utility to run tests that match test/**/*.ts'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxrQkFBa0I7SUFDeEIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLHFEQUFxRDtDQUNuRSxDQUFBIn0=
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { TapTools } from './tapbundle.classes.taptools.js';
|
|
2
|
+
export interface IPostTaskFunction {
|
|
3
|
+
(tapTools?: TapTools): Promise<any>;
|
|
4
|
+
}
|
|
5
|
+
export declare class PostTask {
|
|
6
|
+
description: string;
|
|
7
|
+
postTaskFunction: IPostTaskFunction;
|
|
8
|
+
constructor(descriptionArg: string, postTaskFunctionArg: IPostTaskFunction);
|
|
9
|
+
run(): Promise<void>;
|
|
10
|
+
}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import * as plugins from './tapbundle.plugins.js';
|
|
2
|
+
import { TapTools } from './tapbundle.classes.taptools.js';
|
|
3
|
+
export class PostTask {
|
|
4
|
+
constructor(descriptionArg, postTaskFunctionArg) {
|
|
5
|
+
this.description = descriptionArg;
|
|
6
|
+
this.postTaskFunction = postTaskFunctionArg;
|
|
7
|
+
}
|
|
8
|
+
async run() {
|
|
9
|
+
console.log(`::__POSTTASK: ${this.description}`);
|
|
10
|
+
await this.postTaskFunction(new TapTools(null));
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFwYnVuZGxlLmNsYXNzZXMucG9zdHRhc2suanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90c190YXBidW5kbGUvdGFwYnVuZGxlLmNsYXNzZXMucG9zdHRhc2sudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSx3QkFBd0IsQ0FBQztBQUNsRCxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFNM0QsTUFBTSxPQUFPLFFBQVE7SUFJbkIsWUFBWSxjQUFzQixFQUFFLG1CQUFzQztRQUN4RSxJQUFJLENBQUMsV0FBVyxHQUFHLGNBQWMsQ0FBQztRQUNsQyxJQUFJLENBQUMsZ0JBQWdCLEdBQUcsbUJBQW1CLENBQUM7SUFDOUMsQ0FBQztJQUVNLEtBQUssQ0FBQyxHQUFHO1FBQ2QsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDLENBQUM7UUFDakQsTUFBTSxJQUFJLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztJQUNsRCxDQUFDO0NBQ0YifQ==
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
import { type IPreTaskFunction } from './tapbundle.classes.pretask.js';
|
|
2
|
+
import { type IPostTaskFunction } from './tapbundle.classes.posttask.js';
|
|
2
3
|
import { TapTest, type ITestFunction } from './tapbundle.classes.taptest.js';
|
|
3
4
|
import type { ITapSettings } from './tapbundle.interfaces.js';
|
|
4
5
|
export interface ITestSuite {
|
|
5
6
|
description: string;
|
|
6
7
|
tests: TapTest<any>[];
|
|
8
|
+
beforeAll?: ITestFunction<any>;
|
|
9
|
+
afterAll?: ITestFunction<any>;
|
|
7
10
|
beforeEach?: ITestFunction<any>;
|
|
8
11
|
afterEach?: ITestFunction<any>;
|
|
9
12
|
parent?: ITestSuite;
|
|
@@ -15,7 +18,8 @@ declare class TestBuilder<T> {
|
|
|
15
18
|
private _priority;
|
|
16
19
|
private _retryCount?;
|
|
17
20
|
private _timeoutMs?;
|
|
18
|
-
|
|
21
|
+
private _parallel;
|
|
22
|
+
constructor(tap: Tap<T>, parallel?: boolean);
|
|
19
23
|
tags(...tags: string[]): this;
|
|
20
24
|
priority(level: 'high' | 'medium' | 'low'): this;
|
|
21
25
|
retry(count: number): this;
|
|
@@ -34,6 +38,7 @@ export declare class Tap<T> {
|
|
|
34
38
|
priority(level: 'high' | 'medium' | 'low'): TestBuilder<T>;
|
|
35
39
|
retry(count: number): TestBuilder<T>;
|
|
36
40
|
timeout(ms: number): TestBuilder<T>;
|
|
41
|
+
parallel(): TestBuilder<T>;
|
|
37
42
|
/**
|
|
38
43
|
* skips a test
|
|
39
44
|
* tests marked with tap.skip.test() are never executed
|
|
@@ -57,6 +62,7 @@ export declare class Tap<T> {
|
|
|
57
62
|
testParallel: (descriptionArg: string, functionArg?: ITestFunction<T>) => TapTest<T>;
|
|
58
63
|
};
|
|
59
64
|
private _tapPreTasks;
|
|
65
|
+
private _tapPostTasks;
|
|
60
66
|
private _tapTests;
|
|
61
67
|
private _tapTestsOnly;
|
|
62
68
|
private _currentSuite;
|
|
@@ -76,16 +82,25 @@ export declare class Tap<T> {
|
|
|
76
82
|
*/
|
|
77
83
|
test(testDescription: string, testFunction: ITestFunction<T>, modeArg?: 'normal' | 'only' | 'skip'): TapTest<T>;
|
|
78
84
|
preTask(descriptionArg: string, functionArg: IPreTaskFunction): void;
|
|
85
|
+
postTask(descriptionArg: string, functionArg: IPostTaskFunction): void;
|
|
79
86
|
/**
|
|
80
87
|
* A parallel test that will not be waited for before the next starts.
|
|
81
88
|
* @param testDescription - A description of what the test does
|
|
82
89
|
* @param testFunction - A Function that returns a Promise and resolves or rejects
|
|
83
90
|
*/
|
|
84
|
-
testParallel(testDescription: string, testFunction: ITestFunction<T>):
|
|
91
|
+
testParallel(testDescription: string, testFunction: ITestFunction<T>): TapTest<T>;
|
|
85
92
|
/**
|
|
86
93
|
* Create a test suite for grouping related tests
|
|
87
94
|
*/
|
|
88
95
|
describe(description: string, suiteFunction: () => void): void;
|
|
96
|
+
/**
|
|
97
|
+
* Set up a function to run once before all tests in the current suite
|
|
98
|
+
*/
|
|
99
|
+
beforeAll(setupFunction: ITestFunction<any>): void;
|
|
100
|
+
/**
|
|
101
|
+
* Set up a function to run once after all tests in the current suite
|
|
102
|
+
*/
|
|
103
|
+
afterAll(teardownFunction: ITestFunction<any>): void;
|
|
89
104
|
/**
|
|
90
105
|
* Set up a function to run before each test in the current suite
|
|
91
106
|
*/
|
|
@@ -1,13 +1,16 @@
|
|
|
1
1
|
import * as plugins from './tapbundle.plugins.js';
|
|
2
2
|
import { PreTask } from './tapbundle.classes.pretask.js';
|
|
3
|
+
import { PostTask } from './tapbundle.classes.posttask.js';
|
|
3
4
|
import { TapTest } from './tapbundle.classes.taptest.js';
|
|
4
5
|
import { ProtocolEmitter } from '../dist_ts_tapbundle_protocol/index.js';
|
|
5
6
|
import { SettingsManager } from './tapbundle.classes.settingsmanager.js';
|
|
6
7
|
class TestBuilder {
|
|
7
|
-
constructor(tap) {
|
|
8
|
+
constructor(tap, parallel = false) {
|
|
8
9
|
this._tags = [];
|
|
9
10
|
this._priority = 'medium';
|
|
11
|
+
this._parallel = false;
|
|
10
12
|
this._tap = tap;
|
|
13
|
+
this._parallel = parallel;
|
|
11
14
|
}
|
|
12
15
|
tags(...tags) {
|
|
13
16
|
this._tags = tags;
|
|
@@ -26,7 +29,9 @@ class TestBuilder {
|
|
|
26
29
|
return this;
|
|
27
30
|
}
|
|
28
31
|
test(description, testFunction) {
|
|
29
|
-
const test = this.
|
|
32
|
+
const test = this._parallel
|
|
33
|
+
? this._tap.testParallel(description, testFunction)
|
|
34
|
+
: this._tap.test(description, testFunction, 'normal');
|
|
30
35
|
// Apply settings to the test
|
|
31
36
|
if (this._tags.length > 0) {
|
|
32
37
|
test.tags = this._tags;
|
|
@@ -164,6 +169,7 @@ export class Tap {
|
|
|
164
169
|
},
|
|
165
170
|
};
|
|
166
171
|
this._tapPreTasks = [];
|
|
172
|
+
this._tapPostTasks = [];
|
|
167
173
|
this._tapTests = [];
|
|
168
174
|
this._tapTestsOnly = [];
|
|
169
175
|
this._currentSuite = null;
|
|
@@ -190,6 +196,9 @@ export class Tap {
|
|
|
190
196
|
const builder = new TestBuilder(this);
|
|
191
197
|
return builder.timeout(ms);
|
|
192
198
|
}
|
|
199
|
+
parallel() {
|
|
200
|
+
return new TestBuilder(this, true);
|
|
201
|
+
}
|
|
193
202
|
/**
|
|
194
203
|
* Configure global test settings
|
|
195
204
|
*/
|
|
@@ -244,6 +253,9 @@ export class Tap {
|
|
|
244
253
|
preTask(descriptionArg, functionArg) {
|
|
245
254
|
this._tapPreTasks.push(new PreTask(descriptionArg, functionArg));
|
|
246
255
|
}
|
|
256
|
+
postTask(descriptionArg, functionArg) {
|
|
257
|
+
this._tapPostTasks.push(new PostTask(descriptionArg, functionArg));
|
|
258
|
+
}
|
|
247
259
|
/**
|
|
248
260
|
* A parallel test that will not be waited for before the next starts.
|
|
249
261
|
* @param testDescription - A description of what the test does
|
|
@@ -269,6 +281,7 @@ export class Tap {
|
|
|
269
281
|
else {
|
|
270
282
|
this._tapTests.push(localTest);
|
|
271
283
|
}
|
|
284
|
+
return localTest;
|
|
272
285
|
}
|
|
273
286
|
/**
|
|
274
287
|
* Create a test suite for grouping related tests
|
|
@@ -297,6 +310,28 @@ export class Tap {
|
|
|
297
310
|
this._currentSuite = previousSuite;
|
|
298
311
|
}
|
|
299
312
|
}
|
|
313
|
+
/**
|
|
314
|
+
* Set up a function to run once before all tests in the current suite
|
|
315
|
+
*/
|
|
316
|
+
beforeAll(setupFunction) {
|
|
317
|
+
if (this._currentSuite) {
|
|
318
|
+
this._currentSuite.beforeAll = setupFunction;
|
|
319
|
+
}
|
|
320
|
+
else {
|
|
321
|
+
throw new Error('beforeAll can only be used inside a describe block');
|
|
322
|
+
}
|
|
323
|
+
}
|
|
324
|
+
/**
|
|
325
|
+
* Set up a function to run once after all tests in the current suite
|
|
326
|
+
*/
|
|
327
|
+
afterAll(teardownFunction) {
|
|
328
|
+
if (this._currentSuite) {
|
|
329
|
+
this._currentSuite.afterAll = teardownFunction;
|
|
330
|
+
}
|
|
331
|
+
else {
|
|
332
|
+
throw new Error('afterAll can only be used inside a describe block');
|
|
333
|
+
}
|
|
334
|
+
}
|
|
300
335
|
/**
|
|
301
336
|
* Set up a function to run before each test in the current suite
|
|
302
337
|
*/
|
|
@@ -472,6 +507,10 @@ export class Tap {
|
|
|
472
507
|
for (const failReason of failReasons) {
|
|
473
508
|
console.log(failReason);
|
|
474
509
|
}
|
|
510
|
+
// Run post tasks
|
|
511
|
+
for (const postTask of this._tapPostTasks) {
|
|
512
|
+
await postTask.run();
|
|
513
|
+
}
|
|
475
514
|
// Run global afterAll hook if configured
|
|
476
515
|
if (settings.afterAll) {
|
|
477
516
|
try {
|
|
@@ -509,6 +548,10 @@ export class Tap {
|
|
|
509
548
|
suiteName: suite.description
|
|
510
549
|
}
|
|
511
550
|
});
|
|
551
|
+
// Run beforeAll hook for this suite
|
|
552
|
+
if (suite.beforeAll) {
|
|
553
|
+
await suite.beforeAll(new plugins.smartpromise.Deferred().promise);
|
|
554
|
+
}
|
|
512
555
|
// Run beforeEach from parent suites
|
|
513
556
|
const beforeEachFunctions = [];
|
|
514
557
|
let currentSuite = suite;
|
|
@@ -573,6 +616,10 @@ export class Tap {
|
|
|
573
616
|
}
|
|
574
617
|
// Recursively run child suites
|
|
575
618
|
await this._runSuite(suite, suite.children, promiseArray, context);
|
|
619
|
+
// Run afterAll hook for this suite
|
|
620
|
+
if (suite.afterAll) {
|
|
621
|
+
await suite.afterAll(new plugins.smartpromise.Deferred().promise);
|
|
622
|
+
}
|
|
576
623
|
// Emit suite:completed event
|
|
577
624
|
this.emitEvent({
|
|
578
625
|
eventType: 'suite:completed',
|
|
@@ -611,4 +658,4 @@ export class Tap {
|
|
|
611
658
|
}
|
|
612
659
|
}
|
|
613
660
|
export const tap = new Tap();
|
|
614
|
-
//# 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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"}
|
|
661
|
+
//# 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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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@git.zone/tstest",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.1.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "a test utility to run tests that match test/**/*.ts",
|
|
6
6
|
"exports": {
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"@push.rocks/smartpath": "^6.0.0",
|
|
40
40
|
"@push.rocks/smartpromise": "^4.2.3",
|
|
41
41
|
"@push.rocks/smartrequest": "^5.0.1",
|
|
42
|
-
"@push.rocks/smarts3": "^2.2.
|
|
42
|
+
"@push.rocks/smarts3": "^2.2.7",
|
|
43
43
|
"@push.rocks/smartshell": "^3.3.0",
|
|
44
44
|
"@push.rocks/smarttime": "^4.1.1",
|
|
45
45
|
"@types/ws": "^8.18.1",
|
package/readme.hints.md
CHANGED
|
@@ -244,6 +244,131 @@ tstest test/specific.ts -w
|
|
|
244
244
|
- Ignores changes matching the ignore patterns
|
|
245
245
|
- Shows "Waiting for file changes..." between runs
|
|
246
246
|
|
|
247
|
+
## Phase 1 API Improvements (v3.1.0)
|
|
248
|
+
|
|
249
|
+
### New Features Implemented
|
|
250
|
+
|
|
251
|
+
#### 1. tap.postTask() - Global Teardown (COMPLETED)
|
|
252
|
+
|
|
253
|
+
Added symmetric teardown method to complement `tap.preTask()`:
|
|
254
|
+
|
|
255
|
+
**Implementation:**
|
|
256
|
+
- Created `PostTask` class in `ts_tapbundle/tapbundle.classes.posttask.ts`
|
|
257
|
+
- Mirrors PreTask structure with description and function
|
|
258
|
+
- Integrated into Tap class execution flow
|
|
259
|
+
- Runs after all tests complete but before global `afterAll` hook
|
|
260
|
+
|
|
261
|
+
**Usage:**
|
|
262
|
+
```typescript
|
|
263
|
+
tap.postTask('cleanup database', async () => {
|
|
264
|
+
await cleanupDatabase();
|
|
265
|
+
});
|
|
266
|
+
```
|
|
267
|
+
|
|
268
|
+
**Execution Order:**
|
|
269
|
+
1. preTask hooks
|
|
270
|
+
2. Global beforeAll
|
|
271
|
+
3. Tests (with suite hooks)
|
|
272
|
+
4. **postTask hooks** ← NEW
|
|
273
|
+
5. Global afterAll
|
|
274
|
+
|
|
275
|
+
#### 2. Suite-Level beforeAll/afterAll (COMPLETED)
|
|
276
|
+
|
|
277
|
+
Added once-per-suite lifecycle hooks:
|
|
278
|
+
|
|
279
|
+
**Implementation:**
|
|
280
|
+
- Extended `ITestSuite` interface with `beforeAll` and `afterAll` properties
|
|
281
|
+
- Added `tap.beforeAll()` and `tap.afterAll()` methods
|
|
282
|
+
- Integrated into `_runSuite()` execution flow
|
|
283
|
+
- Properly handles nested suites
|
|
284
|
+
|
|
285
|
+
**Usage:**
|
|
286
|
+
```typescript
|
|
287
|
+
tap.describe('Database Tests', () => {
|
|
288
|
+
tap.beforeAll(async () => {
|
|
289
|
+
await initializeDatabaseConnection(); // Runs once
|
|
290
|
+
});
|
|
291
|
+
|
|
292
|
+
tap.test('test 1', async () => {});
|
|
293
|
+
tap.test('test 2', async () => {});
|
|
294
|
+
|
|
295
|
+
tap.afterAll(async () => {
|
|
296
|
+
await closeDatabaseConnection(); // Runs once
|
|
297
|
+
});
|
|
298
|
+
});
|
|
299
|
+
```
|
|
300
|
+
|
|
301
|
+
**Execution Order per Suite:**
|
|
302
|
+
1. Suite beforeAll ← NEW
|
|
303
|
+
2. Suite beforeEach
|
|
304
|
+
3. Test
|
|
305
|
+
4. Suite afterEach
|
|
306
|
+
5. (Repeat 2-4 for each test)
|
|
307
|
+
6. Child suites (recursive)
|
|
308
|
+
7. Suite afterAll ← NEW
|
|
309
|
+
|
|
310
|
+
#### 3. tap.parallel() Fluent Entry Point (COMPLETED)
|
|
311
|
+
|
|
312
|
+
Added fluent API for parallel test creation:
|
|
313
|
+
|
|
314
|
+
**Implementation:**
|
|
315
|
+
- Updated `TestBuilder` class with `_parallel` flag
|
|
316
|
+
- Builder constructor accepts optional parallel parameter
|
|
317
|
+
- Added `tap.parallel()` method returning configured builder
|
|
318
|
+
- Fixed `testParallel()` to return TapTest<T> (was void)
|
|
319
|
+
|
|
320
|
+
**Usage:**
|
|
321
|
+
```typescript
|
|
322
|
+
// Simple parallel test
|
|
323
|
+
tap.parallel().test('fetch data', async () => {});
|
|
324
|
+
|
|
325
|
+
// With full configuration
|
|
326
|
+
tap
|
|
327
|
+
.parallel()
|
|
328
|
+
.tags('api', 'integration')
|
|
329
|
+
.retry(2)
|
|
330
|
+
.timeout(5000)
|
|
331
|
+
.test('configured parallel test', async () => {});
|
|
332
|
+
```
|
|
333
|
+
|
|
334
|
+
**Benefits:**
|
|
335
|
+
- Consistent with other fluent builders (tags, priority, etc.)
|
|
336
|
+
- More discoverable than separate `testParallel()` method
|
|
337
|
+
- Allows chaining parallel with other configurations
|
|
338
|
+
- `testParallel()` kept for backward compatibility
|
|
339
|
+
|
|
340
|
+
### Documentation Updates
|
|
341
|
+
|
|
342
|
+
**tapbundle/readme.md:**
|
|
343
|
+
- Added suite-level beforeAll/afterAll documentation
|
|
344
|
+
- Documented postTask with execution order notes
|
|
345
|
+
- Added parallel() fluent API examples
|
|
346
|
+
- Expanded TapTools documentation with all methods
|
|
347
|
+
- Added "Additional Tap Methods" section for fail(), getSettings(), etc.
|
|
348
|
+
- Documented all previously undocumented methods
|
|
349
|
+
|
|
350
|
+
### Tests
|
|
351
|
+
|
|
352
|
+
**test/tapbundle/test.new-lifecycle.ts:**
|
|
353
|
+
- Tests postTask execution order
|
|
354
|
+
- Verifies suite-level beforeAll/afterAll
|
|
355
|
+
- Tests nested suite lifecycle
|
|
356
|
+
- Validates parallel() fluent API
|
|
357
|
+
- Confirms all execution order requirements
|
|
358
|
+
|
|
359
|
+
**Test Results:** All 9 tests passing ✅
|
|
360
|
+
|
|
361
|
+
### Breaking Changes
|
|
362
|
+
|
|
363
|
+
None - all changes are additive and backward compatible.
|
|
364
|
+
|
|
365
|
+
### Migration Guide
|
|
366
|
+
|
|
367
|
+
No migration needed. New features are opt-in:
|
|
368
|
+
- Continue using existing patterns
|
|
369
|
+
- Adopt new features incrementally
|
|
370
|
+
- `testParallel()` still works (recommended: switch to `parallel().test()`)
|
|
371
|
+
|
|
247
372
|
## Fixed Issues
|
|
248
373
|
|
|
249
374
|
### tap.skip.test(), tap.todo(), and tap.only.test() (Fixed)
|