creevey 0.9.9-handle-timeout-error → 0.9.9-handle-timeout-error.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/dist/cli.js +0 -0
- package/dist/server/master/index.js +1 -0
- package/dist/server/master/index.js.map +1 -1
- package/dist/server/master/master.js +2 -0
- package/dist/server/master/master.js.map +1 -1
- package/dist/server/master/pool.js +3 -0
- package/dist/server/master/pool.js.map +1 -1
- package/dist/server/master/runner.js +2 -0
- package/dist/server/master/runner.js.map +1 -1
- package/dist/server/storybook/providers/browser.js +9 -2
- package/dist/server/storybook/providers/browser.js.map +1 -1
- package/dist/server/storybook/providers/hybrid.js +7 -0
- package/dist/server/storybook/providers/hybrid.js.map +1 -1
- package/dist/server/testsFiles/parser.js +7 -0
- package/dist/server/testsFiles/parser.js.map +1 -1
- package/package.json +1 -1
- package/src/server/master/index.ts +1 -0
- package/src/server/master/master.ts +3 -0
- package/src/server/master/pool.ts +4 -0
- package/src/server/master/runner.ts +2 -0
- package/src/server/storybook/providers/browser.ts +8 -2
- package/src/server/storybook/providers/hybrid.ts +9 -0
- package/src/server/testsFiles/parser.ts +4 -0
package/dist/cli.js
CHANGED
|
File without changes
|
|
@@ -103,6 +103,7 @@ async function start(config, options, resolveApi) {
|
|
|
103
103
|
void (0, utils_js_1.shutdownWorkers)().then(() => process.exit());
|
|
104
104
|
});
|
|
105
105
|
});
|
|
106
|
+
(0, logger_js_1.logger)().debug('Starting tests');
|
|
106
107
|
// TODO grep
|
|
107
108
|
runner.start(Object.keys(runner.status.tests));
|
|
108
109
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/server/master/index.ts"],"names":[],"mappings":";;;;;AAmDA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/server/master/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ const types_js_1 = require("../../types.js");
|
|
|
9
9
|
const stories_js_1 = require("../stories.js");
|
|
10
10
|
const runner_js_1 = __importDefault(require("./runner.js"));
|
|
11
11
|
const utils_js_1 = require("../utils.js");
|
|
12
|
+
const logger_js_1 = require("../logger.js");
|
|
12
13
|
function mergeTests(testsWithReports, testsFromStories) {
|
|
13
14
|
Object.values(testsFromStories)
|
|
14
15
|
.filter(types_js_1.isDefined)
|
|
@@ -33,6 +34,7 @@ async function master(config, options) {
|
|
|
33
34
|
runner.updateTests(testsDiff);
|
|
34
35
|
(0, stories_js_1.saveTestsJson)(runner.tests, config.reportDir);
|
|
35
36
|
});
|
|
37
|
+
(0, logger_js_1.logger)().debug('Tests loaded');
|
|
36
38
|
runner.tests = mergeTests(testsFromReport, tests);
|
|
37
39
|
(0, stories_js_1.saveTestsJson)(runner.tests, config.reportDir);
|
|
38
40
|
return runner;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"master.js","sourceRoot":"","sources":["../../../src/server/master/master.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"master.js","sourceRoot":"","sources":["../../../src/server/master/master.ts"],"names":[],"mappings":";;;;;AAwBA,yBAyBC;AAjDD,gDAAwB;AACxB,6CAAyE;AACzE,8CAAoE;AACpE,4DAAiC;AACjC,0CAAiD;AACjD,4CAAsC;AAEtC,SAAS,UAAU,CACjB,gBAAmD,EACnD,gBAAqD;IAErD,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC;SAC5B,MAAM,CAAC,oBAAS,CAAC;SACjB,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAChB,MAAM,cAAc,GAAG,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC,cAAc;YAAE,OAAO;QAC5B,IAAI,CAAC,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC;QACtC,IAAI,cAAc,CAAC,MAAM,IAAI,SAAS,IAAI,cAAc,CAAC,MAAM,IAAI,QAAQ;YAAE,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC;QACjH,IAAI,CAAC,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC;QACtC,IAAI,CAAC,QAAQ,GAAG,cAAc,CAAC,QAAQ,CAAC;IAC1C,CAAC,CAAC,CAAC;IACL,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAEc,KAAK,UAAU,MAAM,CAClC,MAAc,EACd,OAAyD;IAEzD,MAAM,MAAM,GAAG,IAAI,mBAAM,CAAC,MAAM,CAAC,CAAC;IAClC,MAAM,cAAc,GAAG,cAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAC9D,MAAM,eAAe,GAAG,IAAA,6BAAkB,EAAC,cAAc,CAAC,IAAI,EAAE,CAAC;IAEjE,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;IAEpB,MAAM,KAAK,GAAG,MAAM,IAAA,iCAAoB,EACtC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAC5B,CAAC,QAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,EAC/D,CAAC,SAAS,EAAE,EAAE;QACZ,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAC9B,IAAA,0BAAa,EAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;IAChD,CAAC,CACF,CAAC;IAEF,IAAA,kBAAM,GAAE,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAE/B,MAAM,CAAC,KAAK,GAAG,UAAU,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;IAClD,IAAA,0BAAa,EAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;IAE9C,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -4,6 +4,7 @@ const cluster_1 = require("cluster");
|
|
|
4
4
|
const events_1 = require("events");
|
|
5
5
|
const messages_js_1 = require("../messages.js");
|
|
6
6
|
const utils_js_1 = require("../utils.js");
|
|
7
|
+
const logger_js_1 = require("../logger.js");
|
|
7
8
|
class Pool extends events_1.EventEmitter {
|
|
8
9
|
scheduler;
|
|
9
10
|
browser;
|
|
@@ -32,10 +33,12 @@ class Pool extends events_1.EventEmitter {
|
|
|
32
33
|
this.workers.forEach((worker) => {
|
|
33
34
|
this.exitHandler(worker);
|
|
34
35
|
});
|
|
36
|
+
(0, logger_js_1.logger)().debug(`Pool for ${this.browser} initialized with ${this.workers.length} workers`);
|
|
35
37
|
}
|
|
36
38
|
start(tests) {
|
|
37
39
|
if (this.isRunning)
|
|
38
40
|
return false;
|
|
41
|
+
(0, logger_js_1.logger)().debug(`Starting ${tests.length} tests for ${this.browser}`);
|
|
39
42
|
this.queue = tests.map(({ id, path }) => ({ id, path, retries: 0 }));
|
|
40
43
|
this.process();
|
|
41
44
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pool.js","sourceRoot":"","sources":["../../../src/server/master/pool.ts"],"names":[],"mappings":";;AAAA,qCAAkD;AAClD,mCAAsC;AAEtC,gDAAoE;AACpE,0CAA6D;
|
|
1
|
+
{"version":3,"file":"pool.js","sourceRoot":"","sources":["../../../src/server/master/pool.ts"],"names":[],"mappings":";;AAAA,qCAAkD;AAClD,mCAAsC;AAEtC,gDAAoE;AACpE,0CAA6D;AAE7D,4CAAsC;AAQtC,MAAqB,IAAK,SAAQ,qBAAY;IAWnC;IAEC;IAZF,UAAU,CAAS;IACnB,MAAM,CAAgB;IACtB,OAAO,GAAa,EAAE,CAAC;IACvB,KAAK,GAAiB,EAAE,CAAC;IACzB,UAAU,GAAG,KAAK,CAAC;IACnB,QAAQ,CAAU;IAC1B,IAAW,SAAS;QAClB,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;IACzD,CAAC;IACD,YACS,SAAsB,EAC7B,MAAc,EACN,OAAe;QAEvB,KAAK,EAAE,CAAC;QAJD,cAAS,GAAT,SAAS,CAAa;QAErB,YAAO,GAAP,OAAO,CAAQ;QAIvB,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QAChC,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;QACpC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAkB,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;QACrD,IAAI,CAAC,OAAO,GAAG,CACb,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CACvG,CAAC,MAAM,CAAC,CAAC,aAAa,EAA2B,EAAE,CAAC,aAAa,YAAY,gBAAa,CAAC,CAAC;QAC7F,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,QAAQ;YACjC,MAAM,IAAI,KAAK,CAAC,iCAAiC,IAAI,CAAC,OAAO,kBAAkB,CAAC,CAAC;QACnF,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAC9B,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;QACH,IAAA,kBAAM,GAAE,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,OAAO,qBAAqB,IAAI,CAAC,OAAO,CAAC,MAAM,UAAU,CAAC,CAAC;IAC7F,CAAC;IAED,KAAK,CAAC,KAAuC;QAC3C,IAAI,IAAI,CAAC,SAAS;YAAE,OAAO,KAAK,CAAC;QAEjC,IAAA,kBAAM,GAAE,CAAC,KAAK,CAAC,YAAY,KAAK,CAAC,MAAM,cAAc,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAErE,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACrE,IAAI,CAAC,OAAO,EAAE,CAAC;QAEf,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI;QACF,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAClB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;IAClB,CAAC;IAED,OAAO;QACL,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QACpC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAE9B,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;YAC9E,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;YACxB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAClB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI;YAAE,OAAO;QAE7B,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC;QAExB,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;QAEpB,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACnB,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;QAE3C,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAE7B,IAAA,6BAAe,EAAC,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAE1D,YAAY,CAAC,GAAG,EAAE;YAChB,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,UAAU,CAAC,OAAgE;QACjF,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7B,CAAC;IAEO,aAAa;QACnB,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QAErC,OAAO,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;IACrE,CAAC;IAED,IAAY,YAAY;QACtB,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,qBAAqB,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAClG,CAAC;IAED,IAAY,WAAW;QACrB,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACjE,CAAC;IAEO,WAAW,CAAC,MAAc;QAChC,kEAAkE;QAClE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE;YAC7B,IAAI,yBAAc,CAAC,OAAO;gBAAE,OAAO;YAEnC,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAEpE,IAAI,CAAC,CAAC,aAAa,YAAY,gBAAa,CAAC;gBAC3C,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,CAAC,OAAO,kBAAkB,CAAC,CAAC;YAElF,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;YAChC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,aAAa,CAAC;YAC3D,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,WAAW,CAAC,IAAgB;QAClC,OAAO,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;IAC5D,CAAC;IAEO,gBAAgB,CAAC,MAAc,EAAE,IAAgB,EAAE,MAAkB;QAC3E,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,IAAI,QAAQ,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAExE,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC;YAClB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC;QACvD,CAAC;QAED,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAE3F,MAAM,CAAC,SAAS,GAAG,KAAK,CAAC;QAEzB,YAAY,CAAC,GAAG,EAAE;YAChB,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,SAAS,CAAC,MAAc,EAAE,IAAgB;QAChD,MAAM,aAAa,GAAG;YACpB,IAAA,+BAAiB,EAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,EAAE;gBAC9C,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO;oBAAE,OAAO;gBAEpC,aAAa,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;oBACpC,WAAW,EAAE,CAAC;gBAChB,CAAC,CAAC,CAAC;gBAEH,IAAA,yBAAc,EAAC,MAAM,CAAC,CAAC;gBAEvB,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;YAChF,CAAC,CAAC;YACF,IAAA,+BAAiB,EAAC,MAAM,EAAE,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE;gBAC5C,IAAI,OAAO,CAAC,IAAI,IAAI,KAAK;oBAAE,OAAO;gBAElC,aAAa,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;oBACpC,WAAW,EAAE,CAAC;gBAChB,CAAC,CAAC,CAAC;gBAEH,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;YACvD,CAAC,CAAC;SACH,CAAC;IACJ,CAAC;CACF;AAnKD,uBAmKC"}
|
|
@@ -9,6 +9,7 @@ const events_1 = require("events");
|
|
|
9
9
|
const types_js_1 = require("../../types.js");
|
|
10
10
|
const pool_js_1 = __importDefault(require("./pool.js"));
|
|
11
11
|
const queue_js_1 = require("./queue.js");
|
|
12
|
+
const logger_js_1 = require("../logger.js");
|
|
12
13
|
class Runner extends events_1.EventEmitter {
|
|
13
14
|
failFast;
|
|
14
15
|
screenDir;
|
|
@@ -76,6 +77,7 @@ class Runner extends events_1.EventEmitter {
|
|
|
76
77
|
};
|
|
77
78
|
async init() {
|
|
78
79
|
await Promise.all(Object.values(this.pools).map((pool) => pool.init()));
|
|
80
|
+
(0, logger_js_1.logger)().debug('Runner initialized');
|
|
79
81
|
}
|
|
80
82
|
updateTests(testsDiff) {
|
|
81
83
|
const tests = {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/server/master/runner.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AACxB,0CAA8C;AAC9C,mCAAsC;AACtC,6CAUwB;AACxB,wDAA6B;AAC7B,yCAAyC;
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/server/master/runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ const logger_js_1 = require("../../logger.js");
|
|
|
12
12
|
const index_js_2 = require("../../../shared/index.js");
|
|
13
13
|
const loadStories = async (_config, _options, storiesListener) => {
|
|
14
14
|
if (cluster_1.default.isPrimary) {
|
|
15
|
-
return new Promise((resolve) => {
|
|
15
|
+
return new Promise((resolve, reject) => {
|
|
16
16
|
const worker = Object.values(cluster_1.default.workers ?? {})
|
|
17
17
|
.filter(types_js_1.isDefined)
|
|
18
18
|
.find((worker) => worker.isConnected());
|
|
@@ -20,6 +20,7 @@ const loadStories = async (_config, _options, storiesListener) => {
|
|
|
20
20
|
const unsubscribe = (0, messages_js_1.subscribeOnWorker)(worker, 'stories', (message) => {
|
|
21
21
|
if (message.type == 'set') {
|
|
22
22
|
const { stories, oldTests } = message.payload;
|
|
23
|
+
(0, logger_js_1.logger)().debug('Received set stories message with', Object.keys(stories).length, 'stories');
|
|
23
24
|
if (oldTests.length > 0)
|
|
24
25
|
(0, logger_js_1.logger)().warn(`If you use browser stories provider of CSFv3 Storybook feature\n` +
|
|
25
26
|
`Creevey will not load tests defined in story parameters from following stories:\n` +
|
|
@@ -28,8 +29,12 @@ const loadStories = async (_config, _options, storiesListener) => {
|
|
|
28
29
|
resolve(stories);
|
|
29
30
|
}
|
|
30
31
|
});
|
|
32
|
+
(0, logger_js_1.logger)().debug('Sending get stories message to worker', worker.process.pid);
|
|
31
33
|
(0, messages_js_1.sendStoriesMessage)(worker, { type: 'get' });
|
|
32
34
|
}
|
|
35
|
+
else {
|
|
36
|
+
reject(new Error('No worker found'));
|
|
37
|
+
}
|
|
33
38
|
(0, messages_js_1.subscribeOn)('stories', (message) => {
|
|
34
39
|
// TODO updates only one browser :(
|
|
35
40
|
if (message.type == 'update')
|
|
@@ -39,8 +44,10 @@ const loadStories = async (_config, _options, storiesListener) => {
|
|
|
39
44
|
}
|
|
40
45
|
else {
|
|
41
46
|
(0, messages_js_1.subscribeOn)('stories', (message) => {
|
|
42
|
-
if (message.type == 'get')
|
|
47
|
+
if (message.type == 'get') {
|
|
48
|
+
(0, logger_js_1.logger)().debug('Received get stories message');
|
|
43
49
|
(0, messages_js_1.emitStoriesMessage)({ type: 'set', payload: { stories, oldTests: storiesWithOldTests } });
|
|
50
|
+
}
|
|
44
51
|
if (message.type == 'update')
|
|
45
52
|
storiesListener(new Map(message.payload));
|
|
46
53
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../../src/server/storybook/providers/browser.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA8B;AAE9B,sDAAiE;AACjE,mDAA2G;AAC3G,gDAA8C;AAC9C,+CAAyC;AACzC,uDAAiE;AAE1D,MAAM,WAAW,GAAoB,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE;IACvF,IAAI,iBAAO,CAAC,SAAS,EAAE,CAAC;QACtB,OAAO,IAAI,OAAO,CAAa,CAAC,OAAO,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../../src/server/storybook/providers/browser.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ const logger_js_1 = require("../../logger.js");
|
|
|
10
10
|
const parser_js_1 = __importDefault(require("../../testsFiles/parser.js"));
|
|
11
11
|
const utils_js_1 = require("../../utils.js");
|
|
12
12
|
const index_js_1 = require("../../../shared/index.js");
|
|
13
|
+
const cluster_1 = __importDefault(require("cluster"));
|
|
13
14
|
const loadStories = async (_config, _options, storiesListener) => {
|
|
14
15
|
let creeveyParamsByStoryId = {};
|
|
15
16
|
const mergeParamsFromTestsToStory = (story, creeveyParams) => {
|
|
@@ -17,6 +18,9 @@ const loadStories = async (_config, _options, storiesListener) => {
|
|
|
17
18
|
story.parameters.creevey = (0, index_js_1.combineParameters)(story.parameters.creevey ?? {}, creeveyParams);
|
|
18
19
|
}
|
|
19
20
|
};
|
|
21
|
+
if (cluster_1.default.isPrimary) {
|
|
22
|
+
(0, logger_js_1.logger)().debug('Loading stories from browser provider');
|
|
23
|
+
}
|
|
20
24
|
const stories = await (0, browser_js_1.loadStories)(_config, {}, (updatedStoriesByFiles) => {
|
|
21
25
|
Array.from(updatedStoriesByFiles.entries()).forEach(([, storiesArray]) => {
|
|
22
26
|
storiesArray.forEach((story) => {
|
|
@@ -27,6 +31,9 @@ const loadStories = async (_config, _options, storiesListener) => {
|
|
|
27
31
|
});
|
|
28
32
|
storiesListener(updatedStoriesByFiles);
|
|
29
33
|
});
|
|
34
|
+
if (cluster_1.default.isPrimary) {
|
|
35
|
+
(0, logger_js_1.logger)().debug('Stories loaded');
|
|
36
|
+
}
|
|
30
37
|
// TODO fix test files hot reloading
|
|
31
38
|
creeveyParamsByStoryId = await parseParams(_config /*, (data) => console.log(data) */);
|
|
32
39
|
Object.entries(stories).forEach(([storyId, story]) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hybrid.js","sourceRoot":"","sources":["../../../../src/server/storybook/providers/hybrid.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAgC;AAEhC,6CAA8D;AAE9D,+CAAyC;AACzC,2EAA2E;AAC3E,6CAAkD;AAClD,uDAA6D;
|
|
1
|
+
{"version":3,"file":"hybrid.js","sourceRoot":"","sources":["../../../../src/server/storybook/providers/hybrid.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,23 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.test = exports.story = exports.kind = void 0;
|
|
4
7
|
exports.default = parse;
|
|
8
|
+
const cluster_1 = __importDefault(require("cluster"));
|
|
5
9
|
const url_1 = require("url");
|
|
6
10
|
const csf_1 = require("@storybook/csf");
|
|
7
11
|
const utils_js_1 = require("../utils.js");
|
|
12
|
+
const logger_js_1 = require("../logger.js");
|
|
8
13
|
async function parse(files) {
|
|
9
14
|
result = {};
|
|
10
15
|
await (0, utils_js_1.loadThroughTSX)(async (load) => Promise.all(files.map(async (file) => {
|
|
11
16
|
const fileUrl = (0, url_1.pathToFileURL)(file).toString();
|
|
12
17
|
await load(fileUrl);
|
|
13
18
|
})));
|
|
19
|
+
if (cluster_1.default.isPrimary)
|
|
20
|
+
(0, logger_js_1.logger)().debug('Tests parsed');
|
|
14
21
|
return result;
|
|
15
22
|
}
|
|
16
23
|
let result = {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../src/server/testsFiles/parser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../src/server/testsFiles/parser.ts"],"names":[],"mappings":";;;;;;AASA,wBAeC;AAxBD,sDAA8B;AAC9B,6BAAoC;AACpC,wCAA2D;AAE3D,0CAA6C;AAC7C,4CAAsC;AAIvB,KAAK,UAAU,KAAK,CAAC,KAAe;IACjD,MAAM,GAAG,EAAE,CAAC;IAEZ,MAAM,IAAA,yBAAc,EAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAClC,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACvB,MAAM,OAAO,GAAG,IAAA,mBAAa,EAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC/C,MAAM,IAAI,CAAC,OAAO,CAAC,CAAC;IACtB,CAAC,CAAC,CACH,CACF,CAAC;IAEF,IAAI,iBAAO,CAAC,SAAS;QAAE,IAAA,kBAAM,GAAE,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAEtD,OAAO,MAAgC,CAAC;AAC1C,CAAC;AAED,IAAI,MAAM,GAAoC,EAAE,CAAC;AAEjD,IAAI,SAAS,GAAG,EAAE,CAAC;AACnB,IAAI,UAAU,GAAG,EAAE,CAAC;AACpB,IAAI,WAAW,GAA8B,IAAI,CAAC;AAElD,MAAM,kBAAkB,GAAG,CAAC,MAA0B,EAAQ,EAAE;IAC9D,WAAW,GAAG,MAAM,CAAC;AACvB,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,SAAiB,EAAE,UAAkB,EAAU,EAAE;IACnE,OAAO,IAAA,UAAI,EAAC,SAAS,EAAE,IAAA,yBAAmB,EAAC,UAAU,CAAC,CAAC,CAAC;AAC1D,CAAC,CAAC;AAEK,MAAM,IAAI,GAAG,CAAC,KAAa,EAAE,MAAkB,EAAQ,EAAE;IAC9D,SAAS,GAAG,KAAK,CAAC;IAClB,MAAM,EAAE,CAAC;IACT,SAAS,GAAG,EAAE,CAAC;AACjB,CAAC,CAAC;AAJW,QAAA,IAAI,QAIf;AAEK,MAAM,KAAK,GAAG,CACnB,KAAa,EACb,OAAoF,EAC9E,EAAE;IACR,UAAU,GAAG,KAAK,CAAC;IACnB,WAAW,GAAG,IAAI,CAAC;IACnB,OAAO,CAAC,EAAE,kBAAkB,EAAE,CAAC,CAAC;IAChC,MAAM,OAAO,GAAG,UAAU,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAClD,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,WAAW,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IACpF,UAAU,GAAG,EAAE,CAAC;IAChB,WAAW,GAAG,IAAI,CAAC;AACrB,CAAC,CAAC;AAXW,QAAA,KAAK,SAWhB;AAEK,MAAM,IAAI,GAAG,CAAC,KAAa,EAAE,MAA2B,EAAQ,EAAE;IACvE,MAAM,OAAO,GAAG,UAAU,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAClD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QACrB,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;IACvB,CAAC;IACD,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;AACxF,CAAC,CAAC;AANW,QAAA,IAAI,QAMf"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "creevey",
|
|
3
3
|
"description": "Cross-browser screenshot testing tool for Storybook with fancy UI Runner",
|
|
4
|
-
"version": "0.9.9-handle-timeout-error",
|
|
4
|
+
"version": "0.9.9-handle-timeout-error.1",
|
|
5
5
|
"type": "commonjs",
|
|
6
6
|
"bin": "./dist/cli.js",
|
|
7
7
|
"main": "./dist/index.js",
|
|
@@ -108,6 +108,7 @@ export async function start(config: Config, options: Options, resolveApi: (api:
|
|
|
108
108
|
void shutdownWorkers().then(() => process.exit());
|
|
109
109
|
});
|
|
110
110
|
});
|
|
111
|
+
logger().debug('Starting tests');
|
|
111
112
|
// TODO grep
|
|
112
113
|
runner.start(Object.keys(runner.status.tests));
|
|
113
114
|
}
|
|
@@ -3,6 +3,7 @@ import { Config, TestData, isDefined, ServerTest } from '../../types.js';
|
|
|
3
3
|
import { loadTestsFromStories, saveTestsJson } from '../stories.js';
|
|
4
4
|
import Runner from './runner.js';
|
|
5
5
|
import { tryToLoadTestsData } from '../utils.js';
|
|
6
|
+
import { logger } from '../logger.js';
|
|
6
7
|
|
|
7
8
|
function mergeTests(
|
|
8
9
|
testsWithReports: Partial<Record<string, TestData>>,
|
|
@@ -40,6 +41,8 @@ export default async function master(
|
|
|
40
41
|
},
|
|
41
42
|
);
|
|
42
43
|
|
|
44
|
+
logger().debug('Tests loaded');
|
|
45
|
+
|
|
43
46
|
runner.tests = mergeTests(testsFromReport, tests);
|
|
44
47
|
saveTestsJson(runner.tests, config.reportDir);
|
|
45
48
|
|
|
@@ -4,6 +4,7 @@ import { Worker, Config, TestResult, BrowserConfig, TestStatus } from '../../typ
|
|
|
4
4
|
import { sendTestMessage, subscribeOnWorker } from '../messages.js';
|
|
5
5
|
import { gracefullyKill, isShuttingDown } from '../utils.js';
|
|
6
6
|
import { WorkerQueue } from './queue.js';
|
|
7
|
+
import { logger } from '../logger.js';
|
|
7
8
|
|
|
8
9
|
interface WorkerTest {
|
|
9
10
|
id: string;
|
|
@@ -43,11 +44,14 @@ export default class Pool extends EventEmitter {
|
|
|
43
44
|
this.workers.forEach((worker) => {
|
|
44
45
|
this.exitHandler(worker);
|
|
45
46
|
});
|
|
47
|
+
logger().debug(`Pool for ${this.browser} initialized with ${this.workers.length} workers`);
|
|
46
48
|
}
|
|
47
49
|
|
|
48
50
|
start(tests: { id: string; path: string[] }[]): boolean {
|
|
49
51
|
if (this.isRunning) return false;
|
|
50
52
|
|
|
53
|
+
logger().debug(`Starting ${tests.length} tests for ${this.browser}`);
|
|
54
|
+
|
|
51
55
|
this.queue = tests.map(({ id, path }) => ({ id, path, retries: 0 }));
|
|
52
56
|
this.process();
|
|
53
57
|
|
|
@@ -14,6 +14,7 @@ import {
|
|
|
14
14
|
} from '../../types.js';
|
|
15
15
|
import Pool from './pool.js';
|
|
16
16
|
import { WorkerQueue } from './queue.js';
|
|
17
|
+
import { logger } from '../logger.js';
|
|
17
18
|
|
|
18
19
|
export default class Runner extends EventEmitter {
|
|
19
20
|
private failFast: boolean;
|
|
@@ -88,6 +89,7 @@ export default class Runner extends EventEmitter {
|
|
|
88
89
|
|
|
89
90
|
public async init(): Promise<void> {
|
|
90
91
|
await Promise.all(Object.values(this.pools).map((pool) => pool.init()));
|
|
92
|
+
logger().debug('Runner initialized');
|
|
91
93
|
}
|
|
92
94
|
|
|
93
95
|
public updateTests(testsDiff: Partial<Record<string, ServerTest>>): void {
|
|
@@ -8,7 +8,7 @@ import { deserializeRawStories } from '../../../shared/index.js';
|
|
|
8
8
|
|
|
9
9
|
export const loadStories: StoriesProvider = async (_config, _options, storiesListener) => {
|
|
10
10
|
if (cluster.isPrimary) {
|
|
11
|
-
return new Promise<StoriesRaw>((resolve) => {
|
|
11
|
+
return new Promise<StoriesRaw>((resolve, reject) => {
|
|
12
12
|
const worker = Object.values(cluster.workers ?? {})
|
|
13
13
|
.filter(isDefined)
|
|
14
14
|
.find((worker) => worker.isConnected());
|
|
@@ -17,6 +17,7 @@ export const loadStories: StoriesProvider = async (_config, _options, storiesLis
|
|
|
17
17
|
const unsubscribe = subscribeOnWorker(worker, 'stories', (message) => {
|
|
18
18
|
if (message.type == 'set') {
|
|
19
19
|
const { stories, oldTests } = message.payload;
|
|
20
|
+
logger().debug('Received set stories message with', Object.keys(stories).length, 'stories');
|
|
20
21
|
if (oldTests.length > 0)
|
|
21
22
|
logger().warn(
|
|
22
23
|
`If you use browser stories provider of CSFv3 Storybook feature\n` +
|
|
@@ -27,7 +28,10 @@ export const loadStories: StoriesProvider = async (_config, _options, storiesLis
|
|
|
27
28
|
resolve(stories);
|
|
28
29
|
}
|
|
29
30
|
});
|
|
31
|
+
logger().debug('Sending get stories message to worker', worker.process.pid);
|
|
30
32
|
sendStoriesMessage(worker, { type: 'get' });
|
|
33
|
+
} else {
|
|
34
|
+
reject(new Error('No worker found'));
|
|
31
35
|
}
|
|
32
36
|
subscribeOn('stories', (message) => {
|
|
33
37
|
// TODO updates only one browser :(
|
|
@@ -36,8 +40,10 @@ export const loadStories: StoriesProvider = async (_config, _options, storiesLis
|
|
|
36
40
|
});
|
|
37
41
|
} else {
|
|
38
42
|
subscribeOn('stories', (message) => {
|
|
39
|
-
if (message.type == 'get')
|
|
43
|
+
if (message.type == 'get') {
|
|
44
|
+
logger().debug('Received get stories message');
|
|
40
45
|
emitStoriesMessage({ type: 'set', payload: { stories, oldTests: storiesWithOldTests } });
|
|
46
|
+
}
|
|
41
47
|
if (message.type == 'update') storiesListener(new Map(message.payload));
|
|
42
48
|
});
|
|
43
49
|
const stories = deserializeRawStories(await loadStoriesFromBrowser());
|
|
@@ -6,6 +6,7 @@ import { logger } from '../../logger.js';
|
|
|
6
6
|
import parse, { CreeveyParamsByStoryId } from '../../testsFiles/parser.js';
|
|
7
7
|
import { readDirRecursive } from '../../utils.js';
|
|
8
8
|
import { combineParameters } from '../../../shared/index.js';
|
|
9
|
+
import cluster from 'cluster';
|
|
9
10
|
|
|
10
11
|
export const loadStories: StoriesProvider = async (
|
|
11
12
|
_config: Config,
|
|
@@ -20,6 +21,10 @@ export const loadStories: StoriesProvider = async (
|
|
|
20
21
|
}
|
|
21
22
|
};
|
|
22
23
|
|
|
24
|
+
if (cluster.isPrimary) {
|
|
25
|
+
logger().debug('Loading stories from browser provider');
|
|
26
|
+
}
|
|
27
|
+
|
|
23
28
|
const stories = await browserProvider(_config, {}, (updatedStoriesByFiles) => {
|
|
24
29
|
Array.from(updatedStoriesByFiles.entries()).forEach(([, storiesArray]) => {
|
|
25
30
|
storiesArray.forEach((story) => {
|
|
@@ -30,6 +35,10 @@ export const loadStories: StoriesProvider = async (
|
|
|
30
35
|
storiesListener(updatedStoriesByFiles);
|
|
31
36
|
});
|
|
32
37
|
|
|
38
|
+
if (cluster.isPrimary) {
|
|
39
|
+
logger().debug('Stories loaded');
|
|
40
|
+
}
|
|
41
|
+
|
|
33
42
|
// TODO fix test files hot reloading
|
|
34
43
|
creeveyParamsByStoryId = await parseParams(_config /*, (data) => console.log(data) */);
|
|
35
44
|
|
|
@@ -1,7 +1,9 @@
|
|
|
1
|
+
import cluster from 'cluster';
|
|
1
2
|
import { pathToFileURL } from 'url';
|
|
2
3
|
import { toId, storyNameFromExport } from '@storybook/csf';
|
|
3
4
|
import { CreeveyStoryParams, CreeveyTestFunction } from '../../types.js';
|
|
4
5
|
import { loadThroughTSX } from '../utils.js';
|
|
6
|
+
import { logger } from '../logger.js';
|
|
5
7
|
|
|
6
8
|
export type CreeveyParamsByStoryId = Record<string, CreeveyStoryParams>;
|
|
7
9
|
|
|
@@ -17,6 +19,8 @@ export default async function parse(files: string[]): Promise<CreeveyParamsBySto
|
|
|
17
19
|
),
|
|
18
20
|
);
|
|
19
21
|
|
|
22
|
+
if (cluster.isPrimary) logger().debug('Tests parsed');
|
|
23
|
+
|
|
20
24
|
return result as CreeveyParamsByStoryId;
|
|
21
25
|
}
|
|
22
26
|
|