testplane 8.35.2 → 8.37.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/build/package.json +1 -1
- package/build/src/browser/cdp/selectivity/hash-writer.d.ts +2 -2
- package/build/src/browser/cdp/selectivity/hash-writer.js +5 -5
- package/build/src/browser/cdp/selectivity/hash-writer.js.map +1 -1
- package/build/src/browser/cdp/selectivity/index.d.ts +1 -6
- package/build/src/browser/cdp/selectivity/index.js +21 -83
- package/build/src/browser/cdp/selectivity/index.js.map +1 -1
- package/build/src/browser/cdp/selectivity/runner.d.ts +19 -0
- package/build/src/browser/cdp/selectivity/runner.js +129 -0
- package/build/src/browser/cdp/selectivity/runner.js.map +1 -0
- package/build/src/browser/cdp/selectivity/test-dependencies-writer.d.ts +2 -2
- package/build/src/browser/cdp/selectivity/test-dependencies-writer.js +5 -5
- package/build/src/browser/cdp/selectivity/test-dependencies-writer.js.map +1 -1
- package/build/src/browser/cdp/selectivity/utils.d.ts +2 -2
- package/build/src/browser/cdp/selectivity/utils.js +2 -2
- package/build/src/browser/cdp/selectivity/utils.js.map +1 -1
- package/build/src/browser/existing-browser.d.ts +2 -0
- package/build/src/browser/existing-browser.js +12 -0
- package/build/src/browser/existing-browser.js.map +1 -1
- package/build/src/browser/history/index.js +1 -1
- package/build/src/browser/history/index.js.map +1 -1
- package/build/src/browser/types.d.ts +1 -0
- package/build/src/cli/commands/list-tests/index.js +2 -1
- package/build/src/cli/commands/list-tests/index.js.map +1 -1
- package/build/src/cli/index.js +2 -1
- package/build/src/cli/index.js.map +1 -1
- package/build/src/config/browser-options.js +7 -2
- package/build/src/config/browser-options.js.map +1 -1
- package/build/src/config/options.js +1 -2
- package/build/src/config/options.js.map +1 -1
- package/build/src/config/utils.d.ts +3 -0
- package/build/src/config/utils.js +14 -1
- package/build/src/config/utils.js.map +1 -1
- package/build/src/constants/config.d.ts +1 -0
- package/build/src/constants/config.js +2 -1
- package/build/src/constants/config.js.map +1 -1
- package/build/src/events/index.d.ts +4 -0
- package/build/src/events/index.js +1 -0
- package/build/src/events/index.js.map +1 -1
- package/build/src/index.d.ts +1 -1
- package/build/src/index.js.map +1 -1
- package/build/src/runner/index.d.ts +5 -2
- package/build/src/runner/index.js +10 -26
- package/build/src/runner/index.js.map +1 -1
- package/build/src/runner/test-runner/regular-test-runner.d.ts +2 -1
- package/build/src/runner/test-runner/regular-test-runner.js +4 -1
- package/build/src/runner/test-runner/regular-test-runner.js.map +1 -1
- package/build/src/test-reader/index.js +2 -2
- package/build/src/test-reader/index.js.map +1 -1
- package/build/src/test-reader/mocha-reader/index.js +31 -0
- package/build/src/test-reader/mocha-reader/index.js.map +1 -1
- package/build/src/test-reader/mocha-reader/tree-builder-decorator.js +4 -4
- package/build/src/test-reader/mocha-reader/tree-builder-decorator.js.map +1 -1
- package/build/src/test-reader/test-object/suite.d.ts +9 -3
- package/build/src/test-reader/test-object/suite.js +19 -1
- package/build/src/test-reader/test-object/suite.js.map +1 -1
- package/build/src/test-reader/test-object/test.d.ts +7 -2
- package/build/src/test-reader/test-object/test.js +20 -1
- package/build/src/test-reader/test-object/test.js.map +1 -1
- package/build/src/test-reader/test-object/types.d.ts +9 -0
- package/build/src/test-reader/test-parser.d.ts +3 -1
- package/build/src/test-reader/test-parser.js +15 -1
- package/build/src/test-reader/test-parser.js.map +1 -1
- package/build/src/testplane.d.ts +5 -3
- package/build/src/testplane.js +9 -5
- package/build/src/testplane.js.map +1 -1
- package/build/src/types/index.d.ts +12 -1
- package/build/src/types/index.js.map +1 -1
- package/build/src/utils/cli.d.ts +2 -0
- package/build/src/utils/cli.js +29 -2
- package/build/src/utils/cli.js.map +1 -1
- package/build/src/utils/workers-registry.js +4 -0
- package/build/src/utils/workers-registry.js.map +1 -1
- package/build/src/worker/runner/index.d.ts +1 -0
- package/build/src/worker/runner/test-runner/index.d.ts +2 -0
- package/build/src/worker/runner/test-runner/index.js +2 -1
- package/build/src/worker/runner/test-runner/index.js.map +1 -1
- package/build/src/worker/runner/test-runner/types.d.ts +1 -0
- package/build/src/worker/testplane.d.ts +1 -0
- package/build/src/worker/testplane.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/runner/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAuB;AACvB,6DAA+C;AAC/C,8CAAgC;AAChC,sDAAwC;AACxC,qDAAiD;AACjD,sCAOmB;AACnB,mCAA0C;AAC1C,8EAAqD;AACrD,iFAAwD;AACxD,oEAA2C;AAE3C,wDAA0C;AAM1C,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/runner/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,8 @@ declare class RegularTestRunner extends RunnableEmitter {
|
|
|
7
7
|
run(workers: any, retriesPerformed: any): Promise<void>;
|
|
8
8
|
_emit(event: any): void;
|
|
9
9
|
_runTest(workers: any, attempt: any): Promise<any>;
|
|
10
|
-
_applyTestResults({ meta, testplaneCtx, history }: {
|
|
10
|
+
_applyTestResults({ tags, meta, testplaneCtx, history }: {
|
|
11
|
+
tags: any;
|
|
11
12
|
meta: any;
|
|
12
13
|
testplaneCtx?: {} | undefined;
|
|
13
14
|
history?: any[] | undefined;
|
|
@@ -54,13 +54,16 @@ module.exports = class RegularTestRunner extends RunnableEmitter {
|
|
|
54
54
|
attempt,
|
|
55
55
|
});
|
|
56
56
|
}
|
|
57
|
-
_applyTestResults({ meta, testplaneCtx = {}, history = [] }) {
|
|
57
|
+
_applyTestResults({ tags, meta, testplaneCtx = {}, history = [] }) {
|
|
58
58
|
testplaneCtx.assertViewResults = AssertViewResults.fromRawObject(testplaneCtx.assertViewResults || []);
|
|
59
59
|
this._test.assertViewResults = testplaneCtx.assertViewResults.get();
|
|
60
60
|
this._test.meta = _.extend(this._test.meta, meta);
|
|
61
61
|
this._test.testplaneCtx = testplaneCtx;
|
|
62
62
|
this._test.hermioneCtx = testplaneCtx;
|
|
63
63
|
this._test.history = history;
|
|
64
|
+
if (tags) {
|
|
65
|
+
tags.forEach(tag => this._test.addTag(tag));
|
|
66
|
+
}
|
|
64
67
|
this._test.duration = Date.now() - this._test.startTime;
|
|
65
68
|
}
|
|
66
69
|
_getTraceparent() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"regular-test-runner.js","sourceRoot":"","sources":["../../../../src/runner/test-runner/regular-test-runner.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"regular-test-runner.js","sourceRoot":"","sources":["../../../../src/runner/test-runner/regular-test-runner.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AACjC,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC5B,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAChD,MAAM,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAC7C,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AACjD,MAAM,iBAAiB,GAAG,OAAO,CAAC,wDAAwD,CAAC,CAAC;AAC5F,MAAM,aAAa,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAC;AAE7D,MAAM,CAAC,OAAO,GAAG,MAAM,iBAAkB,SAAQ,eAAe;IAC5D,YAAY,IAAI,EAAE,YAAY;QAC1B,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QAC1B,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;QAClC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,gBAAgB;QAC/B,IAAI,kBAAkB,CAAC;QAEvB,IAAI,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;YAEzC,IAAI,OAAO,EAAE,CAAC;gBACV,OAAO,CAAC,IAAI,CAAC,UAAU,OAAO,CAAC,SAAS,cAAc,EAAE,YAAY,CAAC,EAAE;oBACnE,kBAAkB,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;gBACzD,CAAC,CAAC,CAAC;YACP,CAAC;YAED,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;YAEpC,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAElC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;YAC/D,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;YAEhC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QACvC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,KAAK,CAAC;YAEvB,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;YAE9B,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QACvC,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAElC,MAAM,CAAC,kBAAkB,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,KAAK;QACP,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO;QAC3B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACjB,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;QACzB,CAAC;QAED,OAAO,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE;YACjD,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE;YAC3B,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO;YACrC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS;YAClC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,YAAY;YACvC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO;YAC5C,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;YACrB,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK;YAC1B,OAAO;SACV,CAAC,CAAC;IACP,CAAC;IAED,iBAAiB,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,GAAG,EAAE,EAAE,OAAO,GAAG,EAAE,EAAE;QAC7D,YAAY,CAAC,iBAAiB,GAAG,iBAAiB,CAAC,aAAa,CAAC,YAAY,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC;QACvG,IAAI,CAAC,KAAK,CAAC,iBAAiB,GAAG,YAAY,CAAC,iBAAiB,CAAC,GAAG,EAAE,CAAC;QAEpE,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAClD,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,YAAY,CAAC;QACvC,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,YAAY,CAAC;QACtC,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;QAE7B,IAAI,IAAI,EAAE,CAAC;YACP,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QAChD,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;IAC5D,CAAC;IAED,eAAe;QACX,MAAM,OAAO,GAAG,IAAI,CAAC;QACrB,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACvD,MAAM,QAAQ,GAAG,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC9D,MAAM,SAAS,GAAG,IAAI,CAAC;QAEvB,OAAO,GAAG,OAAO,IAAI,OAAO,IAAI,QAAQ,IAAI,SAAS,EAAE,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,WAAW;QACb,IAAI,CAAC;YACD,MAAM,KAAK,GAAG;gBACV,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE;gBAC/B,WAAW,EAAE,IAAI,CAAC,eAAe,EAAE;aACtC,CAAC;YAEF,IAAI,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;YAE/D,uFAAuF;YACvF,IACI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,KAAK,KAAK,CAAC,UAAU;gBACnD,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,KAAK,KAAK,CAAC,WAAW,EACvD,CAAC;gBACC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YACpC,CAAC;YAED,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC;YAE/C,OAAO,IAAI,CAAC,QAAQ,CAAC;QACzB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,KAAK,CAAC;QAC3B,CAAC;IACL,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,YAAY,GAAG,EAAE;QAChC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACjB,OAAO;QACX,CAAC;QAED,MAAM,aAAa,GAAG,aAAa,CAAC,WAAW,EAAE,CAAC;QAClD,MAAM,eAAe,GAAG,aAAa,CAAC,eAAe,CAAC;QAEtD,IAAI,eAAe,EAAE,OAAO,EAAE,CAAC;YAC3B,MAAM,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC,YAAY,EAAE,gBAAgB,CAAC;YACtE,MAAM,UAAU,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;YAE5D,IAAI,UAAU,EAAE,CAAC;gBACb,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBAC3B,OAAO;YACX,CAAC;QACL,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QAErB,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;QAEjC,IAAI,CAAC;YACD,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAClD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAM,CAAC,IAAI,CAAC,qCAAqC,KAAK,EAAE,CAAC,CAAC;QAC9D,CAAC;IACL,CAAC;IAED,mBAAmB;QACf,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACjB,OAAO;QACX,CAAC;QAED,MAAM,CAAC,GAAG,CACN,8GAA8G,CACjH,CAAC;QACF,MAAM,CAAC,GAAG,CAAC,kEAAkE,CAAC,CAAC;QAC/E,MAAM,CAAC,GAAG,CACN,IAAI,CAAC,SAAS,CACV;YACI,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS;YAClC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,YAAY;YACvC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO;YAC5C,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE;SAC1C,EACD,IAAI,EACJ,CAAC,CACJ,CACJ,CAAC;IACN,CAAC;CACJ,CAAC"}
|
|
@@ -33,7 +33,7 @@ class TestReader extends events_1.EventEmitter {
|
|
|
33
33
|
__classPrivateFieldSet(this, _TestReader_config, config, "f");
|
|
34
34
|
}
|
|
35
35
|
async read(options) {
|
|
36
|
-
const { paths, browsers, ignore, sets, grep, runnableOpts } = options;
|
|
36
|
+
const { paths, browsers, ignore, sets, grep, tag, runnableOpts } = options;
|
|
37
37
|
const { fileExtensions } = __classPrivateFieldGet(this, _TestReader_config, "f").system;
|
|
38
38
|
const envSets = env_1.default.parseCommaSeparatedValue(["TESTPLANE_SETS", "HERMIONE_SETS"]).value;
|
|
39
39
|
const setCollection = await sets_builder_1.SetsBuilder.create(__classPrivateFieldGet(this, _TestReader_config, "f").sets, { defaultPaths: ["testplane", "hermione"] })
|
|
@@ -45,7 +45,7 @@ class TestReader extends events_1.EventEmitter {
|
|
|
45
45
|
(0, utils_1.passthroughEvent)(parser, this, [events_2.MasterEvents.BEFORE_FILE_READ, events_2.MasterEvents.AFTER_FILE_READ]);
|
|
46
46
|
await parser.loadFiles(setCollection.getAllFiles(), { config: __classPrivateFieldGet(this, _TestReader_config, "f"), runnableOpts });
|
|
47
47
|
const filesByBro = setCollection.groupByBrowser();
|
|
48
|
-
const testsByBro = lodash_1.default.mapValues(filesByBro, (files, browserId) => parser.parse(files, { browserId, config: __classPrivateFieldGet(this, _TestReader_config, "f").forBrowser(browserId), grep }));
|
|
48
|
+
const testsByBro = lodash_1.default.mapValues(filesByBro, (files, browserId) => parser.parse(files, { browserId, config: __classPrivateFieldGet(this, _TestReader_config, "f").forBrowser(browserId), grep, tag }));
|
|
49
49
|
validateTests(testsByBro, options, __classPrivateFieldGet(this, _TestReader_config, "f"));
|
|
50
50
|
return testsByBro;
|
|
51
51
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/test-reader/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,oDAAuB;AACvB,mCAAsC;AACtC,2CAAmD;AACnD,iDAA6C;AAC7C,+CAA2C;AAC3C,sCAAyC;AACzC,uDAA+B;AAO/B,MAAa,UAAW,SAAQ,qBAAY;IAGxC,MAAM,CAAC,MAAM,CAGT,GAAG,IAA8C;QAEjD,OAAO,IAAI,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,YAAY,MAAc;QACtB,KAAK,EAAE,CAAC;QAXZ,qCAAQ;QAaJ,uBAAA,IAAI,sBAAW,MAAM,MAAA,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAuB;QAC9B,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/test-reader/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,8 +7,39 @@ const { TestReaderEvents } = require("../../events");
|
|
|
7
7
|
const { MasterEvents } = require("../../events");
|
|
8
8
|
const { getMethodsByInterface } = require("./utils");
|
|
9
9
|
const { enableSourceMaps } = require("../../utils/typescript");
|
|
10
|
+
function getTagParser(original) {
|
|
11
|
+
return function (title, paramsOrFn, fn) {
|
|
12
|
+
if (typeof paramsOrFn === "function") {
|
|
13
|
+
return original.call(this, title, paramsOrFn);
|
|
14
|
+
}
|
|
15
|
+
else {
|
|
16
|
+
const test = original.call(this, title, fn);
|
|
17
|
+
if (paramsOrFn?.tag) {
|
|
18
|
+
if (Array.isArray(paramsOrFn.tag)) {
|
|
19
|
+
test.tags = paramsOrFn.tag.map(title => ({ title, dynamic: false }));
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
test.tags = [{ title: paramsOrFn.tag, dynamic: false }];
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
return test;
|
|
26
|
+
}
|
|
27
|
+
};
|
|
28
|
+
}
|
|
10
29
|
async function readFiles(files, { esmDecorator, config, eventBus, runnableOpts }) {
|
|
11
30
|
const mocha = new Mocha(config);
|
|
31
|
+
mocha.suite.on("pre-require", context => {
|
|
32
|
+
const originalDescribe = context.describe;
|
|
33
|
+
const originalIt = context.it;
|
|
34
|
+
context.describe = getTagParser(originalDescribe);
|
|
35
|
+
context.context = getTagParser(originalDescribe);
|
|
36
|
+
context.describe.only = originalDescribe.only;
|
|
37
|
+
context.describe.skip = originalDescribe.skip;
|
|
38
|
+
context.it = getTagParser(originalIt);
|
|
39
|
+
context.specify = getTagParser(originalIt);
|
|
40
|
+
context.it.only = originalIt.only;
|
|
41
|
+
context.it.skip = originalIt.skip;
|
|
42
|
+
});
|
|
12
43
|
mocha.fullTrace();
|
|
13
44
|
initBuildContext(eventBus);
|
|
14
45
|
initEventListeners({ rootSuite: mocha.suite, outBus: eventBus, config, runnableOpts });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/test-reader/mocha-reader/index.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC5B,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAE/B,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AACvD,MAAM,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;AACrE,MAAM,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AACrD,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AACjD,MAAM,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AACrD,MAAM,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;AAE/D,KAAK,UAAU,SAAS,CAAC,KAAK,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE;IAC5E,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/test-reader/mocha-reader/index.js"],"names":[],"mappings":"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"}
|
|
@@ -28,11 +28,11 @@ class TreeBuilderDecorator {
|
|
|
28
28
|
__classPrivateFieldSet(this, _TreeBuilderDecorator_suiteCounter, new Map(), "f");
|
|
29
29
|
}
|
|
30
30
|
addSuite(mochaSuite) {
|
|
31
|
-
const { id: mochaId } = mochaSuite;
|
|
31
|
+
const { id: mochaId, tags } = mochaSuite;
|
|
32
32
|
const file = computeFile(mochaSuite) ?? "unknown-file";
|
|
33
33
|
const positionInFile = __classPrivateFieldGet(this, _TreeBuilderDecorator_suiteCounter, "f").get(file) || 0;
|
|
34
34
|
const id = mochaSuite.root ? mochaId : crypto.getShortMD5(file) + positionInFile;
|
|
35
|
-
const suite = __classPrivateFieldGet(this, _TreeBuilderDecorator_instances, "m", _TreeBuilderDecorator_mkTestObject).call(this, Suite, mochaSuite, { id });
|
|
35
|
+
const suite = __classPrivateFieldGet(this, _TreeBuilderDecorator_instances, "m", _TreeBuilderDecorator_mkTestObject).call(this, Suite, mochaSuite, { id, tags });
|
|
36
36
|
__classPrivateFieldGet(this, _TreeBuilderDecorator_instances, "m", _TreeBuilderDecorator_applyConfig).call(this, suite, mochaSuite);
|
|
37
37
|
__classPrivateFieldGet(this, _TreeBuilderDecorator_treeBuilder, "f").addSuite(suite, __classPrivateFieldGet(this, _TreeBuilderDecorator_instances, "m", _TreeBuilderDecorator_getParent).call(this, mochaSuite, null));
|
|
38
38
|
__classPrivateFieldGet(this, _TreeBuilderDecorator_suiteMap, "f").set(mochaId, suite);
|
|
@@ -40,9 +40,9 @@ class TreeBuilderDecorator {
|
|
|
40
40
|
return this;
|
|
41
41
|
}
|
|
42
42
|
addTest(mochaTest) {
|
|
43
|
-
const { fn } = mochaTest;
|
|
43
|
+
const { fn, tags } = mochaTest;
|
|
44
44
|
const id = crypto.getShortMD5(mochaTest.fullTitle());
|
|
45
|
-
const test = __classPrivateFieldGet(this, _TreeBuilderDecorator_instances, "m", _TreeBuilderDecorator_mkTestObject).call(this, Test, mochaTest, { id, fn });
|
|
45
|
+
const test = __classPrivateFieldGet(this, _TreeBuilderDecorator_instances, "m", _TreeBuilderDecorator_mkTestObject).call(this, Test, mochaTest, { id, fn, tags });
|
|
46
46
|
__classPrivateFieldGet(this, _TreeBuilderDecorator_instances, "m", _TreeBuilderDecorator_applyConfig).call(this, test, mochaTest);
|
|
47
47
|
__classPrivateFieldGet(this, _TreeBuilderDecorator_treeBuilder, "f").addTest(test, __classPrivateFieldGet(this, _TreeBuilderDecorator_instances, "m", _TreeBuilderDecorator_getParent).call(this, mochaTest));
|
|
48
48
|
return this;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tree-builder-decorator.js","sourceRoot":"","sources":["../../../../src/test-reader/mocha-reader/tree-builder-decorator.js"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AACxD,MAAM,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAC7C,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAE3C,MAAM,oBAAoB;IAKtB,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI;QACjB,OAAO,IAAI,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,YAAY,WAAW;;QARvB,oDAAa;QACb,iDAAU;QACV,qDAAc;QAOV,uBAAA,IAAI,qCAAgB,WAAW,MAAA,CAAC;QAChC,uBAAA,IAAI,kCAAa,IAAI,GAAG,EAAE,MAAA,CAAC;QAC3B,uBAAA,IAAI,sCAAiB,IAAI,GAAG,EAAE,MAAA,CAAC;IACnC,CAAC;IAED,QAAQ,CAAC,UAAU;QACf,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"tree-builder-decorator.js","sourceRoot":"","sources":["../../../../src/test-reader/mocha-reader/tree-builder-decorator.js"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,18 @@
|
|
|
1
1
|
import { ConfigurableTestObject } from "./configurable-test-object";
|
|
2
2
|
import { Hook } from "./hook";
|
|
3
3
|
import { Test } from "./test";
|
|
4
|
-
import type { TestObjectData, ConfigurableTestObjectData, TestFunction, TestFunctionCtx } from "./types";
|
|
5
|
-
type SuiteOpts = Pick<ConfigurableTestObjectData, "file" | "id" | "location"> & TestObjectData
|
|
4
|
+
import type { TestObjectData, ConfigurableTestObjectData, TestFunction, TestFunctionCtx, TestTag } from "./types";
|
|
5
|
+
type SuiteOpts = Pick<ConfigurableTestObjectData, "file" | "id" | "location"> & TestObjectData & {
|
|
6
|
+
tags: TestTag[];
|
|
7
|
+
};
|
|
6
8
|
export declare class Suite extends ConfigurableTestObject {
|
|
7
9
|
#private;
|
|
10
|
+
tags: Map<string, boolean>;
|
|
8
11
|
static create<T extends Suite>(this: new (opts: SuiteOpts) => T, opts: SuiteOpts): T;
|
|
9
|
-
constructor({ title, file, id, location }?: SuiteOpts);
|
|
12
|
+
constructor({ title, file, id, location, tags }?: SuiteOpts);
|
|
13
|
+
addTag(tag: string | string[], dynamic?: boolean): void;
|
|
14
|
+
hasTag(tag: string): boolean;
|
|
15
|
+
getTags(): TestTag[];
|
|
10
16
|
addSuite(suite: Suite): this;
|
|
11
17
|
addTest(test: Test): this;
|
|
12
18
|
addBeforeEachHook(hook: Hook): this;
|
|
@@ -24,18 +24,36 @@ class Suite extends configurable_test_object_1.ConfigurableTestObject {
|
|
|
24
24
|
return new this(opts);
|
|
25
25
|
}
|
|
26
26
|
// used inside test
|
|
27
|
-
constructor({ title, file, id, location } = {}) {
|
|
27
|
+
constructor({ title, file, id, location, tags } = {}) {
|
|
28
28
|
super({ title, file, id, location });
|
|
29
29
|
_Suite_instances.add(this);
|
|
30
30
|
_Suite_suites.set(this, void 0);
|
|
31
31
|
_Suite_tests.set(this, void 0);
|
|
32
32
|
_Suite_beforeEachHooks.set(this, void 0);
|
|
33
33
|
_Suite_afterEachHooks.set(this, void 0);
|
|
34
|
+
this.tags = new Map(tags?.map(({ title, dynamic }) => [title, Boolean(dynamic)]) || []);
|
|
34
35
|
__classPrivateFieldSet(this, _Suite_suites, [], "f");
|
|
35
36
|
__classPrivateFieldSet(this, _Suite_tests, [], "f");
|
|
36
37
|
__classPrivateFieldSet(this, _Suite_beforeEachHooks, [], "f");
|
|
37
38
|
__classPrivateFieldSet(this, _Suite_afterEachHooks, [], "f");
|
|
38
39
|
}
|
|
40
|
+
addTag(tag, dynamic = false) {
|
|
41
|
+
if (Array.isArray(tag)) {
|
|
42
|
+
tag.forEach(element => this.tags.set(element, dynamic));
|
|
43
|
+
}
|
|
44
|
+
else {
|
|
45
|
+
this.tags.set(tag, dynamic);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
hasTag(tag) {
|
|
49
|
+
return this.tags.has(tag);
|
|
50
|
+
}
|
|
51
|
+
getTags() {
|
|
52
|
+
return Array.from(this.tags.keys()).map(title => ({
|
|
53
|
+
title,
|
|
54
|
+
dynamic: this.tags.get(title),
|
|
55
|
+
}));
|
|
56
|
+
}
|
|
39
57
|
addSuite(suite) {
|
|
40
58
|
return __classPrivateFieldGet(this, _Suite_instances, "m", _Suite_addChild).call(this, suite, __classPrivateFieldGet(this, _Suite_suites, "f"));
|
|
41
59
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"suite.js","sourceRoot":"","sources":["../../../../src/test-reader/test-object/suite.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,oDAAuB;AACvB,yEAAoE;AACpE,iCAA8B;AAM9B,MAAa,KAAM,SAAQ,iDAAsB;
|
|
1
|
+
{"version":3,"file":"suite.js","sourceRoot":"","sources":["../../../../src/test-reader/test-object/suite.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,18 @@
|
|
|
1
1
|
import { ConfigurableTestObject } from "./configurable-test-object";
|
|
2
|
-
import type { TestObjectData, TestFunction, TestFunctionCtx } from "./types";
|
|
2
|
+
import type { TestObjectData, TestFunction, TestFunctionCtx, TestTag } from "./types";
|
|
3
3
|
type TestOpts = TestObjectData & Pick<ConfigurableTestObject, "file" | "id" | "location"> & {
|
|
4
4
|
fn: TestFunction<TestFunctionCtx>;
|
|
5
|
+
tags?: TestTag[];
|
|
5
6
|
};
|
|
6
7
|
export declare class Test extends ConfigurableTestObject {
|
|
7
8
|
fn: TestFunction<TestFunctionCtx>;
|
|
9
|
+
tags: Map<string, boolean>;
|
|
8
10
|
err?: Error;
|
|
9
11
|
static create<T extends Test>(this: new (opts: TestOpts) => T, opts: TestOpts): T;
|
|
10
|
-
constructor({ title, file, id, location, fn }: TestOpts);
|
|
12
|
+
constructor({ title, file, id, location, fn, tags }: TestOpts);
|
|
13
|
+
addTag(tag: string | string[]): void;
|
|
14
|
+
hasTag(tag: string): boolean;
|
|
15
|
+
getTags(): TestTag[];
|
|
11
16
|
clone(): Test;
|
|
12
17
|
}
|
|
13
18
|
export {};
|
|
@@ -6,13 +6,32 @@ class Test extends configurable_test_object_1.ConfigurableTestObject {
|
|
|
6
6
|
static create(opts) {
|
|
7
7
|
return new this(opts);
|
|
8
8
|
}
|
|
9
|
-
constructor({ title, file, id, location, fn }) {
|
|
9
|
+
constructor({ title, file, id, location, fn, tags }) {
|
|
10
10
|
super({ title, file, id, location });
|
|
11
11
|
this.fn = fn;
|
|
12
|
+
this.tags = new Map(tags?.map(({ title, dynamic }) => [title, Boolean(dynamic)]) || []);
|
|
13
|
+
}
|
|
14
|
+
addTag(tag) {
|
|
15
|
+
if (Array.isArray(tag)) {
|
|
16
|
+
tag.forEach(element => this.tags.set(element, true));
|
|
17
|
+
}
|
|
18
|
+
else {
|
|
19
|
+
this.tags.set(tag, true);
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
hasTag(tag) {
|
|
23
|
+
return this.tags.has(tag);
|
|
24
|
+
}
|
|
25
|
+
getTags() {
|
|
26
|
+
return Array.from(this.tags.keys()).map(title => ({
|
|
27
|
+
title,
|
|
28
|
+
dynamic: this.tags.get(title),
|
|
29
|
+
}));
|
|
12
30
|
}
|
|
13
31
|
clone() {
|
|
14
32
|
return new Test({
|
|
15
33
|
title: this.title,
|
|
34
|
+
tags: this.getTags(),
|
|
16
35
|
file: this.file,
|
|
17
36
|
id: this.id,
|
|
18
37
|
location: this.location,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../../src/test-reader/test-object/test.ts"],"names":[],"mappings":";;;AAAA,yEAAoE;
|
|
1
|
+
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../../src/test-reader/test-object/test.ts"],"names":[],"mappings":";;;AAAA,yEAAoE;AASpE,MAAa,IAAK,SAAQ,iDAAsB;IAK5C,MAAM,CAAC,MAAM,CAAkD,IAAc;QACzE,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,YAAY,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAY;QACzD,KAAK,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QAErC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,IAAI,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAC5F,CAAC;IAED,MAAM,CAAC,GAAsB;QACzB,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACrB,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;QACzD,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAC7B,CAAC;IACL,CAAC;IAED,MAAM,CAAC,GAAW;QACd,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED,OAAO;QACH,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC9C,KAAK;YACL,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC;SAChC,CAAC,CAAC,CAAC;IACR,CAAC;IAED,KAAK;QACD,OAAO,IAAI,IAAI,CAAC;YACZ,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE;YACpB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,EAAE,EAAE,IAAI,CAAC,EAAE;SACd,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC;CACJ;AA7CD,oBA6CC"}
|
|
@@ -28,13 +28,22 @@ export type TestFunction<T> = (this: TestFunctionCtx, ctx: T) => void | Promise<
|
|
|
28
28
|
export interface TestHookDefinition {
|
|
29
29
|
<T extends Partial<TestFunctionCtx> = TestFunctionCtx>(fn?: TestFunction<T>): Hook;
|
|
30
30
|
}
|
|
31
|
+
export type DefinitionParams = {
|
|
32
|
+
tag?: string | string[];
|
|
33
|
+
};
|
|
31
34
|
export interface TestDefinition {
|
|
32
35
|
<T extends Partial<TestFunctionCtx> = TestFunctionCtx>(title: string, fn?: TestFunction<T>): Test;
|
|
36
|
+
<T extends Partial<TestFunctionCtx> = TestFunctionCtx>(title: string, params: DefinitionParams, fn?: TestFunction<T>): Test;
|
|
33
37
|
only: <T extends Partial<TestFunctionCtx> = TestFunctionCtx>(title: string, fn?: TestFunction<T>) => Test;
|
|
34
38
|
skip: <T extends Partial<TestFunctionCtx> = TestFunctionCtx>(title: string, fn?: TestFunction<T>) => Test;
|
|
35
39
|
}
|
|
36
40
|
export interface SuiteDefinition {
|
|
37
41
|
(title: string, fn: (this: Suite) => void): Suite;
|
|
42
|
+
(title: string, params: DefinitionParams, fn: (this: Suite) => void): Suite;
|
|
38
43
|
only: (title: string, fn: (this: Suite) => void) => Suite;
|
|
39
44
|
skip: (title: string, fn: (this: Suite) => void) => Suite;
|
|
40
45
|
}
|
|
46
|
+
export type TestTag = {
|
|
47
|
+
title: string;
|
|
48
|
+
dynamic?: boolean;
|
|
49
|
+
};
|
|
@@ -4,9 +4,11 @@ import { Test } from "./test-object";
|
|
|
4
4
|
import { Config } from "../config";
|
|
5
5
|
import { BrowserConfig } from "../config/browser-config";
|
|
6
6
|
import type { ReadTestsOpts } from "../testplane";
|
|
7
|
+
import { TagFilter } from "../utils/cli";
|
|
7
8
|
export type TestParserParseOpts = {
|
|
8
9
|
browserId: string;
|
|
9
10
|
grep?: RegExp;
|
|
11
|
+
tag?: TagFilter;
|
|
10
12
|
config: BrowserConfig;
|
|
11
13
|
};
|
|
12
14
|
type LoadFilesOpts = {
|
|
@@ -17,6 +19,6 @@ export declare class TestParser extends EventEmitter {
|
|
|
17
19
|
#private;
|
|
18
20
|
constructor();
|
|
19
21
|
loadFiles(files: string[], { config, runnableOpts }: LoadFilesOpts): Promise<void>;
|
|
20
|
-
parse(files: string[], { browserId, config, grep }: TestParserParseOpts): Test[];
|
|
22
|
+
parse(files: string[], { browserId, config, grep, tag }: TestParserParseOpts): Test[];
|
|
21
23
|
}
|
|
22
24
|
export {};
|
|
@@ -109,12 +109,26 @@ class TestParser extends events_1.EventEmitter {
|
|
|
109
109
|
}
|
|
110
110
|
}
|
|
111
111
|
}
|
|
112
|
-
parse(files, { browserId, config, grep }) {
|
|
112
|
+
parse(files, { browserId, config, grep, tag }) {
|
|
113
113
|
const treeBuilder = new tree_builder_1.TreeBuilder();
|
|
114
114
|
__classPrivateFieldGet(this, _TestParser_buildInstructions, "f").exec(files, { treeBuilder, browserId, config });
|
|
115
115
|
if (grep) {
|
|
116
116
|
treeBuilder.addTestFilter((test) => grep.test(test.fullTitle()));
|
|
117
117
|
}
|
|
118
|
+
if (tag) {
|
|
119
|
+
treeBuilder.addTestFilter((test) => {
|
|
120
|
+
let current = test;
|
|
121
|
+
while (current) {
|
|
122
|
+
if (tag(current.tags)) {
|
|
123
|
+
return true;
|
|
124
|
+
}
|
|
125
|
+
else {
|
|
126
|
+
current = current.parent;
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
return false;
|
|
130
|
+
});
|
|
131
|
+
}
|
|
118
132
|
if (config.lastFailed?.only) {
|
|
119
133
|
if (!__classPrivateFieldGet(this, _TestParser_failedTests, "f").size) {
|
|
120
134
|
return [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-parser.js","sourceRoot":"","sources":["../../../src/test-reader/test-parser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAsC;AACtC,6DAAsE;AACtE,mEAA+D;AAC/D,mEAA+D;AAC/D,mEAA+D;AAC/D,uEAAmE;AACnE,yFAAsE;AACtE,iDAA6C;AAC7C,sCAA6C;AAC7C,uDAA2D;AAC3D,sCAAyC;AACzC,oDAAuB;AACvB,kEAAyC;AACzC,gDAAwB;AACxB,wDAA0B;AAC1B,wDAA0C;AAC1C,4CAA8C;
|
|
1
|
+
{"version":3,"file":"test-parser.js","sourceRoot":"","sources":["../../../src/test-reader/test-parser.ts"],"names":[],"mappings":"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"}
|
package/build/src/testplane.d.ts
CHANGED
|
@@ -5,10 +5,12 @@ import type { MainRunner as BrowserEnvRunner } from "./runner/browser-env";
|
|
|
5
5
|
import { TestCollection } from "./test-collection";
|
|
6
6
|
import { ConfigInput } from "./config/types";
|
|
7
7
|
import { MasterEventHandler, Test, TestResult } from "./types";
|
|
8
|
+
import { TagFilter } from "./utils/cli";
|
|
8
9
|
interface RunOpts {
|
|
9
10
|
browsers: string[];
|
|
10
11
|
sets: string[];
|
|
11
12
|
grep: RegExp;
|
|
13
|
+
tag: TagFilter;
|
|
12
14
|
updateRefs: boolean;
|
|
13
15
|
requireModules: string[];
|
|
14
16
|
inspectMode: {
|
|
@@ -36,7 +38,7 @@ export type FailedListItem = {
|
|
|
36
38
|
interface RunnableOpts {
|
|
37
39
|
saveLocations?: boolean;
|
|
38
40
|
}
|
|
39
|
-
export interface ReadTestsOpts extends Pick<RunOpts, "browsers" | "sets" | "grep" | "replMode" | "keepBrowserMode"> {
|
|
41
|
+
export interface ReadTestsOpts extends Pick<RunOpts, "tag" | "browsers" | "sets" | "grep" | "replMode" | "keepBrowserMode"> {
|
|
40
42
|
silent: boolean;
|
|
41
43
|
ignore: string | string[];
|
|
42
44
|
failed: FailedListItem[];
|
|
@@ -54,11 +56,11 @@ export declare class Testplane extends BaseTestplane {
|
|
|
54
56
|
constructor(config?: string | ConfigInput);
|
|
55
57
|
extendCli(parser: Command): void;
|
|
56
58
|
protected _init(): Promise<void>;
|
|
57
|
-
run(testPaths: TestCollection | string[], { browsers, sets, grep, updateRefs, requireModules, inspectMode, replMode, devtools, local, keepBrowserMode, reporters, }?: Partial<RunOpts>): Promise<boolean>;
|
|
59
|
+
run(testPaths: TestCollection | string[], { browsers, sets, grep, tag, updateRefs, requireModules, inspectMode, replMode, devtools, local, keepBrowserMode, reporters, }?: Partial<RunOpts>): Promise<boolean>;
|
|
58
60
|
protected _saveFailed(): Promise<void>;
|
|
59
61
|
protected _readTests(testPaths: string[] | TestCollection, opts: Partial<ReadTestsOpts>): Promise<TestCollection>;
|
|
60
62
|
addTestToRun(test: Test, browserId: string): boolean;
|
|
61
|
-
readTests(testPaths: string[], { browsers, sets, grep, silent, ignore, replMode, keepBrowserMode, runnableOpts }?: Partial<ReadTestsOpts>): Promise<TestCollection>;
|
|
63
|
+
readTests(testPaths: string[], { browsers, sets, grep, tag, silent, ignore, replMode, keepBrowserMode, runnableOpts, }?: Partial<ReadTestsOpts>): Promise<TestCollection>;
|
|
62
64
|
isFailed(): boolean;
|
|
63
65
|
protected _fail(): void;
|
|
64
66
|
protected _addFailedTest(result: TestResult): void;
|
package/build/src/testplane.js
CHANGED
|
@@ -62,7 +62,7 @@ class Testplane extends base_testplane_1.BaseTestplane {
|
|
|
62
62
|
});
|
|
63
63
|
return super._init();
|
|
64
64
|
}
|
|
65
|
-
async run(testPaths, { browsers, sets, grep, updateRefs, requireModules, inspectMode, replMode, devtools, local, keepBrowserMode, reporters = [], } = {}) {
|
|
65
|
+
async run(testPaths, { browsers, sets, grep, tag, updateRefs, requireModules, inspectMode, replMode, devtools, local, keepBrowserMode, reporters = [], } = {}) {
|
|
66
66
|
(0, validators_1.validateUnknownBrowsers)(browsers, lodash_1.default.keys(this._config.browsers));
|
|
67
67
|
runtime_config_1.default.getInstance().extend({
|
|
68
68
|
updateRefs,
|
|
@@ -97,9 +97,12 @@ class Testplane extends base_testplane_1.BaseTestplane {
|
|
|
97
97
|
if (this.config.beforeAll) {
|
|
98
98
|
await this.config.beforeAll.call({ config: this.config }, { config: this.config });
|
|
99
99
|
}
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
100
|
+
const hasTestPathsFilter = lodash_1.default.isArray(testPaths) ? Boolean(testPaths.length) : true;
|
|
101
|
+
const hasTestFilter = hasTestPathsFilter || Boolean(sets?.length) || Boolean(grep) || Boolean(tag);
|
|
102
|
+
const shouldDisableSelectivity = Boolean(hasTestFilter);
|
|
103
|
+
await runner.run(await this._readTests(testPaths, { browsers, sets, grep, tag, replMode, keepBrowserMode }), stats_1.Stats.create(this), { shouldDisableSelectivity });
|
|
104
|
+
if (!shouldDisableSelectivity && !this.isFailed()) {
|
|
105
|
+
await (0, selectivity_1.updateSelectivityHashes)(this.config);
|
|
103
106
|
}
|
|
104
107
|
if (this.config.afterAll) {
|
|
105
108
|
await this.config.afterAll.call({ config: this.config }, { config: this.config });
|
|
@@ -115,7 +118,7 @@ class Testplane extends base_testplane_1.BaseTestplane {
|
|
|
115
118
|
addTestToRun(test, browserId) {
|
|
116
119
|
return this.runner ? this.runner.addTestToRun(test, browserId) : false;
|
|
117
120
|
}
|
|
118
|
-
async readTests(testPaths, { browsers, sets, grep, silent, ignore, replMode, keepBrowserMode, runnableOpts } = {}) {
|
|
121
|
+
async readTests(testPaths, { browsers, sets, grep, tag, silent, ignore, replMode, keepBrowserMode, runnableOpts, } = {}) {
|
|
119
122
|
const testReader = test_reader_1.TestReader.create(this._config);
|
|
120
123
|
if (!silent) {
|
|
121
124
|
await this._init();
|
|
@@ -130,6 +133,7 @@ class Testplane extends base_testplane_1.BaseTestplane {
|
|
|
130
133
|
ignore,
|
|
131
134
|
sets,
|
|
132
135
|
grep,
|
|
136
|
+
tag,
|
|
133
137
|
replMode,
|
|
134
138
|
keepBrowserMode,
|
|
135
139
|
runnableOpts,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testplane.js","sourceRoot":"","sources":["../../src/testplane.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,oDAAuB;AACvB,wDAA0B;AAC1B,mCAA+C;AAC/C,qDAAiD;AAGjD,6EAAoD;AACpD,qCAA6E;AAC7E,2DAAyC;AACzC,sEAA6C;AAC7C,+CAA2C;AAC3C,uDAAmD;AACnD,6CAAuD;AACvD,2CAA4C;AAC5C,uDAAyC;AACzC,2CAAkD;AAClD,6CAA6C;AAG7C,yDAA2D;AAC3D,
|
|
1
|
+
{"version":3,"file":"testplane.js","sourceRoot":"","sources":["../../src/testplane.ts"],"names":[],"mappings":"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"}
|