testplane 8.10.1 → 8.11.1
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/README.md +1 -1
- package/build/package.json +6 -1
- package/build/src/browser/browser.d.ts +1 -0
- package/build/src/browser/browser.js +4 -0
- package/build/src/browser/browser.js.map +1 -1
- package/build/src/browser/commands/clearSession.d.ts +1 -1
- package/build/src/browser/commands/clearSession.js +1 -1
- package/build/src/browser/commands/clearSession.js.map +1 -1
- package/build/src/browser/commands/moveCursorTo.d.ts +1 -1
- package/build/src/browser/commands/moveCursorTo.js +1 -1
- package/build/src/browser/commands/moveCursorTo.js.map +1 -1
- package/build/src/browser/commands/scrollIntoView.d.ts +1 -1
- package/build/src/browser/commands/scrollIntoView.js +1 -1
- package/build/src/browser/commands/scrollIntoView.js.map +1 -1
- package/build/src/browser/commands/switchToRepl.d.ts +1 -1
- package/build/src/browser/commands/switchToRepl.js +1 -1
- package/build/src/browser/commands/switchToRepl.js.map +1 -1
- package/build/src/browser/existing-browser.js +1 -0
- package/build/src/browser/existing-browser.js.map +1 -1
- package/build/src/browser/history/utils.js +2 -2
- package/build/src/browser/history/utils.js.map +1 -1
- package/build/src/browser/new-browser.js +1 -0
- package/build/src/browser/new-browser.js.map +1 -1
- package/build/src/browser/stacktrace/constants.d.ts +2 -0
- package/build/src/browser/stacktrace/constants.js +12 -0
- package/build/src/browser/stacktrace/constants.js.map +1 -0
- package/build/src/browser/stacktrace/index.d.ts +9 -0
- package/build/src/browser/stacktrace/index.js +71 -0
- package/build/src/browser/stacktrace/index.js.map +1 -0
- package/build/src/browser/stacktrace/utils.d.ts +14 -0
- package/build/src/browser/stacktrace/utils.js +115 -0
- package/build/src/browser/stacktrace/utils.js.map +1 -0
- package/build/src/bundle/index.js +112 -112
- package/build/src/error-snippets/constants.d.ts +4 -0
- package/build/src/error-snippets/constants.js +8 -0
- package/build/src/error-snippets/constants.js.map +1 -0
- package/build/src/error-snippets/frames.d.ts +3 -0
- package/build/src/error-snippets/frames.js +68 -0
- package/build/src/error-snippets/frames.js.map +1 -0
- package/build/src/error-snippets/index.d.ts +2 -0
- package/build/src/error-snippets/index.js +37 -0
- package/build/src/error-snippets/index.js.map +1 -0
- package/build/src/error-snippets/source-maps.d.ts +4 -0
- package/build/src/error-snippets/source-maps.js +37 -0
- package/build/src/error-snippets/source-maps.js.map +1 -0
- package/build/src/error-snippets/types.d.ts +13 -0
- package/build/src/error-snippets/types.js +3 -0
- package/build/src/error-snippets/types.js.map +1 -0
- package/build/src/error-snippets/utils.d.ts +18 -0
- package/build/src/error-snippets/utils.js +66 -0
- package/build/src/error-snippets/utils.js.map +1 -0
- package/build/src/reporters/flat.js +3 -0
- package/build/src/reporters/flat.js.map +1 -1
- package/build/src/reporters/utils/helpers.js +5 -1
- package/build/src/reporters/utils/helpers.js.map +1 -1
- package/build/src/test-reader/index.js +4 -1
- package/build/src/test-reader/index.js.map +1 -1
- package/build/src/test-reader/test-parser.d.ts +7 -1
- package/build/src/test-reader/test-parser.js +10 -4
- package/build/src/test-reader/test-parser.js.map +1 -1
- package/build/src/test-reader/test-transformer.d.ts +3 -1
- package/build/src/test-reader/test-transformer.js.map +1 -1
- package/build/src/worker/browser-env/runner/test-runner/index.js.map +1 -1
- package/build/src/worker/runner/simple-test-parser.js +5 -1
- package/build/src/worker/runner/simple-test-parser.js.map +1 -1
- package/build/src/worker/runner/test-runner/index.js +4 -0
- package/build/src/worker/runner/test-runner/index.js.map +1 -1
- package/package.json +6 -1
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.SNIPPET_LINES_BELOW = exports.SNIPPET_LINES_ABOVE = exports.SOURCE_MAP_HEADER = exports.SOURCE_MAP_URL_COMMENT = void 0;
|
|
4
|
+
exports.SOURCE_MAP_URL_COMMENT = "//# sourceMappingURL=";
|
|
5
|
+
exports.SOURCE_MAP_HEADER = "SourceMap";
|
|
6
|
+
exports.SNIPPET_LINES_ABOVE = 2;
|
|
7
|
+
exports.SNIPPET_LINES_BELOW = 3;
|
|
8
|
+
//# sourceMappingURL=constants.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/error-snippets/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,sBAAsB,GAAG,uBAAuB,CAAC;AACjD,QAAA,iBAAiB,GAAG,WAAW,CAAC;AAChC,QAAA,mBAAmB,GAAG,CAAC,CAAC;AACxB,QAAA,mBAAmB,GAAG,CAAC,CAAC"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import type { ResolvedFrame, SufficientStackFrame } from "./types";
|
|
2
|
+
export declare const findRelevantStackFrame: (error: Error) => SufficientStackFrame | null;
|
|
3
|
+
export declare const resolveLocationWithStackFrame: (stackFrame: SufficientStackFrame, fileContents: string) => ResolvedFrame;
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.resolveLocationWithStackFrame = exports.findRelevantStackFrame = void 0;
|
|
7
|
+
const lodash_1 = __importDefault(require("lodash"));
|
|
8
|
+
const error_stack_parser_1 = __importDefault(require("error-stack-parser"));
|
|
9
|
+
const logger_1 = __importDefault(require("../utils/logger"));
|
|
10
|
+
const utils_1 = require("./utils");
|
|
11
|
+
/**
|
|
12
|
+
* @description
|
|
13
|
+
* Rank values:
|
|
14
|
+
*
|
|
15
|
+
* 0: Can't extract code snippet; useless
|
|
16
|
+
*
|
|
17
|
+
* 1: WebdriverIO internals: Better than nothing
|
|
18
|
+
*
|
|
19
|
+
* 2: Project internals: Better than WebdriverIO internals, but worse, than user code part
|
|
20
|
+
*
|
|
21
|
+
* 3: User code: Best choice
|
|
22
|
+
*/
|
|
23
|
+
const FRAME_REELVANCE = {
|
|
24
|
+
repl: { value: 0, matcher: fileName => /^REPL\d+$/.test(fileName) },
|
|
25
|
+
nodeInternals: { value: 0, matcher: fileName => /^node:[a-zA-Z\-_]/.test(fileName) },
|
|
26
|
+
wdioInternals: { value: 1, matcher: fileName => fileName.includes("/node_modules/webdriverio/") },
|
|
27
|
+
projectInternals: { value: 2, matcher: fileName => fileName.includes("/node_modules/") },
|
|
28
|
+
userCode: { value: 3, matcher: () => true },
|
|
29
|
+
};
|
|
30
|
+
const getFrameRelevance = (frame) => {
|
|
31
|
+
if ([frame.fileName, frame.lineNumber, frame.columnNumber].some(lodash_1.default.isUndefined)) {
|
|
32
|
+
return 0;
|
|
33
|
+
}
|
|
34
|
+
const fileName = (0, utils_1.softFileURLToPath)(frame.fileName);
|
|
35
|
+
for (const factor in FRAME_REELVANCE) {
|
|
36
|
+
if (FRAME_REELVANCE[factor].matcher(fileName)) {
|
|
37
|
+
return FRAME_REELVANCE[factor].value;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
return 0;
|
|
41
|
+
};
|
|
42
|
+
const findRelevantStackFrame = (error) => {
|
|
43
|
+
try {
|
|
44
|
+
const parsedStackFrames = error_stack_parser_1.default.parse(error);
|
|
45
|
+
let relevantFrame = null;
|
|
46
|
+
let relevantFrameRank = 0;
|
|
47
|
+
for (const currentFrame of parsedStackFrames) {
|
|
48
|
+
const currentFrameRank = getFrameRelevance(currentFrame);
|
|
49
|
+
if (currentFrameRank > relevantFrameRank) {
|
|
50
|
+
relevantFrame = currentFrame;
|
|
51
|
+
relevantFrameRank = currentFrameRank;
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
return relevantFrame;
|
|
55
|
+
}
|
|
56
|
+
catch (findError) {
|
|
57
|
+
logger_1.default.warn("Unable to find relevant stack frame:", findError);
|
|
58
|
+
return null;
|
|
59
|
+
}
|
|
60
|
+
};
|
|
61
|
+
exports.findRelevantStackFrame = findRelevantStackFrame;
|
|
62
|
+
const resolveLocationWithStackFrame = (stackFrame, fileContents) => ({
|
|
63
|
+
file: (0, utils_1.softFileURLToPath)(stackFrame.fileName),
|
|
64
|
+
source: fileContents,
|
|
65
|
+
location: { line: stackFrame.lineNumber, column: stackFrame.columnNumber },
|
|
66
|
+
});
|
|
67
|
+
exports.resolveLocationWithStackFrame = resolveLocationWithStackFrame;
|
|
68
|
+
//# sourceMappingURL=frames.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"frames.js","sourceRoot":"","sources":["../../../src/error-snippets/frames.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,4EAAkD;AAClD,6DAAqC;AACrC,mCAA4C;AAG5C;;;;;;;;;;;GAWG;AACH,MAAM,eAAe,GAA8E;IAC/F,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;IACnE,aAAa,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;IACpF,aAAa,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,4BAA4B,CAAC,EAAE;IACjG,gBAAgB,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE;IACxF,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE;CACrC,CAAC;AAEX,MAAM,iBAAiB,GAAG,CAAC,KAAiB,EAAU,EAAE;IACpD,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,gBAAC,CAAC,WAAW,CAAC,EAAE,CAAC;QAC7E,OAAO,CAAC,CAAC;IACb,CAAC;IAED,MAAM,QAAQ,GAAW,IAAA,yBAAiB,EAAC,KAAK,CAAC,QAAS,CAAC,CAAC;IAE5D,KAAK,MAAM,MAAM,IAAI,eAAe,EAAE,CAAC;QACnC,IAAI,eAAe,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5C,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC;QACzC,CAAC;IACL,CAAC;IAED,OAAO,CAAC,CAAC;AACb,CAAC,CAAC;AAEK,MAAM,sBAAsB,GAAG,CAAC,KAAY,EAA+B,EAAE;IAChF,IAAI,CAAC;QACD,MAAM,iBAAiB,GAAG,4BAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAExD,IAAI,aAAa,GAAgC,IAAI,CAAC;QACtD,IAAI,iBAAiB,GAAG,CAAC,CAAC;QAE1B,KAAK,MAAM,YAAY,IAAI,iBAAiB,EAAE,CAAC;YAC3C,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,YAAY,CAAC,CAAC;YAEzD,IAAI,gBAAgB,GAAG,iBAAiB,EAAE,CAAC;gBACvC,aAAa,GAAG,YAAoC,CAAC;gBACrD,iBAAiB,GAAG,gBAAgB,CAAC;YACzC,CAAC;QACL,CAAC;QAED,OAAO,aAAa,CAAC;IACzB,CAAC;IAAC,OAAO,SAAS,EAAE,CAAC;QACjB,gBAAM,CAAC,IAAI,CAAC,sCAAsC,EAAE,SAAS,CAAC,CAAC;QAE/D,OAAO,IAAI,CAAC;IAChB,CAAC;AACL,CAAC,CAAC;AAtBW,QAAA,sBAAsB,0BAsBjC;AAEK,MAAM,6BAA6B,GAAG,CACzC,UAAgC,EAChC,YAAoB,EACP,EAAE,CAAC,CAAC;IACjB,IAAI,EAAE,IAAA,yBAAiB,EAAC,UAAU,CAAC,QAAQ,CAAC;IAC5C,MAAM,EAAE,YAAY;IACpB,QAAQ,EAAE,EAAE,IAAI,EAAE,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,CAAC,YAAY,EAAE;CAC7E,CAAC,CAAC;AAPU,QAAA,6BAA6B,iCAOvC"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.extendWithCodeSnippet = void 0;
|
|
7
|
+
const frames_1 = require("./frames");
|
|
8
|
+
const source_maps_1 = require("./source-maps");
|
|
9
|
+
const utils_1 = require("./utils");
|
|
10
|
+
const logger_1 = __importDefault(require("../utils/logger"));
|
|
11
|
+
const stackFrameLocationResolver = async (stackFrame) => {
|
|
12
|
+
const fileContents = await (0, utils_1.getSourceCodeFile)(stackFrame.fileName);
|
|
13
|
+
const sourceMaps = await (0, source_maps_1.extractSourceMaps)(fileContents, stackFrame.fileName);
|
|
14
|
+
return sourceMaps
|
|
15
|
+
? (0, source_maps_1.resolveLocationWithSourceMap)(stackFrame, sourceMaps)
|
|
16
|
+
: (0, frames_1.resolveLocationWithStackFrame)(stackFrame, fileContents);
|
|
17
|
+
};
|
|
18
|
+
const extendWithCodeSnippet = async (err) => {
|
|
19
|
+
if (!err) {
|
|
20
|
+
return err;
|
|
21
|
+
}
|
|
22
|
+
try {
|
|
23
|
+
const relevantStackFrame = (0, frames_1.findRelevantStackFrame)(err);
|
|
24
|
+
if (!relevantStackFrame) {
|
|
25
|
+
return err;
|
|
26
|
+
}
|
|
27
|
+
const { file, source, location } = await stackFrameLocationResolver(relevantStackFrame);
|
|
28
|
+
err.snippet = (0, utils_1.formatErrorSnippet)(err, { file, source, location });
|
|
29
|
+
return err;
|
|
30
|
+
}
|
|
31
|
+
catch (snippetError) {
|
|
32
|
+
logger_1.default.warn("Unable to apply code snippet:", snippetError);
|
|
33
|
+
return err;
|
|
34
|
+
}
|
|
35
|
+
};
|
|
36
|
+
exports.extendWithCodeSnippet = extendWithCodeSnippet;
|
|
37
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/error-snippets/index.ts"],"names":[],"mappings":";;;;;;AAAA,qCAAiF;AACjF,+CAAgF;AAChF,mCAAgE;AAChE,6DAAqC;AAGrC,MAAM,0BAA0B,GAAG,KAAK,EAAE,UAAgC,EAA0B,EAAE;IAClG,MAAM,YAAY,GAAG,MAAM,IAAA,yBAAiB,EAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAClE,MAAM,UAAU,GAAG,MAAM,IAAA,+BAAiB,EAAC,YAAY,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;IAE9E,OAAO,UAAU;QACb,CAAC,CAAC,IAAA,0CAA4B,EAAC,UAAU,EAAE,UAAU,CAAC;QACtD,CAAC,CAAC,IAAA,sCAA6B,EAAC,UAAU,EAAE,YAAY,CAAC,CAAC;AAClE,CAAC,CAAC;AAEK,MAAM,qBAAqB,GAAG,KAAK,EAAE,GAAqB,EAA6B,EAAE;IAC5F,IAAI,CAAC,GAAG,EAAE,CAAC;QACP,OAAO,GAAG,CAAC;IACf,CAAC;IAED,IAAI,CAAC;QACD,MAAM,kBAAkB,GAAG,IAAA,+BAAsB,EAAC,GAAG,CAAC,CAAC;QAEvD,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACtB,OAAO,GAAG,CAAC;QACf,CAAC;QAED,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,0BAA0B,CAAC,kBAAkB,CAAC,CAAC;QAExF,GAAG,CAAC,OAAO,GAAG,IAAA,0BAAkB,EAAC,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QAElE,OAAO,GAAG,CAAC;IACf,CAAC;IAAC,OAAO,YAAY,EAAE,CAAC;QACpB,gBAAM,CAAC,IAAI,CAAC,+BAA+B,EAAE,YAAY,CAAC,CAAC;QAE3D,OAAO,GAAG,CAAC;IACf,CAAC;AACL,CAAC,CAAC;AAtBW,QAAA,qBAAqB,yBAsBhC"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { type BasicSourceMapConsumer } from "source-map";
|
|
2
|
+
import type { SufficientStackFrame, ResolvedFrame } from "./types";
|
|
3
|
+
export declare const extractSourceMaps: (fileContents: string, fileName: string) => Promise<BasicSourceMapConsumer | null>;
|
|
4
|
+
export declare const resolveLocationWithSourceMap: (stackFrame: SufficientStackFrame, sourceMaps: BasicSourceMapConsumer) => ResolvedFrame;
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.resolveLocationWithSourceMap = exports.extractSourceMaps = void 0;
|
|
7
|
+
const source_map_1 = require("source-map");
|
|
8
|
+
const url_1 = __importDefault(require("url"));
|
|
9
|
+
const constants_1 = require("./constants");
|
|
10
|
+
const utils_1 = require("./utils");
|
|
11
|
+
const extractSourceMaps = async (fileContents, fileName) => {
|
|
12
|
+
const sourceMapsStartIndex = fileContents.indexOf(constants_1.SOURCE_MAP_URL_COMMENT);
|
|
13
|
+
const sourceMapsEndIndex = fileContents.indexOf("\n", sourceMapsStartIndex);
|
|
14
|
+
if (sourceMapsStartIndex === -1) {
|
|
15
|
+
return null;
|
|
16
|
+
}
|
|
17
|
+
const sourceMapUrl = sourceMapsEndIndex === -1
|
|
18
|
+
? fileContents.slice(sourceMapsStartIndex + constants_1.SOURCE_MAP_URL_COMMENT.length)
|
|
19
|
+
: fileContents.slice(sourceMapsStartIndex + constants_1.SOURCE_MAP_URL_COMMENT.length, sourceMapsEndIndex);
|
|
20
|
+
const sourceMaps = await (0, utils_1.getSourceCodeFile)(url_1.default.resolve(fileName, sourceMapUrl));
|
|
21
|
+
return new source_map_1.SourceMapConsumer(sourceMaps);
|
|
22
|
+
};
|
|
23
|
+
exports.extractSourceMaps = extractSourceMaps;
|
|
24
|
+
const resolveLocationWithSourceMap = (stackFrame, sourceMaps) => {
|
|
25
|
+
const positions = sourceMaps.originalPositionFor({ line: stackFrame.lineNumber, column: stackFrame.columnNumber });
|
|
26
|
+
const source = positions.source ? sourceMaps.sourceContentFor(positions.source) : null;
|
|
27
|
+
const location = { line: positions.line, column: positions.column };
|
|
28
|
+
if (!source) {
|
|
29
|
+
throw new Error("File source code could not be evaluated from the source map");
|
|
30
|
+
}
|
|
31
|
+
if (!location.line || !location.column) {
|
|
32
|
+
throw new Error("Line and column could not be evaluated from the source map");
|
|
33
|
+
}
|
|
34
|
+
return { file: (0, utils_1.softFileURLToPath)(sourceMaps.file), source, location };
|
|
35
|
+
};
|
|
36
|
+
exports.resolveLocationWithSourceMap = resolveLocationWithSourceMap;
|
|
37
|
+
//# sourceMappingURL=source-maps.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"source-maps.js","sourceRoot":"","sources":["../../../src/error-snippets/source-maps.ts"],"names":[],"mappings":";;;;;;AAAA,2CAA4E;AAC5E,8CAAsB;AACtB,2CAAqD;AACrD,mCAA+D;AAGxD,MAAM,iBAAiB,GAAG,KAAK,EAClC,YAAoB,EACpB,QAAgB,EACsB,EAAE;IACxC,MAAM,oBAAoB,GAAG,YAAY,CAAC,OAAO,CAAC,kCAAsB,CAAC,CAAC;IAC1E,MAAM,kBAAkB,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;IAE5E,IAAI,oBAAoB,KAAK,CAAC,CAAC,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,YAAY,GACd,kBAAkB,KAAK,CAAC,CAAC;QACrB,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,oBAAoB,GAAG,kCAAsB,CAAC,MAAM,CAAC;QAC1E,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,oBAAoB,GAAG,kCAAsB,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAEvG,MAAM,UAAU,GAAG,MAAM,IAAA,yBAAiB,EAAC,aAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;IAEhF,OAAO,IAAI,8BAAiB,CAAC,UAAU,CAAoC,CAAC;AAChF,CAAC,CAAC;AAnBW,QAAA,iBAAiB,qBAmB5B;AAEK,MAAM,4BAA4B,GAAG,CACxC,UAAgC,EAChC,UAAkC,EACrB,EAAE;IACf,MAAM,SAAS,GAAG,UAAU,CAAC,mBAAmB,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,CAAC,YAAY,EAAE,CAAC,CAAC;IACnH,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,gBAAgB,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACvF,MAAM,QAAQ,GAAG,EAAE,IAAI,EAAE,SAAS,CAAC,IAAK,EAAE,MAAM,EAAE,SAAS,CAAC,MAAO,EAAE,CAAC;IAEtE,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;IACnF,CAAC;IAED,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;IAClF,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,IAAA,yBAAiB,EAAC,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;AAC1E,CAAC,CAAC;AAjBW,QAAA,4BAA4B,gCAiBvC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import type { SetRequired } from "type-fest";
|
|
2
|
+
export type WithSnippetError = Error & {
|
|
3
|
+
snippet?: string;
|
|
4
|
+
};
|
|
5
|
+
export type SufficientStackFrame = SetRequired<StackFrame, "fileName" | "lineNumber" | "columnNumber">;
|
|
6
|
+
export type ResolvedFrame = {
|
|
7
|
+
source: string;
|
|
8
|
+
file: string;
|
|
9
|
+
location: {
|
|
10
|
+
line: number;
|
|
11
|
+
column: number;
|
|
12
|
+
};
|
|
13
|
+
};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/error-snippets/types.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
interface FormatFileNameHeaderOpts {
|
|
2
|
+
line: number;
|
|
3
|
+
linesAbove: number;
|
|
4
|
+
linesBelow: number;
|
|
5
|
+
}
|
|
6
|
+
interface FormatErrorSnippetOpts {
|
|
7
|
+
file: string;
|
|
8
|
+
source: string;
|
|
9
|
+
location: {
|
|
10
|
+
line: number;
|
|
11
|
+
column: number;
|
|
12
|
+
};
|
|
13
|
+
}
|
|
14
|
+
export declare const softFileURLToPath: (fileName: string) => string;
|
|
15
|
+
export declare const formatFileNameHeader: (fileName: string, opts: FormatFileNameHeaderOpts) => string;
|
|
16
|
+
export declare const formatErrorSnippet: (error: Error, { file, source, location }: FormatErrorSnippetOpts) => string;
|
|
17
|
+
export declare const getSourceCodeFile: (fileName: string) => Promise<string>;
|
|
18
|
+
export {};
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.getSourceCodeFile = exports.formatErrorSnippet = exports.formatFileNameHeader = exports.softFileURLToPath = void 0;
|
|
7
|
+
const path_1 = __importDefault(require("path"));
|
|
8
|
+
const url_1 = require("url");
|
|
9
|
+
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
10
|
+
const code_frame_1 = require("@babel/code-frame");
|
|
11
|
+
const utils_1 = require("../browser/stacktrace/utils");
|
|
12
|
+
const constants_1 = require("./constants");
|
|
13
|
+
const softFileURLToPath = (fileName) => {
|
|
14
|
+
if (!fileName.startsWith("file://")) {
|
|
15
|
+
return fileName;
|
|
16
|
+
}
|
|
17
|
+
try {
|
|
18
|
+
return (0, url_1.fileURLToPath)(fileName);
|
|
19
|
+
}
|
|
20
|
+
catch (_) {
|
|
21
|
+
return fileName;
|
|
22
|
+
}
|
|
23
|
+
};
|
|
24
|
+
exports.softFileURLToPath = softFileURLToPath;
|
|
25
|
+
const formatFileNameHeader = (fileName, opts) => {
|
|
26
|
+
const lineNumberWidth = String(opts.line - opts.linesAbove).length;
|
|
27
|
+
const offsetWidth = String(opts.line + opts.linesBelow).length;
|
|
28
|
+
const filePath = (0, exports.softFileURLToPath)(fileName);
|
|
29
|
+
const relativeFileName = path_1.default.isAbsolute(filePath) ? path_1.default.relative(process.cwd(), filePath) : filePath;
|
|
30
|
+
const lineNumberOffset = ".".repeat(lineNumberWidth).padStart(offsetWidth);
|
|
31
|
+
const offset = ` ${lineNumberOffset} |`;
|
|
32
|
+
const grayBegin = "\x1B[90m";
|
|
33
|
+
const grayEnd = "\x1B[39m";
|
|
34
|
+
return [offset + ` // ${relativeFileName}`, offset].map(line => grayBegin + line + grayEnd + "\n").join("");
|
|
35
|
+
};
|
|
36
|
+
exports.formatFileNameHeader = formatFileNameHeader;
|
|
37
|
+
const formatErrorSnippet = (error, { file, source, location }) => {
|
|
38
|
+
const linesAbove = constants_1.SNIPPET_LINES_ABOVE;
|
|
39
|
+
const linesBelow = constants_1.SNIPPET_LINES_BELOW;
|
|
40
|
+
const formattedFileNameHeader = (0, exports.formatFileNameHeader)(file, { linesAbove, linesBelow, line: location.line });
|
|
41
|
+
const snippet = formattedFileNameHeader +
|
|
42
|
+
(0, code_frame_1.codeFrameColumns)(source, { start: location }, {
|
|
43
|
+
linesAbove,
|
|
44
|
+
linesBelow,
|
|
45
|
+
message: (0, utils_1.getErrorTitle)(error),
|
|
46
|
+
highlightCode: true,
|
|
47
|
+
forceColor: true,
|
|
48
|
+
});
|
|
49
|
+
return `\n${snippet}\n`;
|
|
50
|
+
};
|
|
51
|
+
exports.formatErrorSnippet = formatErrorSnippet;
|
|
52
|
+
const getSourceCodeFile = async (fileName) => {
|
|
53
|
+
const filePath = (0, exports.softFileURLToPath)(fileName);
|
|
54
|
+
if (path_1.default.isAbsolute(filePath)) {
|
|
55
|
+
return fs_extra_1.default.readFile(filePath, "utf8");
|
|
56
|
+
}
|
|
57
|
+
const response = await fetch(filePath);
|
|
58
|
+
const responseText = await response.text();
|
|
59
|
+
if (responseText.includes(constants_1.SOURCE_MAP_URL_COMMENT) || !response.headers.has("SourceMap")) {
|
|
60
|
+
return responseText;
|
|
61
|
+
}
|
|
62
|
+
const sourceMapUrl = response.headers.get("SourceMap");
|
|
63
|
+
return responseText + "\n" + constants_1.SOURCE_MAP_URL_COMMENT + sourceMapUrl;
|
|
64
|
+
};
|
|
65
|
+
exports.getSourceCodeFile = getSourceCodeFile;
|
|
66
|
+
//# sourceMappingURL=utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/error-snippets/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,6 +25,9 @@ module.exports = class FlatReporter extends BaseReporter {
|
|
|
25
25
|
_.forEach(test.browsers, testCase => {
|
|
26
26
|
const icon = testCase.isFailed ? icons.FAIL : icons.RETRY;
|
|
27
27
|
this.informer.log(` ${testCase.browserId}`);
|
|
28
|
+
if (testCase.errorSnippet) {
|
|
29
|
+
testCase.errorSnippet.split("\n").forEach(line => this.informer.log(line));
|
|
30
|
+
}
|
|
28
31
|
this.informer.log(` ${icon} ${testCase.error}`);
|
|
29
32
|
});
|
|
30
33
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flat.js","sourceRoot":"","sources":["../../../src/reporters/flat.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC5B,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AACvC,MAAM,OAAO,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAC3C,MAAM,KAAK,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAEvC,MAAM,CAAC,OAAO,GAAG,MAAM,YAAa,SAAQ,YAAY;IACpD,YAAY,GAAG,IAAI;QACf,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;QAEf,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;IACrB,CAAC;IAED,WAAW,CAAC,IAAI;QACZ,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAExB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IACvE,CAAC;IAED,QAAQ,CAAC,IAAI;QACT,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAErB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,kBAAkB,CAAC,KAAK;QACpB,KAAK,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAEhC,MAAM,WAAW,GAAG,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAE3D,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YAChC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,KAAK,GAAG,CAAC,KAAK,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;YACvD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,cAAc,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC;YAE/C,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE;gBAChC,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;gBAE1D,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC;gBAC9C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,IAAI,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;YACxD,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;CACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"flat.js","sourceRoot":"","sources":["../../../src/reporters/flat.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC5B,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AACvC,MAAM,OAAO,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAC3C,MAAM,KAAK,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAEvC,MAAM,CAAC,OAAO,GAAG,MAAM,YAAa,SAAQ,YAAY;IACpD,YAAY,GAAG,IAAI;QACf,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;QAEf,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;IACrB,CAAC;IAED,WAAW,CAAC,IAAI;QACZ,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAExB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IACvE,CAAC;IAED,QAAQ,CAAC,IAAI;QACT,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAErB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,kBAAkB,CAAC,KAAK;QACpB,KAAK,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAEhC,MAAM,WAAW,GAAG,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAE3D,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YAChC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,KAAK,GAAG,CAAC,KAAK,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;YACvD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,cAAc,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC;YAE/C,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE;gBAChC,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;gBAE1D,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC;gBAC9C,IAAI,QAAQ,CAAC,YAAY,EAAE,CAAC;oBACxB,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC/E,CAAC;gBACD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,IAAI,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;YACxD,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;CACJ,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
const path = require("path");
|
|
3
3
|
const chalk = require("chalk");
|
|
4
|
+
const stripAnsi = require("strip-ansi");
|
|
4
5
|
const _ = require("lodash");
|
|
5
6
|
const getSkipReason = test => test && (getSkipReason(test.parent) || test.skipReason);
|
|
6
7
|
const getFilePath = test => (test && test.file) || (test.parent && getFilePath(test.parent));
|
|
@@ -31,7 +32,10 @@ exports.getTestInfo = test => {
|
|
|
31
32
|
meta: test.meta,
|
|
32
33
|
};
|
|
33
34
|
if (test.err) {
|
|
34
|
-
testInfo.error = getTestError(test);
|
|
35
|
+
testInfo.error = chalk.supportsColor ? getTestError(test) : stripAnsi(getTestError(test));
|
|
36
|
+
}
|
|
37
|
+
if (test.err && test.err.snippet) {
|
|
38
|
+
testInfo.errorSnippet = chalk.supportsColor ? test.err.snippet : stripAnsi(test.err.snippet);
|
|
35
39
|
}
|
|
36
40
|
if (test.pending) {
|
|
37
41
|
testInfo.reason = getSkipReason(test);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../src/reporters/utils/helpers.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7B,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAC/B,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAE5B,MAAM,aAAa,GAAG,IAAI,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC;AACtF,MAAM,WAAW,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;AAC7F,MAAM,mBAAmB,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;AAE5F,MAAM,YAAY,GAAG,IAAI,CAAC,EAAE;IACxB,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC;IAElF,IAAI,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;QACrC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,gBAAgB,GAAG,CAAC,CAAC;IACjF,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC,CAAC;AAEF,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,EAAE;IAC5B,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAC3D,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7D,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,IAAI,YAAY,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,YAAY,CAAC,EAAE,CAAC;IAE5F,OAAO,CACH,IAAI,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;QAC9E,GAAG,SAAS,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,KAAK,MAAM,IAAI,EAAE,EAAE,CACvE,CAAC;AACN,CAAC,CAAC;AAEF,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,EAAE;IACzB,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;IAC/B,MAAM,QAAQ,GAAG;QACb,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE;QAC3B,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,IAAI,EAAE,mBAAmB,CAAC,IAAI,CAAC;QAC/B,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,IAAI,EAAE,IAAI,CAAC,IAAI;KAClB,CAAC;IAEF,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;QACX,QAAQ,CAAC,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../src/reporters/utils/helpers.js"],"names":[],"mappings":"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"}
|
|
@@ -36,7 +36,10 @@ module.exports = (_a = class TestReader extends EventEmitter {
|
|
|
36
36
|
.useSets((sets || []).concat(envSets))
|
|
37
37
|
.useBrowsers(browsers)
|
|
38
38
|
.build(process.cwd(), { ignore }, fileExtensions);
|
|
39
|
-
const
|
|
39
|
+
const testRunEnv = _.isArray(__classPrivateFieldGet(this, _TestReader_config, "f").system.testRunEnv)
|
|
40
|
+
? __classPrivateFieldGet(this, _TestReader_config, "f").system.testRunEnv[0]
|
|
41
|
+
: __classPrivateFieldGet(this, _TestReader_config, "f").system.testRunEnv;
|
|
42
|
+
const parser = new TestParser({ testRunEnv });
|
|
40
43
|
passthroughEvent(parser, this, [MasterEvents.BEFORE_FILE_READ, MasterEvents.AFTER_FILE_READ]);
|
|
41
44
|
await parser.loadFiles(setCollection.getAllFiles(), __classPrivateFieldGet(this, _TestReader_config, "f"));
|
|
42
45
|
const filesByBro = setCollection.groupByBrowser();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/test-reader/index.js"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC5B,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC3C,MAAM,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AACxD,MAAM,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAC9C,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAChD,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AAC9C,MAAM,GAAG,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAEpC,MAAM,CAAC,OAAO,SAAG,MAAM,UAAW,SAAQ,YAAY;QAGlD,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI;YACjB,OAAO,IAAI,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;QAC7B,CAAC;QAED,YAAY,MAAM;YACd,KAAK,EAAE,CAAC;YAPZ,qCAAQ;YASJ,uBAAA,IAAI,sBAAW,MAAM,MAAA,CAAC;QAC1B,CAAC;QAED,KAAK,CAAC,IAAI,CAAC,OAAO,GAAG,EAAE;YACnB,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;YAExD,MAAM,EAAE,cAAc,EAAE,GAAG,uBAAA,IAAI,0BAAQ,CAAC,MAAM,CAAC;YAC/C,MAAM,OAAO,GAAG,GAAG,CAAC,wBAAwB,CAAC,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC;YACxF,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,uBAAA,IAAI,0BAAQ,CAAC,IAAI,EAAE,EAAE,YAAY,EAAE,CAAC,WAAW,EAAE,UAAU,CAAC,EAAE,CAAC;iBACzG,QAAQ,CAAC,KAAK,CAAC;iBACf,OAAO,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;iBACrC,WAAW,CAAC,QAAQ,CAAC;iBACrB,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,cAAc,CAAC,CAAC;YAEtD,MAAM,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/test-reader/index.js"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
export class TestParser extends EventEmitter {
|
|
2
|
-
|
|
2
|
+
/**
|
|
3
|
+
* @param {object} opts
|
|
4
|
+
* @param {"nodejs" | "browser" | undefined} opts.testRunEnv - environment to parse tests for
|
|
5
|
+
*/
|
|
6
|
+
constructor(opts?: {
|
|
7
|
+
testRunEnv: "nodejs" | "browser" | undefined;
|
|
8
|
+
});
|
|
3
9
|
loadFiles(files: any, config: any): Promise<void>;
|
|
4
10
|
parse(files: any, { browserId, config, grep }: {
|
|
5
11
|
browserId: any;
|
|
@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
10
10
|
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
11
11
|
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
12
12
|
};
|
|
13
|
-
var _TestParser_instances, _TestParser_buildInstructions, _TestParser_applyInstructionsEvents, _TestParser_passthroughFileEvents, _TestParser_clearRequireCache, _TestParser_validateUniqTitles;
|
|
13
|
+
var _TestParser_instances, _TestParser_opts, _TestParser_buildInstructions, _TestParser_applyInstructionsEvents, _TestParser_passthroughFileEvents, _TestParser_clearRequireCache, _TestParser_validateUniqTitles;
|
|
14
14
|
const { EventEmitter } = require("events");
|
|
15
15
|
const { InstructionsList, Instructions } = require("./build-instructions");
|
|
16
16
|
const { SkipController } = require("./controllers/skip-controller");
|
|
@@ -27,10 +27,16 @@ const _ = require("lodash");
|
|
|
27
27
|
const clearRequire = require("clear-require");
|
|
28
28
|
const path = require("path");
|
|
29
29
|
class TestParser extends EventEmitter {
|
|
30
|
-
|
|
30
|
+
/**
|
|
31
|
+
* @param {object} opts
|
|
32
|
+
* @param {"nodejs" | "browser" | undefined} opts.testRunEnv - environment to parse tests for
|
|
33
|
+
*/
|
|
34
|
+
constructor(opts = {}) {
|
|
31
35
|
super();
|
|
32
36
|
_TestParser_instances.add(this);
|
|
37
|
+
_TestParser_opts.set(this, void 0);
|
|
33
38
|
_TestParser_buildInstructions.set(this, void 0);
|
|
39
|
+
__classPrivateFieldSet(this, _TestParser_opts, opts, "f");
|
|
34
40
|
__classPrivateFieldSet(this, _TestParser_buildInstructions, new InstructionsList(), "f");
|
|
35
41
|
}
|
|
36
42
|
async loadFiles(files, config) {
|
|
@@ -53,7 +59,7 @@ class TestParser extends EventEmitter {
|
|
|
53
59
|
__classPrivateFieldGet(this, _TestParser_instances, "m", _TestParser_applyInstructionsEvents).call(this, eventBus);
|
|
54
60
|
__classPrivateFieldGet(this, _TestParser_instances, "m", _TestParser_passthroughFileEvents).call(this, eventBus, toolGlobals);
|
|
55
61
|
__classPrivateFieldGet(this, _TestParser_instances, "m", _TestParser_clearRequireCache).call(this, files);
|
|
56
|
-
const revertTransformHook = setupTransformHook();
|
|
62
|
+
const revertTransformHook = setupTransformHook({ removeNonJsImports: __classPrivateFieldGet(this, _TestParser_opts, "f").testRunEnv === "browser" });
|
|
57
63
|
const rand = Math.random();
|
|
58
64
|
const esmDecorator = f => f + `?rand=${rand}`;
|
|
59
65
|
await readFiles(files, { esmDecorator, config: mochaOpts, eventBus });
|
|
@@ -71,7 +77,7 @@ class TestParser extends EventEmitter {
|
|
|
71
77
|
return tests;
|
|
72
78
|
}
|
|
73
79
|
}
|
|
74
|
-
_TestParser_buildInstructions = new WeakMap(), _TestParser_instances = new WeakSet(), _TestParser_applyInstructionsEvents = function _TestParser_applyInstructionsEvents(eventBus) {
|
|
80
|
+
_TestParser_opts = new WeakMap(), _TestParser_buildInstructions = new WeakMap(), _TestParser_instances = new WeakSet(), _TestParser_applyInstructionsEvents = function _TestParser_applyInstructionsEvents(eventBus) {
|
|
75
81
|
let currentFile;
|
|
76
82
|
eventBus
|
|
77
83
|
.on(MasterEvents.BEFORE_FILE_READ, ({ file }) => (currentFile = file))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-parser.js","sourceRoot":"","sources":["../../../src/test-reader/test-parser.js"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC3C,MAAM,EAAE,gBAAgB,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;AAC3E,MAAM,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAC;AACpE,MAAM,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAC;AACpE,MAAM,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,iCAAiC,CAAC,CAAC;AACxE,MAAM,wBAAwB,GAAG,OAAO,CAAC,0CAA0C,CAAC,CAAC;AACrF,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAClD,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAChD,MAAM,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AAClD,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AACvD,MAAM,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAC7D,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AAC9C,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC5B,MAAM,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAC9C,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAE7B,MAAM,UAAW,SAAQ,YAAY;
|
|
1
|
+
{"version":3,"file":"test-parser.js","sourceRoot":"","sources":["../../../src/test-reader/test-parser.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-transformer.js","sourceRoot":"","sources":["../../../src/test-reader/test-transformer.ts"],"names":[],"mappings":";AAAA,uDAAuD;;;AAEvD,wIAAwI;AAC3H,QAAA,kBAAkB,
|
|
1
|
+
{"version":3,"file":"test-transformer.js","sourceRoot":"","sources":["../../../src/test-reader/test-transformer.ts"],"names":[],"mappings":";AAAA,uDAAuD;;;AAEvD,wIAAwI;AAC3H,QAAA,kBAAkB,GAC3B,OAAO,CAAC,WAAW,CAAC,CAAC,kBAAkB,CAAC;AAC/B,QAAA,oBAAoB,GAAa,OAAO,CAAC,WAAW,CAAC,CAAC,oBAAoB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/worker/browser-env/runner/test-runner/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAiC;AACjC,wDAAyB;AACzB,oDAAuB;AACvB,uDAAsC;AACtC,wDAA+B;AAE/B,8EAA8D;AAC9D,yDAAyD;AACzD,mCAA2C;AAC3C,2CAAgF;AAChF,6EAAoF;AACpF,sEAA8C;AAC9C,uFAA8D;AAE9D,qEAA8E;AAe9E,MAAM,WAAW,GAAG,CAAI,IAAO,EAAK,EAAE;IAClC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAC9E,CAAC,CAAC;AAEF,MAAa,UAAW,SAAQ,qBAAmB;IAK/C,YAAY,IAA8B;QACtC,KAAK,CAAC,IAAI,CAAC,CAAC;QAJR,aAAQ,GAAW,qBAAM,CAAC,UAAU,EAAE,CAAC;QAM3C,IAAI,CAAC,OAAO,GAAG,IAAA,qBAAE,EAAC,wBAAa,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE;YACvD,UAAU,EAAE,CAAC,WAAW,CAAC;YACzB,IAAI,EAAE;gBACF,OAAO,EAAE,IAAI,CAAC,QAAQ;gBACtB,IAAI,EAAE,+BAAmB;aAC5B;SACJ,CAAqB,CAAC;QAEvB,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,eAAe,EAAE,GAAG,CAAC,EAAE;YACnC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;gBACvB,gBAAM,CAAC,IAAI,CACP,mBAAmB,OAAO,CAAC,GAAG,gBAAgB,IAAI,CAAC,QAAQ,yCAAyC,EACpG,GAAG,CACN,CAAC;YACN,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,IAA6B;QACnC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QAErB,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,EAAE,kBAAkB,EAAE,IAAA,sCAAmB,EAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/worker/browser-env/runner/test-runner/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAiC;AACjC,wDAAyB;AACzB,oDAAuB;AACvB,uDAAsC;AACtC,wDAA+B;AAE/B,8EAA8D;AAC9D,yDAAyD;AACzD,mCAA2C;AAC3C,2CAAgF;AAChF,6EAAoF;AACpF,sEAA8C;AAC9C,uFAA8D;AAE9D,qEAA8E;AAe9E,MAAM,WAAW,GAAG,CAAI,IAAO,EAAK,EAAE;IAClC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAC9E,CAAC,CAAC;AAEF,MAAa,UAAW,SAAQ,qBAAmB;IAK/C,YAAY,IAA8B;QACtC,KAAK,CAAC,IAAI,CAAC,CAAC;QAJR,aAAQ,GAAW,qBAAM,CAAC,UAAU,EAAE,CAAC;QAM3C,IAAI,CAAC,OAAO,GAAG,IAAA,qBAAE,EAAC,wBAAa,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE;YACvD,UAAU,EAAE,CAAC,WAAW,CAAC;YACzB,IAAI,EAAE;gBACF,OAAO,EAAE,IAAI,CAAC,QAAQ;gBACtB,IAAI,EAAE,+BAAmB;aAC5B;SACJ,CAAqB,CAAC;QAEvB,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,eAAe,EAAE,GAAG,CAAC,EAAE;YACnC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;gBACvB,gBAAM,CAAC,IAAI,CACP,mBAAmB,OAAO,CAAC,GAAG,gBAAgB,IAAI,CAAC,QAAQ,yCAAyC,EACpG,GAAG,CACN,CAAC;YACN,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,IAA6B;QACnC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QAErB,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,EAAE,kBAAkB,EAAE,IAAA,sCAAmB,EAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAEpG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,wBAAgB,CAAC,QAAQ,CAAC,CAAC;QAE7C,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,sBAAsB,CAAC,OAAgB,EAAE,OAAuB;QAC5D,OAAO;YACH,KAAK,IAAmB,EAAE;gBACtB,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,wDAAa,iCAAiC,GAAC,CAAC;gBAEpF,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,yBAAiB,CAAC,iBAAiB,EAAE,OAAO,CAAC,EAAE;oBAC3D,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;gBACrD,CAAC,CAAC,CAAC;gBAEH,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,yBAAiB,CAAC,iBAAiB,EAAE,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC7F,IAAI,CAAC,OAAO,CAAC,EAAE,CACX,yBAAiB,CAAC,gBAAgB,EAClC,IAAI,CAAC,uBAAuB,CAAC,OAAO,EAAE,cAAc,CAAC,CACxD,CAAC;gBAEF,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,wBAAgB,CAAC,UAAU,EAAE;oBAC3C,IAAI,EAAE,IAAI,CAAC,KAAK;oBAChB,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS;oBAClC,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW;oBACvC,qBAAqB,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,YAAY;oBAC7D,cAAc,EAAE,OAAO,CAAC,cAAc;oBACtC,MAAM,EAAE,IAAI,CAAC,OAAwB;oBACrC,cAAc,EAAE,MAAM,CAAC,mBAAmB,CAAC,cAAc,CAAC;iBAC7D,CAAC,CAAC;gBAEH,MAAM,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,gBAAgB,EAAE,UAAU,EAAE,KAAK,IAAI,EAAE;oBACpE,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBACrC,CAAC,CAAC,CAAC;YACP,CAAC;YACD,GAAG,KAAK,CAAC,sBAAsB,CAAC,OAAO,EAAE,OAAO,CAAC;SACpD,CAAC;IACN,CAAC;IAEO,wBAAwB,CAAC,OAAgB;QAC7C,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAEvC,OAAO,KAAK,EAAE,OAAO,EAAE,EAAE,EAAiB,EAAE;YACxC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;YAC/B,MAAM,OAAO,GAAG,IAA4B,CAAC;YAE7C,IAAI,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,UAAU,EAAE,CAAC;gBACzC,EAAE,CAAC,CAAC,WAAW,CAAQ,IAAI,KAAK,CAAC,YAAY,IAAI,uCAAuC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC7F,OAAO;YACX,CAAC;YAED,IAAI,CAAC;gBACD,MAAM,MAAM,GAAG,MAAO,OAAO,CAAC,OAAO,CAA8C,CAAC,GAAG,IAAI,CAAC,CAAC;gBAE7F,IAAI,gBAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;oBACpB,OAAO,EAAE,CAAC,CAAC,WAAW,CAAQ,MAAM,CAAC,CAAC,CAAC,CAAC;gBAC5C,CAAC;gBAED,IAAI,gBAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;oBACpB,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBAC/C,CAAC;gBAED,EAAE,CAAC,CAAC,IAAI,EAAE,gBAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YAClE,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,EAAE,CAAC,CAAC,WAAW,CAAQ,GAAY,CAAC,CAAC,CAAC,CAAC;YAC3C,CAAC;QACL,CAAC,CAAC;IACN,CAAC;IAEO,uBAAuB,CAC3B,OAAgB,EAChB,cAAkC;QAElC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAEvC,OAAO,KAAK,EAAE,OAAO,EAAE,EAAE,EAAiB,EAAE;YACxC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBACjB,OAAO,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,6BAA6B,EAAE,CAAC,CAAC,CAAC;YACzE,CAAC;YAED,MAAM,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,IAAgC,CAAsB,CAAC;YAE9F,IAAI,CAAC,OAAO,EAAE,CAAC;gBACX,OAAO,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,2CAA2C,OAAO,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC;YACtG,CAAC;YAED,IAAI,CAAC;gBACD,IAAI,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC;gBAEzC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;oBAClB,IAAI,gBAAC,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;wBAC7B,OAAO,GAAG,MAAM,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;oBAChD,CAAC;yBAAM,IAAI,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;wBACnC,OAAO,GAAG,MAAM,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;wBAC3C,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,QAAoB,CAAC;oBAC5D,CAAC;yBAAM,CAAC;wBACJ,OAAO,GAAG,MAAM,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,QAAoB,CAAC,CAAC;oBACpE,CAAC;gBACL,CAAC;gBAED,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;gBAEtG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;YAC3D,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,qCAAqC,OAAO,CAAC,IAAI,MAAM,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;YACjG,CAAC;QACL,CAAC,CAAC;IACN,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,OAAgB;QACvC,MAAM,iBAAiB,GAAG,IAAI,kBAAC,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAChD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,yBAAiB,CAAC,UAAU,EAAE,MAAM,CAAC,EAAE;gBACrD,gBAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YACtD,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;QACxE,MAAM,GAAG,GAAG,IAAA,kBAAO,EAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,+BAAmB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAE9E,MAAM,OAAO,CAAC,GAAG,CAAC;YACd,iBAAiB,CAAC,OAAO,CAAC,OAAO,EAAE,gDAAgD,OAAO,IAAI,CAAC;YAC/F,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC;SAC7B,CAAC,CAAC;IACP,CAAC;CACJ;AA1JD,gCA0JC;AAED,8DAA8D;AAC9D,SAAS,kBAAkB,CAAC,GAAQ;IAChC,IACI,OAAO,GAAG,KAAK,QAAQ;QACvB,UAAU,IAAI,GAAG;QACjB,MAAM,CAAC,IAAI,CAAC,wCAA4B,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,EAClE,CAAC;QACC,MAAM,UAAU,GAAG,wCAA4B,CAC3C,GAAG,CAAC,QAAqD,CAChC,CAAC;QAC9B,8DAA8D;QAC9D,MAAM,OAAO,GAAQ,GAAG,CAAC,OAAO,CAAC,CAAC,CAAE,MAAM,CAAC,MAAM,CAAC,GAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAE,MAAM,CAAC,MAAc,CAAC,UAAU,CAAC,CAAC;QAE/G,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,YAAY,UAAU,0CAA0C,CAAC,CAAC;QACtF,CAAC;QAED,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;IAED,OAAO,GAAG,CAAC;AACf,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
const _ = require("lodash");
|
|
2
3
|
const { EventEmitter } = require("events");
|
|
3
4
|
const { passthroughEvent } = require("../../events/utils");
|
|
4
5
|
const { TestParser } = require("../../test-reader/test-parser");
|
|
@@ -12,7 +13,10 @@ module.exports = class SimpleTestParser extends EventEmitter {
|
|
|
12
13
|
this._config = config;
|
|
13
14
|
}
|
|
14
15
|
async parse({ file, browserId }) {
|
|
15
|
-
const
|
|
16
|
+
const testRunEnv = _.isArray(this._config.system.testRunEnv)
|
|
17
|
+
? this._config.system.testRunEnv[0]
|
|
18
|
+
: this._config.system.testRunEnv;
|
|
19
|
+
const parser = new TestParser({ testRunEnv });
|
|
16
20
|
passthroughEvent(parser, this, [WorkerEvents.BEFORE_FILE_READ, WorkerEvents.AFTER_FILE_READ]);
|
|
17
21
|
await parser.loadFiles([file], this._config);
|
|
18
22
|
return parser.parse([file], { browserId, config: this._config.forBrowser(browserId) });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simple-test-parser.js","sourceRoot":"","sources":["../../../../src/worker/runner/simple-test-parser.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC3C,MAAM,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAC3D,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAC;AAChE,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAEjD,MAAM,CAAC,OAAO,GAAG,MAAM,gBAAiB,SAAQ,YAAY;IACxD,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI;QACjB,OAAO,IAAI,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,YAAY,MAAM;QACd,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE;QAC3B,MAAM,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"simple-test-parser.js","sourceRoot":"","sources":["../../../../src/worker/runner/simple-test-parser.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC5B,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC3C,MAAM,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAC3D,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAC;AAChE,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAEjD,MAAM,CAAC,OAAO,GAAG,MAAM,gBAAiB,SAAQ,YAAY;IACxD,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI;QACjB,OAAO,IAAI,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,YAAY,MAAM;QACd,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE;QAC3B,MAAM,UAAU,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC;YACxD,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;YACnC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC;QAErC,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;QAE9C,gBAAgB,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,YAAY,CAAC,gBAAgB,EAAE,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC;QAE9F,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAE7C,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IAC3F,CAAC;CACJ,CAAC"}
|
|
@@ -8,6 +8,8 @@ const OneTimeScreenshooter = require("./one-time-screenshooter");
|
|
|
8
8
|
const { AssertViewError } = require("../../../browser/commands/assert-view/errors/assert-view-error");
|
|
9
9
|
const history = require("../../../browser/history");
|
|
10
10
|
const { SAVE_HISTORY_MODE } = require("../../../constants/config");
|
|
11
|
+
const { filterExtraWdioFrames } = require("../../../browser/stacktrace/utils");
|
|
12
|
+
const { extendWithCodeSnippet } = require("../../../error-snippets");
|
|
11
13
|
module.exports = class TestRunner extends Runner {
|
|
12
14
|
static create(...args) {
|
|
13
15
|
return new this(...args);
|
|
@@ -98,6 +100,8 @@ module.exports = class TestRunner extends Runner {
|
|
|
98
100
|
}
|
|
99
101
|
this._browserAgent.freeBrowser(browser);
|
|
100
102
|
if (error) {
|
|
103
|
+
filterExtraWdioFrames(error);
|
|
104
|
+
await extendWithCodeSnippet(error);
|
|
101
105
|
throw Object.assign(error, results);
|
|
102
106
|
}
|
|
103
107
|
return results;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/worker/runner/test-runner/index.js"],"names":[],"mappings":"AAAA,qBAAqB;AACrB,YAAY,CAAC;AAEb,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC5B,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AACvC,MAAM,UAAU,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAC5C,MAAM,eAAe,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AACtD,MAAM,oBAAoB,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;AACjE,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,gEAAgE,CAAC,CAAC;AACtG,MAAM,OAAO,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;AACpD,MAAM,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/worker/runner/test-runner/index.js"],"names":[],"mappings":"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"}
|