creevey 0.10.0-beta.4 → 0.10.0-beta.40
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 +19 -41
- package/dist/client/addon/components/Addon.js +17 -7
- package/dist/client/addon/components/Addon.js.map +1 -1
- package/dist/client/addon/components/Panel.js +2 -2
- package/dist/client/addon/components/Panel.js.map +1 -1
- package/dist/client/addon/components/Tools.js +17 -7
- package/dist/client/addon/components/Tools.js.map +1 -1
- package/dist/client/addon/withCreevey.d.ts +2 -1
- package/dist/client/addon/withCreevey.js +11 -1
- package/dist/client/addon/withCreevey.js.map +1 -1
- package/dist/client/shared/components/ImagesView/BlendView.d.ts +1 -1
- package/dist/client/shared/components/ImagesView/BlendView.js +17 -7
- package/dist/client/shared/components/ImagesView/BlendView.js.map +1 -1
- package/dist/client/shared/components/ImagesView/SideBySideView.d.ts +1 -1
- package/dist/client/shared/components/ImagesView/SideBySideView.js +17 -7
- package/dist/client/shared/components/ImagesView/SideBySideView.js.map +1 -1
- package/dist/client/shared/components/ImagesView/SlideView.d.ts +1 -1
- package/dist/client/shared/components/ImagesView/SlideView.js +17 -7
- package/dist/client/shared/components/ImagesView/SlideView.js.map +1 -1
- package/dist/client/shared/components/ImagesView/SwapView.d.ts +1 -1
- package/dist/client/shared/components/ImagesView/SwapView.js +29 -7
- package/dist/client/shared/components/ImagesView/SwapView.js.map +1 -1
- package/dist/client/shared/components/PageHeader/ImagePreview.d.ts +1 -1
- package/dist/client/shared/components/PageHeader/ImagePreview.js +1 -0
- package/dist/client/shared/components/PageHeader/ImagePreview.js.map +1 -1
- package/dist/client/shared/components/PageHeader/PageHeader.js +20 -8
- package/dist/client/shared/components/PageHeader/PageHeader.js.map +1 -1
- package/dist/client/shared/components/ResultsPage.d.ts +1 -1
- package/dist/client/shared/components/ResultsPage.js +43 -13
- package/dist/client/shared/components/ResultsPage.js.map +1 -1
- package/dist/client/shared/creeveyClientApi.js +8 -1
- package/dist/client/shared/creeveyClientApi.js.map +1 -1
- package/dist/client/shared/helpers.d.ts +1 -3
- package/dist/client/shared/helpers.js +4 -19
- package/dist/client/shared/helpers.js.map +1 -1
- package/dist/client/web/CreeveyApp.js +42 -14
- package/dist/client/web/CreeveyApp.js.map +1 -1
- package/dist/client/web/CreeveyContext.d.ts +5 -0
- package/dist/client/web/CreeveyContext.js +20 -7
- package/dist/client/web/CreeveyContext.js.map +1 -1
- package/dist/client/web/CreeveyLoader.js +2 -2
- package/dist/client/web/CreeveyLoader.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/Search.js +19 -9
- package/dist/client/web/CreeveyView/SideBar/Search.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/SideBar.js +18 -7
- package/dist/client/web/CreeveyView/SideBar/SideBar.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/SideBarFooter.js +60 -7
- package/dist/client/web/CreeveyView/SideBar/SideBarFooter.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/SideBarHeader.js +17 -7
- package/dist/client/web/CreeveyView/SideBar/SideBarHeader.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/SuiteLink.d.ts +2 -2
- package/dist/client/web/CreeveyView/SideBar/SuiteLink.js +18 -10
- package/dist/client/web/CreeveyView/SideBar/SuiteLink.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/TestLink.js +18 -10
- package/dist/client/web/CreeveyView/SideBar/TestLink.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/TestStatusIcon.d.ts +1 -1
- package/dist/client/web/CreeveyView/SideBar/TestsStatus.d.ts +1 -1
- package/dist/client/web/KeyboardEventsContext.d.ts +1 -8
- package/dist/client/web/KeyboardEventsContext.js +79 -64
- package/dist/client/web/KeyboardEventsContext.js.map +1 -1
- package/dist/client/web/assets/index-B0Xv0lOY.js +802 -0
- package/dist/client/web/index.html +1 -1
- package/dist/client/web/index.js +17 -7
- package/dist/client/web/index.js.map +1 -1
- package/dist/client/web/themes.d.ts +2 -0
- package/dist/client/web/themes.js +22 -0
- package/dist/client/web/themes.js.map +1 -0
- package/dist/creevey.js +16 -9
- package/dist/creevey.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/server/config.d.ts +1 -1
- package/dist/server/config.js +27 -5
- package/dist/server/config.js.map +1 -1
- package/dist/server/connection.d.ts +3 -0
- package/dist/server/connection.js +28 -0
- package/dist/server/connection.js.map +1 -0
- package/dist/server/docker.d.ts +1 -1
- package/dist/server/docker.js +56 -32
- package/dist/server/docker.js.map +1 -1
- package/dist/server/index.js +64 -11
- package/dist/server/index.js.map +1 -1
- package/dist/server/logger.d.ts +2 -1
- package/dist/server/logger.js +7 -3
- package/dist/server/logger.js.map +1 -1
- package/dist/server/master/api.js +1 -1
- package/dist/server/master/api.js.map +1 -1
- package/dist/server/master/pool.d.ts +4 -3
- package/dist/server/master/pool.js +13 -66
- package/dist/server/master/pool.js.map +1 -1
- package/dist/server/master/queue.d.ts +13 -0
- package/dist/server/master/queue.js +71 -0
- package/dist/server/master/queue.js.map +1 -0
- package/dist/server/master/runner.d.ts +3 -0
- package/dist/server/master/runner.js +76 -10
- package/dist/server/master/runner.js.map +1 -1
- package/dist/server/master/server.js +1 -1
- package/dist/server/master/server.js.map +1 -1
- package/dist/server/master/start.js +13 -11
- package/dist/server/master/start.js.map +1 -1
- package/dist/server/playwright/docker-file.d.ts +1 -1
- package/dist/server/playwright/docker-file.js +15 -6
- package/dist/server/playwright/docker-file.js.map +1 -1
- package/dist/server/playwright/docker.d.ts +2 -1
- package/dist/server/playwright/docker.js +10 -2
- package/dist/server/playwright/docker.js.map +1 -1
- package/dist/server/playwright/index-source.mjs +16 -0
- package/dist/server/playwright/internal.d.ts +6 -6
- package/dist/server/playwright/internal.js +143 -91
- package/dist/server/playwright/internal.js.map +1 -1
- package/dist/server/playwright/webdriver.d.ts +1 -1
- package/dist/server/playwright/webdriver.js +5 -8
- package/dist/server/playwright/webdriver.js.map +1 -1
- package/dist/server/providers/browser.js +6 -4
- package/dist/server/providers/browser.js.map +1 -1
- package/dist/server/providers/hybrid.js +1 -1
- package/dist/server/providers/hybrid.js.map +1 -1
- package/dist/server/reporter.d.ts +4 -19
- package/dist/server/reporter.js +30 -21
- package/dist/server/reporter.js.map +1 -1
- package/dist/server/selenium/internal.d.ts +3 -4
- package/dist/server/selenium/internal.js +127 -108
- package/dist/server/selenium/internal.js.map +1 -1
- package/dist/server/selenium/selenoid.js +8 -6
- package/dist/server/selenium/selenoid.js.map +1 -1
- package/dist/server/selenium/webdriver.d.ts +1 -1
- package/dist/server/selenium/webdriver.js +5 -9
- package/dist/server/selenium/webdriver.js.map +1 -1
- package/dist/server/telemetry.js +2 -2
- package/dist/server/testsFiles/parser.js +45 -5
- package/dist/server/testsFiles/parser.js.map +1 -1
- package/dist/server/utils.d.ts +19 -1
- package/dist/server/utils.js +87 -8
- package/dist/server/utils.js.map +1 -1
- package/dist/server/webdriver.d.ts +5 -4
- package/dist/server/webdriver.js +23 -10
- package/dist/server/webdriver.js.map +1 -1
- package/dist/server/worker/chai-image.d.ts +1 -2
- package/dist/server/worker/chai-image.js +4 -3
- package/dist/server/worker/chai-image.js.map +1 -1
- package/dist/server/worker/context.d.ts +3 -0
- package/dist/server/worker/context.js +15 -0
- package/dist/server/worker/context.js.map +1 -0
- package/dist/server/worker/match-image.d.ts +4 -4
- package/dist/server/worker/match-image.js +7 -4
- package/dist/server/worker/match-image.js.map +1 -1
- package/dist/server/worker/start.js +45 -73
- package/dist/server/worker/start.js.map +1 -1
- package/dist/shared/index.d.ts +1 -1
- package/dist/types.d.ts +40 -8
- package/dist/types.js +2 -0
- package/dist/types.js.map +1 -1
- package/docs/cli.md +12 -0
- package/docs/config.md +179 -165
- package/docs/storybook.md +60 -0
- package/docs/tests.md +50 -45
- package/package.json +64 -63
- package/src/client/addon/components/Panel.tsx +2 -2
- package/src/client/addon/withCreevey.ts +10 -2
- package/src/client/shared/components/ImagesView/SwapView.tsx +18 -0
- package/src/client/shared/components/PageHeader/ImagePreview.tsx +1 -0
- package/src/client/shared/components/PageHeader/PageHeader.tsx +4 -2
- package/src/client/shared/components/ResultsPage.tsx +31 -8
- package/src/client/shared/creeveyClientApi.ts +9 -1
- package/src/client/shared/helpers.ts +4 -24
- package/src/client/web/CreeveyApp.tsx +27 -8
- package/src/client/web/CreeveyContext.tsx +9 -0
- package/src/client/web/CreeveyLoader.tsx +1 -1
- package/src/client/web/CreeveyView/SideBar/Search.tsx +3 -3
- package/src/client/web/CreeveyView/SideBar/SideBar.tsx +1 -0
- package/src/client/web/CreeveyView/SideBar/SideBarFooter.tsx +37 -6
- package/src/client/web/CreeveyView/SideBar/SuiteLink.tsx +3 -5
- package/src/client/web/CreeveyView/SideBar/TestLink.tsx +2 -4
- package/src/client/web/KeyboardEventsContext.tsx +61 -73
- package/src/client/web/themes.ts +24 -0
- package/src/creevey.ts +16 -10
- package/src/server/config.ts +28 -6
- package/src/server/connection.ts +26 -0
- package/src/server/docker.ts +63 -34
- package/src/server/index.ts +72 -14
- package/src/server/logger.ts +6 -2
- package/src/server/master/api.ts +1 -1
- package/src/server/master/pool.ts +23 -59
- package/src/server/master/queue.ts +77 -0
- package/src/server/master/runner.ts +94 -10
- package/src/server/master/server.ts +1 -1
- package/src/server/master/start.ts +16 -11
- package/src/server/playwright/docker-file.ts +18 -6
- package/src/server/playwright/docker.ts +16 -3
- package/src/server/playwright/index-source.mjs +16 -0
- package/src/server/playwright/internal.ts +182 -111
- package/src/server/playwright/webdriver.ts +6 -9
- package/src/server/providers/browser.ts +6 -4
- package/src/server/providers/hybrid.ts +1 -1
- package/src/server/reporter.ts +37 -34
- package/src/server/selenium/internal.ts +131 -116
- package/src/server/selenium/selenoid.ts +8 -6
- package/src/server/selenium/webdriver.ts +6 -10
- package/src/server/telemetry.ts +2 -2
- package/src/server/testsFiles/parser.ts +52 -4
- package/src/server/utils.ts +97 -9
- package/src/server/webdriver.ts +24 -16
- package/src/server/worker/chai-image.ts +4 -4
- package/src/server/worker/context.ts +14 -0
- package/src/server/worker/match-image.ts +12 -8
- package/src/server/worker/start.ts +49 -86
- package/src/shared/index.ts +1 -1
- package/src/types.ts +44 -8
- package/types/global.d.ts +1 -0
- package/.yarnrc.yml +0 -1
- package/chromatic.config.json +0 -5
- package/dist/client/web/assets/index-DkmZfG9C.js +0 -591
@@ -1,9 +1,10 @@
|
|
1
|
-
import
|
2
|
-
import { Args } from '@storybook/csf';
|
1
|
+
import type { Args } from '@storybook/types';
|
3
2
|
import { StoryInput, BaseCreeveyTestContext, CreeveyTestContext, StoriesRaw, CreeveyWebdriver, ServerTest } from '../types.js';
|
4
3
|
export declare const storybookRootID = "storybook-root";
|
5
4
|
export declare const LOCALHOST_REGEXP: RegExp;
|
6
|
-
export declare
|
5
|
+
export declare const openBrowser: () => () => void;
|
6
|
+
export declare const waitForBrowserClose: () => Promise<void> | null;
|
7
|
+
export declare function resolveStorybookUrl(storybookUrl: string, checkUrl: (url: string) => Promise<boolean>): Promise<string>;
|
7
8
|
export declare function appendIframePath(url: string): string;
|
8
9
|
export declare function getAddresses(): string[];
|
9
10
|
export declare abstract class CreeveyWebdriverBase implements CreeveyWebdriver {
|
@@ -16,5 +17,5 @@ export declare abstract class CreeveyWebdriverBase implements CreeveyWebdriver {
|
|
16
17
|
abstract closeBrowser(): Promise<void>;
|
17
18
|
abstract loadStoriesFromBrowser(): Promise<StoriesRaw>;
|
18
19
|
abstract afterTest(test: ServerTest): Promise<void>;
|
19
|
-
switchStory(story: StoryInput, context: BaseCreeveyTestContext
|
20
|
+
switchStory(story: StoryInput, context: BaseCreeveyTestContext): Promise<CreeveyTestContext>;
|
20
21
|
}
|
package/dist/server/webdriver.js
CHANGED
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
4
|
};
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
6
|
-
exports.CreeveyWebdriverBase = exports.LOCALHOST_REGEXP = exports.storybookRootID = void 0;
|
6
|
+
exports.CreeveyWebdriverBase = exports.waitForBrowserClose = exports.openBrowser = exports.LOCALHOST_REGEXP = exports.storybookRootID = void 0;
|
7
7
|
exports.resolveStorybookUrl = resolveStorybookUrl;
|
8
8
|
exports.appendIframePath = appendIframePath;
|
9
9
|
exports.getAddresses = getAddresses;
|
@@ -15,14 +15,27 @@ const messages_js_1 = require("./messages.js");
|
|
15
15
|
exports.storybookRootID = 'storybook-root';
|
16
16
|
exports.LOCALHOST_REGEXP = /(localhost|127\.0\.0\.1)/i;
|
17
17
|
const DOCKER_INTERNAL = 'host.docker.internal';
|
18
|
-
|
19
|
-
|
18
|
+
let browserClosePromise = null;
|
19
|
+
const openBrowser = () => {
|
20
|
+
let resolve;
|
21
|
+
browserClosePromise = new Promise((r) => (resolve = r));
|
22
|
+
return () => {
|
23
|
+
resolve();
|
24
|
+
browserClosePromise = null;
|
25
|
+
};
|
26
|
+
};
|
27
|
+
exports.openBrowser = openBrowser;
|
28
|
+
const waitForBrowserClose = () => browserClosePromise;
|
29
|
+
exports.waitForBrowserClose = waitForBrowserClose;
|
30
|
+
async function resolveStorybookUrl(storybookUrl, checkUrl) {
|
31
|
+
(0, logger_js_1.logger)().debug('Resolving storybook url');
|
20
32
|
const addresses = getAddresses();
|
33
|
+
// TODO Use Promise.race?
|
21
34
|
for (const ip of addresses) {
|
22
35
|
const resolvedUrl = storybookUrl.replace(exports.LOCALHOST_REGEXP, ip);
|
23
|
-
logger.debug(`Checking storybook availability on ${chalk_1.default.magenta(resolvedUrl)}`);
|
36
|
+
(0, logger_js_1.logger)().debug(`Checking storybook availability on ${chalk_1.default.magenta(resolvedUrl)}`);
|
24
37
|
if (await checkUrl(resolvedUrl)) {
|
25
|
-
logger.debug(`Resolved storybook url ${chalk_1.default.magenta(resolvedUrl)}`);
|
38
|
+
(0, logger_js_1.logger)().debug(`Resolved storybook url ${chalk_1.default.magenta(resolvedUrl)}`);
|
26
39
|
return resolvedUrl;
|
27
40
|
}
|
28
41
|
}
|
@@ -40,10 +53,10 @@ function getAddresses() {
|
|
40
53
|
.map((network) => network.filter((info) => info.family == 'IPv4').map((info) => info.address)));
|
41
54
|
}
|
42
55
|
class CreeveyWebdriverBase {
|
43
|
-
async switchStory(story, context
|
56
|
+
async switchStory(story, context) {
|
44
57
|
const { id, title, name, parameters } = story;
|
45
58
|
const { captureElement = `#${exports.storybookRootID}`, waitForReady, ignoreElements, } = (parameters.creevey ?? {});
|
46
|
-
logger.debug(`Switching to story ${chalk_1.default.cyan(title)}/${chalk_1.default.cyan(name)} by id ${chalk_1.default.magenta(id)}`);
|
59
|
+
(0, logger_js_1.logger)().debug(`Switching to story ${chalk_1.default.cyan(title)}/${chalk_1.default.cyan(name)} by id ${chalk_1.default.magenta(id)}`);
|
47
60
|
let storyPlayResolver;
|
48
61
|
let waitForComplete = new Promise((resolve) => (storyPlayResolver = resolve));
|
49
62
|
const unsubscribe = (0, messages_js_1.subscribeOn)('stories', (message) => {
|
@@ -58,16 +71,16 @@ class CreeveyWebdriverBase {
|
|
58
71
|
});
|
59
72
|
const isCaptureCalled = await this.selectStory(id, waitForReady);
|
60
73
|
if (isCaptureCalled) {
|
61
|
-
logger.debug(`Capturing screenshots from ${chalk_1.default.magenta(id)} story's \`play()\` function`);
|
74
|
+
(0, logger_js_1.logger)().debug(`Capturing screenshots from ${chalk_1.default.magenta(id)} story's \`play()\` function`);
|
62
75
|
while (!(await waitForComplete)) {
|
63
76
|
waitForComplete = new Promise((resolve) => (storyPlayResolver = resolve));
|
64
77
|
}
|
65
78
|
}
|
66
79
|
unsubscribe();
|
67
80
|
if (isCaptureCalled)
|
68
|
-
logger.debug(`Story ${chalk_1.default.magenta(id)} completed capturing`);
|
81
|
+
(0, logger_js_1.logger)().debug(`Story ${chalk_1.default.magenta(id)} completed capturing`);
|
69
82
|
else
|
70
|
-
logger.debug(`Story ${chalk_1.default.magenta(id)} ready for capturing`);
|
83
|
+
(0, logger_js_1.logger)().debug(`Story ${chalk_1.default.magenta(id)} ready for capturing`);
|
71
84
|
return Object.assign({
|
72
85
|
takeScreenshot: () => this.takeScreenshot(captureElement, ignoreElements),
|
73
86
|
updateStoryArgs: (updatedArgs) => this.updateStoryArgs(story, updatedArgs),
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"webdriver.js","sourceRoot":"","sources":["../../src/server/webdriver.ts"],"names":[],"mappings":";;;;;;
|
1
|
+
{"version":3,"file":"webdriver.js","sourceRoot":"","sources":["../../src/server/webdriver.ts"],"names":[],"mappings":"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"}
|
@@ -1,2 +1 @@
|
|
1
|
-
|
2
|
-
export default function (matchImage: (image: Buffer, imageName?: string) => Promise<void>, matchImages: (images: Record<string, Buffer>) => Promise<void>, logger: Logger.Logger): ({ Assertion }: Chai.ChaiStatic, utils: Chai.ChaiUtils) => void;
|
1
|
+
export default function (matchImage: (image: Buffer, imageName?: string) => Promise<void>, matchImages: (images: Record<string, Buffer>) => Promise<void>): ({ Assertion }: Chai.ChaiStatic, utils: Chai.ChaiUtils) => void;
|
@@ -1,12 +1,13 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.default = default_1;
|
4
|
-
|
4
|
+
const logger_1 = require("../logger");
|
5
|
+
function default_1(matchImage, matchImages) {
|
5
6
|
let isWarningShown = false;
|
6
7
|
return function chaiImage({ Assertion }, utils) {
|
7
8
|
utils.addMethod(Assertion.prototype, 'matchImage', async function (imageName) {
|
8
9
|
if (!isWarningShown) {
|
9
|
-
logger.warn('`expect(...).to.matchImage()` is deprecated and will be removed in the next major release. Please use `context.matchImage()` instead.');
|
10
|
+
(0, logger_1.logger)().warn('`expect(...).to.matchImage()` is deprecated and will be removed in the next major release. Please use `context.matchImage()` instead.');
|
10
11
|
isWarningShown = true;
|
11
12
|
}
|
12
13
|
const image = utils.flag(this, 'object');
|
@@ -14,7 +15,7 @@ function default_1(matchImage, matchImages, logger) {
|
|
14
15
|
});
|
15
16
|
utils.addMethod(Assertion.prototype, 'matchImages', async function () {
|
16
17
|
if (!isWarningShown) {
|
17
|
-
logger.warn('`expect(...).to.matchImages()` is deprecated and will be removed in the next major release. Please use `context.matchImages()` instead.');
|
18
|
+
(0, logger_1.logger)().warn('`expect(...).to.matchImages()` is deprecated and will be removed in the next major release. Please use `context.matchImages()` instead.');
|
18
19
|
isWarningShown = true;
|
19
20
|
}
|
20
21
|
const images = utils.flag(this, 'object');
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"chai-image.js","sourceRoot":"","sources":["../../../src/server/worker/chai-image.ts"],"names":[],"mappings":";;
|
1
|
+
{"version":3,"file":"chai-image.js","sourceRoot":"","sources":["../../../src/server/worker/chai-image.ts"],"names":[],"mappings":";;AAEA,4BAgCC;AAlCD,sCAAmC;AAEnC,mBACE,UAAgE,EAChE,WAA8D;IAE9D,IAAI,cAAc,GAAG,KAAK,CAAC;IAC3B,OAAO,SAAS,SAAS,CAAC,EAAE,SAAS,EAAmB,EAAE,KAAqB;QAC7E,KAAK,CAAC,SAAS,CACb,SAAS,CAAC,SAAS,EACnB,YAAY,EACZ,KAAK,WAA0C,SAAkB;YAC/D,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,IAAA,eAAM,GAAE,CAAC,IAAI,CACX,uIAAuI,CACxI,CAAC;gBACF,cAAc,GAAG,IAAI,CAAC;YACxB,CAAC;YACD,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAW,CAAC;YACnD,MAAM,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QACrC,CAAC,CACF,CAAC;QAEF,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,SAAS,EAAE,aAAa,EAAE,KAAK;YACvD,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,IAAA,eAAM,GAAE,CAAC,IAAI,CACX,yIAAyI,CAC1I,CAAC;gBACF,cAAc,GAAG,IAAI,CAAC;YACxB,CAAC;YACD,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAA2B,CAAC;YACpE,MAAM,WAAW,CAAC,MAAM,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
|
@@ -0,0 +1,15 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.setWorkerContainer = setWorkerContainer;
|
4
|
+
exports.removeWorkerContainer = removeWorkerContainer;
|
5
|
+
let workerContainer = null;
|
6
|
+
function setWorkerContainer(container) {
|
7
|
+
workerContainer = container;
|
8
|
+
}
|
9
|
+
async function removeWorkerContainer() {
|
10
|
+
if (workerContainer) {
|
11
|
+
await workerContainer.remove({ force: true });
|
12
|
+
workerContainer = null;
|
13
|
+
}
|
14
|
+
}
|
15
|
+
//# sourceMappingURL=context.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../src/server/worker/context.ts"],"names":[],"mappings":";;AAIA,gDAEC;AAED,sDAKC;AAXD,IAAI,eAAe,GAAqB,IAAI,CAAC;AAE7C,SAAgB,kBAAkB,CAAC,SAAoB;IACrD,eAAe,GAAG,SAAS,CAAC;AAC9B,CAAC;AAEM,KAAK,UAAU,qBAAqB;IACzC,IAAI,eAAe,EAAE,CAAC;QACpB,MAAM,eAAe,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9C,eAAe,GAAG,IAAI,CAAC;IACzB,CAAC;AACH,CAAC"}
|
@@ -5,10 +5,10 @@ export interface ImageContext {
|
|
5
5
|
images: Partial<Record<string, Images>>;
|
6
6
|
}
|
7
7
|
export declare function getMatchers(ctx: ImageContext, config: Config): Promise<{
|
8
|
-
matchImage: (image: Buffer, imageName?: string) => Promise<void>;
|
9
|
-
matchImages: (images: Record<string, Buffer>) => Promise<void>;
|
8
|
+
matchImage: (image: Buffer | string, imageName?: string) => Promise<void>;
|
9
|
+
matchImages: (images: Record<string, Buffer | string>) => Promise<void>;
|
10
10
|
}>;
|
11
11
|
export declare function getOdiffMatchers(ctx: ImageContext, config: Config): {
|
12
|
-
matchImage: (image: Buffer, imageName?: string) => Promise<void>;
|
13
|
-
matchImages: (images: Record<string, Buffer>) => Promise<void>;
|
12
|
+
matchImage: (image: Buffer | string, imageName?: string) => Promise<void>;
|
13
|
+
matchImages: (images: Record<string, Buffer | string>) => Promise<void>;
|
14
14
|
};
|
@@ -11,6 +11,9 @@ const odiff_bin_1 = require("odiff-bin");
|
|
11
11
|
const pngjs_1 = require("pngjs");
|
12
12
|
const types_js_1 = require("../../types.js");
|
13
13
|
const assert_1 = __importDefault(require("assert"));
|
14
|
+
function toBuffer(bufferOrBase64) {
|
15
|
+
return typeof bufferOrBase64 === 'string' ? Buffer.from(bufferOrBase64, 'base64') : bufferOrBase64;
|
16
|
+
}
|
14
17
|
async function getStat(filePath) {
|
15
18
|
try {
|
16
19
|
return await (0, promises_1.stat)(filePath);
|
@@ -168,7 +171,7 @@ async function getMatchers(ctx, config) {
|
|
168
171
|
}
|
169
172
|
return {
|
170
173
|
matchImage: async (image, imageName) => {
|
171
|
-
const errorMessage = await assertImage(image, imageName);
|
174
|
+
const errorMessage = await assertImage(toBuffer(image), imageName);
|
172
175
|
if (errorMessage) {
|
173
176
|
throw createImageError(imageName ? { [imageName]: errorMessage } : errorMessage);
|
174
177
|
}
|
@@ -176,7 +179,7 @@ async function getMatchers(ctx, config) {
|
|
176
179
|
matchImages: async (images) => {
|
177
180
|
const errors = {};
|
178
181
|
await Promise.all(Object.entries(images).map(async ([imageName, image]) => {
|
179
|
-
const errorMessage = await assertImage(image, imageName);
|
182
|
+
const errorMessage = await assertImage(toBuffer(image), imageName);
|
180
183
|
if (errorMessage) {
|
181
184
|
errors[imageName] = errorMessage;
|
182
185
|
}
|
@@ -209,7 +212,7 @@ function getOdiffMatchers(ctx, config) {
|
|
209
212
|
}
|
210
213
|
return {
|
211
214
|
matchImage: async (image, imageName) => {
|
212
|
-
const errorMessage = await assertImage(image, imageName);
|
215
|
+
const errorMessage = await assertImage(toBuffer(image), imageName);
|
213
216
|
if (errorMessage) {
|
214
217
|
throw createImageError(imageName ? { [imageName]: errorMessage } : errorMessage);
|
215
218
|
}
|
@@ -217,7 +220,7 @@ function getOdiffMatchers(ctx, config) {
|
|
217
220
|
matchImages: async (images) => {
|
218
221
|
const errors = {};
|
219
222
|
await Promise.all(Object.entries(images).map(async ([imageName, image]) => {
|
220
|
-
const errorMessage = await assertImage(image, imageName);
|
223
|
+
const errorMessage = await assertImage(toBuffer(image), imageName);
|
221
224
|
if (errorMessage) {
|
222
225
|
errors[imageName] = errorMessage;
|
223
226
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"match-image.js","sourceRoot":"","sources":["../../../src/server/worker/match-image.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"match-image.js","sourceRoot":"","sources":["../../../src/server/worker/match-image.ts"],"names":[],"mappings":"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"}
|
@@ -5,9 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
6
6
|
exports.start = start;
|
7
7
|
const chai_1 = __importDefault(require("chai"));
|
8
|
-
const chalk_1 = __importDefault(require("chalk"));
|
9
|
-
const loglevel_1 = __importDefault(require("loglevel"));
|
10
|
-
const events_1 = __importDefault(require("events"));
|
11
8
|
const types_js_1 = require("../../types.js");
|
12
9
|
const messages_js_1 = require("../messages.js");
|
13
10
|
const chai_image_js_1 = __importDefault(require("./chai-image.js"));
|
@@ -30,9 +27,10 @@ async function getTestsFromStories(config, browserName, webdriver) {
|
|
30
27
|
.forEach((test) => testsById.set(test.id, test));
|
31
28
|
return testsById;
|
32
29
|
}
|
33
|
-
function runHandler(browserName,
|
30
|
+
function runHandler(browserName, result, error) {
|
34
31
|
// TODO How handle browser corruption?
|
35
|
-
|
32
|
+
const { images } = result;
|
33
|
+
if (images != null && (0, types_js_1.isImageError)(error)) {
|
36
34
|
if (typeof error.images == 'string') {
|
37
35
|
const image = images[browserName];
|
38
36
|
if (image)
|
@@ -47,11 +45,12 @@ function runHandler(browserName, images, error) {
|
|
47
45
|
});
|
48
46
|
}
|
49
47
|
}
|
50
|
-
if (error || Object.values(images).some((image) => image?.error != null)) {
|
51
|
-
|
48
|
+
if (error || (images != null && Object.values(images).some((image) => image?.error != null))) {
|
49
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
50
|
+
const errorMessage = result.error;
|
52
51
|
const isUnexpectedError = hasTimeout(errorMessage) ||
|
53
52
|
hasDisconnected(errorMessage) ||
|
54
|
-
Object.values(images).some((image) => hasTimeout(image?.error));
|
53
|
+
(images != null && Object.values(images).some((image) => hasTimeout(image?.error)));
|
55
54
|
if (isUnexpectedError)
|
56
55
|
(0, messages_js_1.emitWorkerMessage)({ type: 'error', payload: { subtype: 'unknown', error: errorMessage } });
|
57
56
|
else
|
@@ -59,18 +58,23 @@ function runHandler(browserName, images, error) {
|
|
59
58
|
type: 'end',
|
60
59
|
payload: {
|
61
60
|
status: 'failed',
|
62
|
-
|
63
|
-
error: errorMessage,
|
61
|
+
...result,
|
64
62
|
},
|
65
63
|
});
|
66
64
|
}
|
67
65
|
else {
|
68
|
-
(0, messages_js_1.emitTestMessage)({
|
66
|
+
(0, messages_js_1.emitTestMessage)({
|
67
|
+
type: 'end',
|
68
|
+
payload: {
|
69
|
+
status: 'success',
|
70
|
+
...result,
|
71
|
+
},
|
72
|
+
});
|
69
73
|
}
|
70
74
|
}
|
71
75
|
async function setupWebdriver(webdriver) {
|
72
76
|
if ((await webdriver.openBrowser(true)) == null) {
|
73
|
-
logger_js_1.logger.error('Failed to start browser');
|
77
|
+
(0, logger_js_1.logger)().error('Failed to start browser');
|
74
78
|
(0, messages_js_1.emitWorkerMessage)({
|
75
79
|
type: 'error',
|
76
80
|
payload: { subtype: 'browser', error: 'Failed to start browser' },
|
@@ -94,7 +98,6 @@ function hasTimeout(str) {
|
|
94
98
|
return str?.toLowerCase().includes('timeout') ?? false;
|
95
99
|
}
|
96
100
|
async function start(browser, gridUrl, config, options) {
|
97
|
-
let retries = 0;
|
98
101
|
const imagesContext = {
|
99
102
|
attachments: [],
|
100
103
|
testFullPath: [],
|
@@ -104,36 +107,16 @@ async function start(browser, gridUrl, config, options) {
|
|
104
107
|
const [sessionId, webdriver] = (await setupWebdriver(new Webdriver(browser, gridUrl, config, options))) ?? [];
|
105
108
|
if (!webdriver || !sessionId)
|
106
109
|
return;
|
107
|
-
const workerLogger = loglevel_1.default.getLogger(`${browser}:${chalk_1.default.gray(sessionId)}`);
|
108
|
-
const reporterOptions = {
|
109
|
-
...config.reporterOptions,
|
110
|
-
creevey: {
|
111
|
-
sessionId,
|
112
|
-
reportDir: config.reportDir,
|
113
|
-
browserName: browser,
|
114
|
-
get willRetry() {
|
115
|
-
return retries < config.maxRetries;
|
116
|
-
},
|
117
|
-
get images() {
|
118
|
-
return imagesContext.images;
|
119
|
-
},
|
120
|
-
},
|
121
|
-
};
|
122
|
-
class FakeRunner extends events_1.default {
|
123
|
-
}
|
124
|
-
const runner = new FakeRunner();
|
125
|
-
const Reporter = config.reporter;
|
126
|
-
new Reporter(runner, { reporterOptions });
|
127
110
|
const { matchImage, matchImages } = options.odiff
|
128
111
|
? (0, match_image_js_1.getOdiffMatchers)(imagesContext, config)
|
129
112
|
: await (0, match_image_js_1.getMatchers)(imagesContext, config);
|
130
|
-
chai_1.default.use((0, chai_image_js_1.default)(matchImage, matchImages
|
113
|
+
chai_1.default.use((0, chai_image_js_1.default)(matchImage, matchImages));
|
131
114
|
const tests = await (async () => {
|
132
115
|
try {
|
133
116
|
return await getTestsFromStories(config, browser, webdriver);
|
134
117
|
}
|
135
118
|
catch (error) {
|
136
|
-
|
119
|
+
(0, logger_js_1.logger)().error('Failed to get tests from stories:', error);
|
137
120
|
(0, messages_js_1.emitWorkerMessage)({
|
138
121
|
type: 'error',
|
139
122
|
payload: { subtype: 'browser', error: serializeError(error) },
|
@@ -149,7 +132,7 @@ async function start(browser, gridUrl, config, options) {
|
|
149
132
|
const test = tests.get(message.payload.id);
|
150
133
|
if (!test) {
|
151
134
|
const error = `Test with id ${message.payload.id} not found`;
|
152
|
-
|
135
|
+
(0, logger_js_1.logger)().error(error);
|
153
136
|
(0, messages_js_1.emitWorkerMessage)({
|
154
137
|
type: 'error',
|
155
138
|
payload: { subtype: 'test', error },
|
@@ -170,67 +153,56 @@ async function start(browser, gridUrl, config, options) {
|
|
170
153
|
imagesContext.attachments = [];
|
171
154
|
imagesContext.testFullPath = (0, utils_js_1.getTestPath)(test);
|
172
155
|
imagesContext.images = {};
|
173
|
-
retries = message.payload.retries;
|
174
156
|
let error = undefined;
|
175
|
-
const fakeSuite = {
|
176
|
-
title: test.storyPath.slice(0, -1).join('/'),
|
177
|
-
fullTitle: () => fakeSuite.title,
|
178
|
-
titlePath: () => [fakeSuite.title],
|
179
|
-
tests: [],
|
180
|
-
};
|
181
|
-
const fakeTest = {
|
182
|
-
parent: fakeSuite,
|
183
|
-
title: [test.story.name, test.testName, test.browser].filter(types_js_1.isDefined).join('/'),
|
184
|
-
fullTitle: () => (0, utils_js_1.getTestPath)(test).join('/'),
|
185
|
-
titlePath: () => (0, utils_js_1.getTestPath)(test),
|
186
|
-
currentRetry: () => retries,
|
187
|
-
retires: () => config.maxRetries,
|
188
|
-
slow: () => 1000,
|
189
|
-
};
|
190
|
-
fakeSuite.tests.push(fakeTest);
|
191
157
|
void (async () => {
|
192
|
-
|
193
|
-
|
158
|
+
let timeout;
|
159
|
+
let isRejected = false;
|
194
160
|
const start = Date.now();
|
195
161
|
try {
|
196
162
|
await Promise.race([
|
197
|
-
new Promise((reject) => setTimeout(() => {
|
198
|
-
|
199
|
-
|
163
|
+
new Promise((_, reject) => (timeout = setTimeout(() => {
|
164
|
+
isRejected = true;
|
165
|
+
reject(new Error(`Timeout of ${config.testTimeout}ms exceeded`));
|
166
|
+
}, config.testTimeout))),
|
200
167
|
(async () => {
|
201
|
-
const context = await webdriver.switchStory(test.story, baseContext
|
168
|
+
const context = await webdriver.switchStory(test.story, baseContext);
|
202
169
|
await test.fn(context);
|
203
170
|
})(),
|
204
171
|
]);
|
205
172
|
}
|
206
173
|
catch (testError) {
|
207
174
|
error = testError;
|
208
|
-
fakeTest.err = error;
|
209
175
|
}
|
210
176
|
const duration = Date.now() - start;
|
211
|
-
|
212
|
-
|
213
|
-
|
214
|
-
|
215
|
-
|
216
|
-
|
177
|
+
clearTimeout(timeout);
|
178
|
+
await webdriver.afterTest(test);
|
179
|
+
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
180
|
+
if (isRejected) {
|
181
|
+
(0, messages_js_1.emitWorkerMessage)({
|
182
|
+
type: 'error',
|
183
|
+
payload: { subtype: 'unknown', error: serializeError(error) },
|
184
|
+
});
|
217
185
|
}
|
218
186
|
else {
|
219
|
-
|
187
|
+
const result = {
|
188
|
+
sessionId,
|
189
|
+
images: imagesContext.images,
|
190
|
+
error: serializeError(error),
|
191
|
+
duration,
|
192
|
+
attachments: imagesContext.attachments,
|
193
|
+
retries: message.payload.retries,
|
194
|
+
};
|
195
|
+
runHandler(baseContext.browserName, result, error);
|
220
196
|
}
|
221
|
-
runner.emit(types_js_1.TEST_EVENTS.TEST_END, fakeTest);
|
222
|
-
runner.emit(types_js_1.TEST_EVENTS.RUN_END);
|
223
|
-
await webdriver.afterTest(test);
|
224
|
-
runHandler(baseContext.browserName, imagesContext.images, error);
|
225
197
|
})().catch((error) => {
|
226
|
-
|
198
|
+
(0, logger_js_1.logger)().error('Unexpected error:', error);
|
227
199
|
(0, messages_js_1.emitWorkerMessage)({
|
228
200
|
type: 'error',
|
229
201
|
payload: { subtype: 'test', error: serializeError(error) },
|
230
202
|
});
|
231
203
|
});
|
232
204
|
});
|
233
|
-
|
205
|
+
(0, logger_js_1.logger)().info('Browser is ready');
|
234
206
|
(0, messages_js_1.emitWorkerMessage)({ type: 'ready' });
|
235
207
|
}
|
236
208
|
//# sourceMappingURL=start.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/server/worker/start.ts"],"names":[],"mappings":";;;;;
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/server/worker/start.ts"],"names":[],"mappings":"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"}
|
package/dist/shared/index.d.ts
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
import { Parameters } from '@storybook/
|
1
|
+
import type { Parameters } from '@storybook/types';
|
2
2
|
import { SetStoriesData, StoriesRaw, StoryInput } from '../types.js';
|
3
3
|
export declare const combineParameters: (...parameterSets: Parameters[]) => Parameters;
|
4
4
|
export declare const denormalizeStoryParameters: ({ globalParameters, kindParameters, stories, }: SetStoriesData) => StoriesRaw;
|