creevey 0.9.2 → 0.10.0-beta.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/chromatic.config.json +5 -0
- package/dist/client/addon/components/Addon.d.ts +1 -0
- package/dist/client/addon/components/Addon.js.map +1 -1
- package/dist/client/addon/components/Icons.d.ts +1 -0
- package/dist/client/addon/components/Icons.js.map +1 -1
- package/dist/client/addon/components/Panel.d.ts +1 -0
- package/dist/client/addon/components/Panel.js.map +1 -1
- package/dist/client/addon/components/TestSelect.d.ts +1 -0
- package/dist/client/addon/components/TestSelect.js +4 -3
- package/dist/client/addon/components/TestSelect.js.map +1 -1
- package/dist/client/addon/components/Tools.d.ts +1 -0
- package/dist/client/addon/components/Tools.js +7 -8
- package/dist/client/addon/components/Tools.js.map +1 -1
- package/dist/client/addon/controller.d.ts +1 -1
- package/dist/client/addon/controller.js.map +1 -1
- package/dist/client/addon/decorator.d.ts +1 -1
- package/dist/client/addon/manager.js +3 -2
- package/dist/client/addon/manager.js.map +1 -1
- package/dist/client/addon/preview.d.ts +1 -1
- package/dist/client/addon/withCreevey.d.ts +6 -8
- package/dist/client/addon/withCreevey.js +21 -19
- 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.map +1 -1
- package/dist/client/shared/components/ImagesView/ImagesView.d.ts +1 -0
- package/dist/client/shared/components/ImagesView/ImagesView.js.map +1 -1
- package/dist/client/shared/components/ImagesView/SideBySideView.d.ts +1 -1
- 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.map +1 -1
- package/dist/client/shared/components/ImagesView/SwapView.d.ts +1 -1
- package/dist/client/shared/components/ImagesView/SwapView.js.map +1 -1
- package/dist/client/shared/components/PageFooter/PageFooter.d.ts +1 -0
- package/dist/client/shared/components/PageFooter/PageFooter.js +1 -1
- package/dist/client/shared/components/PageFooter/PageFooter.js.map +1 -1
- package/dist/client/shared/components/PageFooter/Paging.d.ts +2 -2
- package/dist/client/shared/components/PageFooter/Paging.js +8 -6
- package/dist/client/shared/components/PageFooter/Paging.js.map +1 -1
- package/dist/client/shared/components/PageHeader/ImagePreview.js.map +1 -1
- package/dist/client/shared/components/PageHeader/PageHeader.d.ts +1 -0
- package/dist/client/shared/components/PageHeader/PageHeader.js +2 -1
- package/dist/client/shared/components/PageHeader/PageHeader.js.map +1 -1
- package/dist/client/shared/components/ResultsPage.d.ts +2 -2
- package/dist/client/shared/components/ResultsPage.js.map +1 -1
- package/dist/client/web/CreeveyApp.d.ts +1 -0
- package/dist/client/web/CreeveyApp.js.map +1 -1
- package/dist/client/web/CreeveyLoader.d.ts +1 -0
- package/dist/client/web/CreeveyLoader.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/Checkbox.d.ts +1 -1
- package/dist/client/web/CreeveyView/SideBar/Checkbox.js +4 -4
- package/dist/client/web/CreeveyView/SideBar/Checkbox.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/Search.d.ts +1 -0
- package/dist/client/web/CreeveyView/SideBar/Search.js +4 -4
- package/dist/client/web/CreeveyView/SideBar/Search.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/SideBar.d.ts +1 -1
- package/dist/client/web/CreeveyView/SideBar/SideBar.js +1 -7
- package/dist/client/web/CreeveyView/SideBar/SideBar.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/SideBarFooter.d.ts +1 -0
- package/dist/client/web/CreeveyView/SideBar/SideBarFooter.js +5 -4
- package/dist/client/web/CreeveyView/SideBar/SideBarFooter.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/SideBarHeader.d.ts +1 -0
- package/dist/client/web/CreeveyView/SideBar/SideBarHeader.js +4 -3
- package/dist/client/web/CreeveyView/SideBar/SideBarHeader.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/SuiteLink.d.ts +3 -7
- package/dist/client/web/CreeveyView/SideBar/SuiteLink.js +6 -5
- package/dist/client/web/CreeveyView/SideBar/SuiteLink.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/TestLink.d.ts +1 -0
- package/dist/client/web/CreeveyView/SideBar/TestLink.js +5 -1
- package/dist/client/web/CreeveyView/SideBar/TestLink.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/TestStatusIcon.js +15 -8
- package/dist/client/web/CreeveyView/SideBar/TestStatusIcon.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/TestsStatus.js +5 -4
- package/dist/client/web/CreeveyView/SideBar/TestsStatus.js.map +1 -1
- package/dist/client/web/CreeveyView/SideBar/Toggle.d.ts +1 -0
- package/dist/client/web/CreeveyView/SideBar/Toggle.js.map +1 -1
- package/dist/client/web/KeyboardEventsContext.d.ts +3 -4
- package/dist/client/web/KeyboardEventsContext.js.map +1 -1
- package/dist/client/web/assets/index-DkmZfG9C.js +591 -0
- package/dist/client/web/index.html +1 -1
- package/dist/client/web/index.js +5 -6
- package/dist/client/web/index.js.map +1 -1
- package/dist/creevey.js +21 -9
- package/dist/creevey.js.map +1 -1
- package/dist/index.js +7 -3
- package/dist/index.js.map +1 -1
- package/dist/server/config.d.ts +1 -1
- package/dist/server/config.js +9 -5
- package/dist/server/config.js.map +1 -1
- package/dist/server/docker.d.ts +2 -2
- package/dist/server/docker.js +46 -40
- package/dist/server/docker.js.map +1 -1
- package/dist/server/index.js +54 -15
- package/dist/server/index.js.map +1 -1
- package/dist/server/master/master.d.ts +1 -5
- package/dist/server/master/master.js +3 -3
- package/dist/server/master/master.js.map +1 -1
- package/dist/server/master/pool.d.ts +2 -1
- package/dist/server/master/pool.js +9 -5
- package/dist/server/master/pool.js.map +1 -1
- package/dist/server/master/runner.d.ts +1 -1
- package/dist/server/master/runner.js +2 -2
- package/dist/server/master/runner.js.map +1 -1
- package/dist/server/master/server.js +1 -0
- package/dist/server/master/server.js.map +1 -1
- package/dist/server/master/start.d.ts +3 -0
- package/dist/server/master/{index.js → start.js} +6 -9
- package/dist/server/master/start.js.map +1 -0
- package/dist/server/messages.d.ts +4 -10
- package/dist/server/messages.js +4 -58
- package/dist/server/messages.js.map +1 -1
- package/dist/server/playwright/docker-file.d.ts +1 -0
- package/dist/server/playwright/docker-file.js +26 -0
- package/dist/server/playwright/docker-file.js.map +1 -0
- package/dist/server/playwright/docker.d.ts +1 -0
- package/dist/server/playwright/docker.js +31 -0
- package/dist/server/playwright/docker.js.map +1 -0
- package/dist/server/playwright/internal.d.ts +25 -0
- package/dist/server/playwright/internal.js +319 -0
- package/dist/server/playwright/internal.js.map +1 -0
- package/dist/server/playwright/webdriver.d.ts +16 -0
- package/dist/server/playwright/webdriver.js +105 -0
- package/dist/server/playwright/webdriver.js.map +1 -0
- package/dist/server/providers/browser.d.ts +2 -0
- package/dist/server/{storybook/providers → providers}/browser.js +6 -7
- package/dist/server/providers/browser.js.map +1 -0
- package/dist/server/providers/hybrid.d.ts +2 -0
- package/dist/server/{storybook/providers → providers}/hybrid.js +8 -8
- package/dist/server/providers/hybrid.js.map +1 -0
- package/dist/server/reporter.d.ts +26 -0
- package/dist/server/{worker/reporter.js → reporter.js} +34 -56
- package/dist/server/reporter.js.map +1 -0
- package/dist/server/selenium/internal.d.ts +31 -0
- package/dist/server/selenium/internal.js +606 -0
- package/dist/server/selenium/internal.js.map +1 -0
- package/dist/server/selenium/selenoid.js +6 -13
- package/dist/server/selenium/selenoid.js.map +1 -1
- package/dist/server/selenium/webdriver.d.ts +24 -0
- package/dist/server/selenium/webdriver.js +106 -0
- package/dist/server/selenium/webdriver.js.map +1 -0
- package/dist/server/stories.js +16 -9
- package/dist/server/stories.js.map +1 -1
- package/dist/server/telemetry.d.ts +1 -1
- package/dist/server/telemetry.js +4 -4
- package/dist/server/telemetry.js.map +1 -1
- package/dist/server/utils.d.ts +3 -4
- package/dist/server/utils.js +10 -9
- package/dist/server/utils.js.map +1 -1
- package/dist/server/webdriver.d.ts +19 -0
- package/dist/server/webdriver.js +79 -0
- package/dist/server/webdriver.js.map +1 -0
- package/dist/server/worker/chai-image.d.ts +2 -5
- package/dist/server/worker/chai-image.js +14 -102
- package/dist/server/worker/chai-image.js.map +1 -1
- package/dist/server/worker/match-image.d.ts +14 -0
- package/dist/server/worker/match-image.js +231 -0
- package/dist/server/worker/match-image.js.map +1 -0
- package/dist/server/worker/start.d.ts +2 -0
- package/dist/server/worker/start.js +258 -0
- package/dist/server/worker/start.js.map +1 -0
- package/dist/types.d.ts +126 -64
- package/dist/types.js +15 -9
- package/dist/types.js.map +1 -1
- package/package.json +108 -110
- package/src/client/addon/components/Addon.tsx +1 -1
- package/src/client/addon/components/Icons.tsx +1 -1
- package/src/client/addon/components/Panel.tsx +1 -1
- package/src/client/addon/components/TestSelect.tsx +5 -5
- package/src/client/addon/components/Tools.tsx +9 -9
- package/src/client/addon/controller.ts +1 -1
- package/src/client/addon/manager.ts +4 -4
- package/src/client/addon/withCreevey.ts +26 -28
- package/src/client/shared/components/ImagesView/BlendView.tsx +1 -1
- package/src/client/shared/components/ImagesView/ImagesView.tsx +2 -2
- package/src/client/shared/components/ImagesView/SideBySideView.tsx +1 -1
- package/src/client/shared/components/ImagesView/SlideView.tsx +1 -1
- package/src/client/shared/components/ImagesView/SwapView.tsx +1 -1
- package/src/client/shared/components/PageFooter/PageFooter.tsx +2 -2
- package/src/client/shared/components/PageFooter/Paging.tsx +13 -13
- package/src/client/shared/components/PageHeader/ImagePreview.tsx +1 -1
- package/src/client/shared/components/PageHeader/PageHeader.tsx +4 -3
- package/src/client/shared/components/ResultsPage.tsx +1 -1
- package/src/client/web/CreeveyApp.tsx +1 -1
- package/src/client/web/CreeveyLoader.tsx +1 -1
- package/src/client/web/CreeveyView/SideBar/Checkbox.tsx +6 -7
- package/src/client/web/CreeveyView/SideBar/Search.tsx +4 -4
- package/src/client/web/CreeveyView/SideBar/SideBar.tsx +3 -10
- package/src/client/web/CreeveyView/SideBar/SideBarFooter.tsx +7 -6
- package/src/client/web/CreeveyView/SideBar/SideBarHeader.tsx +7 -6
- package/src/client/web/CreeveyView/SideBar/SuiteLink.tsx +8 -6
- package/src/client/web/CreeveyView/SideBar/TestLink.tsx +8 -3
- package/src/client/web/CreeveyView/SideBar/TestStatusIcon.tsx +18 -10
- package/src/client/web/CreeveyView/SideBar/TestsStatus.tsx +7 -10
- package/src/client/web/CreeveyView/SideBar/Toggle.tsx +1 -2
- package/src/client/web/KeyboardEventsContext.tsx +3 -4
- package/src/client/web/index.html +1 -1
- package/src/client/web/index.tsx +4 -3
- package/src/creevey.ts +25 -8
- package/src/index.ts +4 -2
- package/src/server/config.ts +12 -8
- package/src/server/docker.ts +58 -44
- package/src/server/index.ts +57 -18
- package/src/server/master/master.ts +3 -6
- package/src/server/master/pool.ts +20 -7
- package/src/server/master/runner.ts +2 -2
- package/src/server/master/server.ts +1 -0
- package/src/server/master/{index.ts → start.ts} +13 -11
- package/src/server/messages.ts +11 -75
- package/src/server/playwright/docker-file.ts +21 -0
- package/src/server/playwright/docker.ts +41 -0
- package/src/server/playwright/internal.ts +387 -0
- package/src/server/playwright/webdriver.ts +126 -0
- package/src/server/{storybook/providers → providers}/browser.ts +7 -8
- package/src/server/{storybook/providers → providers}/hybrid.ts +19 -19
- package/src/server/{worker/reporter.ts → reporter.ts} +40 -72
- package/src/server/selenium/internal.ts +785 -0
- package/src/server/selenium/selenoid.ts +12 -17
- package/src/server/selenium/webdriver.ts +136 -0
- package/src/server/stories.ts +18 -11
- package/src/server/telemetry.ts +2 -2
- package/src/server/utils.ts +9 -9
- package/src/server/webdriver.ts +127 -0
- package/src/server/worker/chai-image.ts +21 -133
- package/src/server/worker/match-image.ts +303 -0
- package/src/server/worker/start.ts +303 -0
- package/src/types.ts +161 -60
- package/dist/client/web/202.js +0 -1
- package/dist/client/web/270.js +0 -43
- package/dist/client/web/752.js +0 -1
- package/dist/client/web/main.js +0 -79
- package/dist/client/web/main.js.LICENSE.txt +0 -34
- package/dist/server/master/index.d.ts +0 -3
- package/dist/server/master/index.js.map +0 -1
- package/dist/server/selenium/browser.d.ts +0 -19
- package/dist/server/selenium/browser.js +0 -640
- package/dist/server/selenium/browser.js.map +0 -1
- package/dist/server/selenium/index.d.ts +0 -2
- package/dist/server/selenium/index.js +0 -19
- package/dist/server/selenium/index.js.map +0 -1
- package/dist/server/storybook/providers/browser.d.ts +0 -2
- package/dist/server/storybook/providers/browser.js.map +0 -1
- package/dist/server/storybook/providers/hybrid.d.ts +0 -2
- package/dist/server/storybook/providers/hybrid.js.map +0 -1
- package/dist/server/worker/helpers.d.ts +0 -8
- package/dist/server/worker/helpers.js +0 -57
- package/dist/server/worker/helpers.js.map +0 -1
- package/dist/server/worker/index.d.ts +0 -1
- package/dist/server/worker/index.js +0 -6
- package/dist/server/worker/index.js.map +0 -1
- package/dist/server/worker/reporter.d.ts +0 -8
- package/dist/server/worker/reporter.js.map +0 -1
- package/dist/server/worker/worker.d.ts +0 -4
- package/dist/server/worker/worker.js +0 -217
- package/dist/server/worker/worker.js.map +0 -1
- package/src/server/selenium/browser.ts +0 -840
- package/src/server/selenium/index.ts +0 -2
- package/src/server/worker/helpers.ts +0 -61
- package/src/server/worker/index.ts +0 -1
- package/src/server/worker/worker.ts +0 -245
- package/types/mocha.d.ts +0 -20
@@ -7,22 +7,18 @@ exports.startSelenoidStandalone = startSelenoidStandalone;
|
|
7
7
|
exports.startSelenoidContainer = startSelenoidContainer;
|
8
8
|
const path_1 = __importDefault(require("path"));
|
9
9
|
const assert_1 = __importDefault(require("assert"));
|
10
|
-
const cluster_1 = __importDefault(require("cluster"));
|
11
10
|
const fs_1 = require("fs");
|
12
11
|
const promises_1 = require("fs/promises");
|
13
12
|
const shelljs_1 = __importDefault(require("shelljs"));
|
14
|
-
const core_1 = require("@octokit/core");
|
15
13
|
const utils_js_1 = require("../utils.js");
|
16
14
|
const docker_js_1 = require("../docker.js");
|
17
15
|
const messages_js_1 = require("../messages.js");
|
18
16
|
async function createSelenoidConfig(browsers, { useDocker }) {
|
19
17
|
const selenoidConfig = {};
|
20
|
-
const cacheDir = (0, utils_js_1.getCreeveyCache)();
|
18
|
+
const cacheDir = await (0, utils_js_1.getCreeveyCache)();
|
21
19
|
(0, assert_1.default)(cacheDir, "Couldn't get cache directory");
|
22
20
|
const selenoidConfigDir = path_1.default.join(cacheDir, 'selenoid');
|
23
|
-
browsers.forEach(({ browserName,
|
24
|
-
// eslint-disable-next-line @typescript-eslint/no-deprecated
|
25
|
-
version = 'latest', browserVersion = version, dockerImage = `selenoid/${browserName}:${browserVersion}`, webdriverCommand = [], }) => {
|
21
|
+
browsers.forEach(({ browserName, browserVersion = 'latest', dockerImage = `selenoid/${browserName}:${browserVersion}`, webdriverCommand = [], }) => {
|
26
22
|
if (!selenoidConfig[browserName])
|
27
23
|
selenoidConfig[browserName] = { default: browserVersion, versions: {} };
|
28
24
|
if (!useDocker && webdriverCommand.length == 0)
|
@@ -43,7 +39,9 @@ async function downloadSelenoidBinary(destination) {
|
|
43
39
|
linux: 'selenoid_linux_amd64',
|
44
40
|
win32: 'selenoid_windows_amd64.exe',
|
45
41
|
};
|
46
|
-
|
42
|
+
// TODO Replace with `import from`
|
43
|
+
const { Octokit } = await import('@octokit/core');
|
44
|
+
const octokit = new Octokit();
|
47
45
|
const response = await octokit.request('GET /repos/{owner}/{repo}/releases/latest', {
|
48
46
|
owner: 'aerokube',
|
49
47
|
repo: 'selenoid',
|
@@ -58,9 +56,6 @@ async function downloadSelenoidBinary(destination) {
|
|
58
56
|
return (0, utils_js_1.downloadBinary)(downloadUrl, destination);
|
59
57
|
}
|
60
58
|
async function startSelenoidStandalone(config, debug) {
|
61
|
-
config.gridUrl = 'http://localhost:4444/wd/hub';
|
62
|
-
if (cluster_1.default.isWorker)
|
63
|
-
return;
|
64
59
|
const browsers = Object.values(config.browsers).filter((browser) => !browser.gridUrl);
|
65
60
|
const selenoidConfigDir = await createSelenoidConfig(browsers, { useDocker: false });
|
66
61
|
const binaryPath = path_1.default.join(selenoidConfigDir, process.platform == 'win32' ? 'selenoid.exe' : 'selenoid');
|
@@ -92,9 +87,7 @@ async function startSelenoidContainer(config, debug) {
|
|
92
87
|
const browsers = Object.values(config.browsers).filter((browser) => !browser.gridUrl);
|
93
88
|
const images = [];
|
94
89
|
let limit = 0;
|
95
|
-
browsers.forEach(({ browserName,
|
96
|
-
// eslint-disable-next-line @typescript-eslint/no-deprecated
|
97
|
-
version = 'latest', browserVersion = version, limit: browserLimit = 1, dockerImage = `selenoid/${browserName}:${browserVersion}`, }) => {
|
90
|
+
browsers.forEach(({ browserName, browserVersion = 'latest', limit: browserLimit = 1, dockerImage = `selenoid/${browserName}:${browserVersion}`, }) => {
|
98
91
|
limit += browserLimit;
|
99
92
|
images.push(dockerImage);
|
100
93
|
});
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"selenoid.js","sourceRoot":"","sources":["../../../src/server/selenium/selenoid.ts"],"names":[],"mappings":";;;;;
|
1
|
+
{"version":3,"file":"selenoid.js","sourceRoot":"","sources":["../../../src/server/selenium/selenoid.ts"],"names":[],"mappings":"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"}
|
@@ -0,0 +1,24 @@
|
|
1
|
+
import { Args } from '@storybook/csf';
|
2
|
+
import { Config, StorybookGlobals, StoryInput, StoriesRaw, Options } from '../../types.js';
|
3
|
+
import { CreeveyWebdriverBase } from '../webdriver.js';
|
4
|
+
declare global {
|
5
|
+
interface Window {
|
6
|
+
__CREEVEY_RESTORE_SCROLL__?: () => void;
|
7
|
+
__CREEVEY_UPDATE_GLOBALS__: (globals: StorybookGlobals) => void;
|
8
|
+
__CREEVEY_INSERT_IGNORE_STYLES__: (ignoreElements: string[]) => HTMLStyleElement;
|
9
|
+
__CREEVEY_REMOVE_IGNORE_STYLES__: (ignoreStyles: HTMLStyleElement) => void;
|
10
|
+
}
|
11
|
+
}
|
12
|
+
export declare class SeleniumWebdriver extends CreeveyWebdriverBase {
|
13
|
+
#private;
|
14
|
+
constructor(browser: string, gridUrl: string, config: Config, options: Options);
|
15
|
+
get browser(): import("selenium-webdriver").WebDriver | undefined;
|
16
|
+
getSessionId(): Promise<string>;
|
17
|
+
openBrowser(fresh?: boolean): Promise<SeleniumWebdriver | null>;
|
18
|
+
closeBrowser(): Promise<void>;
|
19
|
+
loadStoriesFromBrowser(): Promise<StoriesRaw>;
|
20
|
+
protected takeScreenshot(captureElement: string | null, ignoreElements?: string | string[] | null): Promise<Buffer>;
|
21
|
+
protected waitForComplete(callback: (isCompleted: boolean) => void): void;
|
22
|
+
protected selectStory(id: string, waitForReady?: boolean): Promise<boolean>;
|
23
|
+
protected updateStoryArgs(story: StoryInput, updatedArgs: Args): Promise<void>;
|
24
|
+
}
|
@@ -0,0 +1,106 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.SeleniumWebdriver = void 0;
|
4
|
+
const messages_js_1 = require("../messages.js");
|
5
|
+
const webdriver_js_1 = require("../webdriver.js");
|
6
|
+
const logger_js_1 = require("../logger.js");
|
7
|
+
// TODO Update context interface through references
|
8
|
+
class SeleniumWebdriver extends webdriver_js_1.CreeveyWebdriverBase {
|
9
|
+
#browser = null;
|
10
|
+
#browserName;
|
11
|
+
#gridUrl;
|
12
|
+
#config;
|
13
|
+
#options;
|
14
|
+
constructor(browser, gridUrl, config, options) {
|
15
|
+
super();
|
16
|
+
this.#browserName = browser;
|
17
|
+
this.#gridUrl = gridUrl;
|
18
|
+
this.#config = config;
|
19
|
+
this.#options = options;
|
20
|
+
(0, messages_js_1.subscribeOn)('shutdown', () => {
|
21
|
+
void this.#browser?.closeBrowser().finally(() => process.exit());
|
22
|
+
this.#browser = null;
|
23
|
+
});
|
24
|
+
}
|
25
|
+
get browser() {
|
26
|
+
return this.#browser?.browser;
|
27
|
+
}
|
28
|
+
getSessionId() {
|
29
|
+
if (!this.#browser) {
|
30
|
+
// TODO Describe the error
|
31
|
+
throw new Error('Browser is not initialized');
|
32
|
+
}
|
33
|
+
return this.#browser.browser.getSession().then((session) => session.getId());
|
34
|
+
}
|
35
|
+
async openBrowser(fresh = false) {
|
36
|
+
if (this.#browser) {
|
37
|
+
if (fresh) {
|
38
|
+
await this.#browser.closeBrowser();
|
39
|
+
this.#browser = null;
|
40
|
+
}
|
41
|
+
else {
|
42
|
+
return this;
|
43
|
+
}
|
44
|
+
}
|
45
|
+
const internalModule = await (async () => {
|
46
|
+
try {
|
47
|
+
return await import('./internal.js');
|
48
|
+
}
|
49
|
+
catch (error) {
|
50
|
+
logger_js_1.logger.error(error);
|
51
|
+
return null;
|
52
|
+
}
|
53
|
+
})();
|
54
|
+
if (!internalModule)
|
55
|
+
return null;
|
56
|
+
const { InternalBrowser } = internalModule;
|
57
|
+
const browser = await InternalBrowser.getBrowser(this.#browserName, this.#gridUrl, this.#config, this.#options);
|
58
|
+
if (!browser)
|
59
|
+
return null;
|
60
|
+
this.#browser = browser;
|
61
|
+
return this;
|
62
|
+
}
|
63
|
+
async closeBrowser() {
|
64
|
+
if (this.#browser) {
|
65
|
+
await this.#browser.closeBrowser();
|
66
|
+
this.#browser = null;
|
67
|
+
}
|
68
|
+
}
|
69
|
+
async loadStoriesFromBrowser() {
|
70
|
+
if (!this.#browser) {
|
71
|
+
// TODO Describe the error
|
72
|
+
throw new Error('Browser is not initialized');
|
73
|
+
}
|
74
|
+
return this.#browser.loadStoriesFromBrowser();
|
75
|
+
}
|
76
|
+
async takeScreenshot(captureElement, ignoreElements) {
|
77
|
+
if (!this.#browser) {
|
78
|
+
// TODO Describe the error
|
79
|
+
throw new Error('Browser is not initialized');
|
80
|
+
}
|
81
|
+
return this.#browser.takeScreenshot(captureElement, ignoreElements);
|
82
|
+
}
|
83
|
+
waitForComplete(callback) {
|
84
|
+
if (!this.#browser) {
|
85
|
+
// TODO Describe the error
|
86
|
+
throw new Error('Browser is not initialized');
|
87
|
+
}
|
88
|
+
this.#browser.waitForComplete(callback);
|
89
|
+
}
|
90
|
+
async selectStory(id, waitForReady) {
|
91
|
+
if (!this.#browser) {
|
92
|
+
// TODO Describe the error
|
93
|
+
throw new Error('Browser is not initialized');
|
94
|
+
}
|
95
|
+
return this.#browser.selectStory(id, waitForReady);
|
96
|
+
}
|
97
|
+
async updateStoryArgs(story, updatedArgs) {
|
98
|
+
if (!this.#browser) {
|
99
|
+
// TODO Describe the error
|
100
|
+
throw new Error('Browser is not initialized');
|
101
|
+
}
|
102
|
+
return this.#browser.updateStoryArgs(story, updatedArgs);
|
103
|
+
}
|
104
|
+
}
|
105
|
+
exports.SeleniumWebdriver = SeleniumWebdriver;
|
106
|
+
//# sourceMappingURL=webdriver.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"webdriver.js","sourceRoot":"","sources":["../../../src/server/selenium/webdriver.ts"],"names":[],"mappings":"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"}
|
package/dist/server/stories.js
CHANGED
@@ -11,25 +11,32 @@ const crypto_1 = require("crypto");
|
|
11
11
|
const types_js_1 = require("../types.js");
|
12
12
|
const utils_js_1 = require("./utils.js");
|
13
13
|
function storyTestFabric(delay, testFn) {
|
14
|
-
return async function storyTest() {
|
14
|
+
return async function storyTest(context) {
|
15
15
|
if (delay)
|
16
16
|
await new Promise((resolve) => setTimeout(resolve, delay));
|
17
17
|
await (testFn
|
18
|
-
? testFn
|
19
|
-
:
|
20
|
-
?
|
18
|
+
? testFn(context)
|
19
|
+
: context.screenshots.length > 0
|
20
|
+
? context.matchImages(context.screenshots.reduce((screenshots, { imageName, screenshot }, index) => ({
|
21
21
|
...screenshots,
|
22
22
|
[imageName ?? `screenshot_${index}`]: screenshot,
|
23
|
-
}), {}))
|
24
|
-
:
|
23
|
+
}), {}))
|
24
|
+
: context.matchImage(await context.takeScreenshot()));
|
25
25
|
};
|
26
26
|
}
|
27
27
|
function createCreeveyTest(browser, storyMeta, skipOptions, testName) {
|
28
28
|
const { title, name, id: storyId } = storyMeta;
|
29
|
-
const
|
29
|
+
const testPath = [title, name, testName, browser].filter(types_js_1.isDefined);
|
30
30
|
const skip = skipOptions ? (0, utils_js_1.shouldSkip)(browser, { title, name }, skipOptions, testName) : false;
|
31
|
-
const id = (0, crypto_1.createHash)('sha1').update(
|
32
|
-
return {
|
31
|
+
const id = (0, crypto_1.createHash)('sha1').update(testPath.join('/')).digest('hex');
|
32
|
+
return {
|
33
|
+
id,
|
34
|
+
skip,
|
35
|
+
browser,
|
36
|
+
testName,
|
37
|
+
storyPath: [...title.split('/').map((x) => x.trim()), name],
|
38
|
+
storyId,
|
39
|
+
};
|
33
40
|
}
|
34
41
|
function convertStories(browserName, stories) {
|
35
42
|
const tests = {};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"stories.js","sourceRoot":"","sources":["../../src/server/stories.ts"],"names":[],"mappings":";;;;;
|
1
|
+
{"version":3,"file":"stories.js","sourceRoot":"","sources":["../../src/server/stories.ts"],"names":[],"mappings":"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"}
|
@@ -1,2 +1,2 @@
|
|
1
|
-
import { Config, CreeveyStatus, Options } from '../types';
|
1
|
+
import { Config, CreeveyStatus, Options } from '../types.js';
|
2
2
|
export declare function sendScreenshotsCount(config: Partial<Config>, options: Options, status?: CreeveyStatus): Promise<void>;
|
package/dist/server/telemetry.js
CHANGED
@@ -12,7 +12,7 @@ const lodash_1 = require("lodash");
|
|
12
12
|
const uuid_1 = require("uuid");
|
13
13
|
const url_1 = require("url");
|
14
14
|
const module_1 = require("module");
|
15
|
-
const
|
15
|
+
const types_js_1 = require("../types.js");
|
16
16
|
const konturGitHost = 'git.skbkontur.ru';
|
17
17
|
const trackId = 232; // front_infra
|
18
18
|
const origin = 'http://localhost/';
|
@@ -141,7 +141,7 @@ async function sendScreenshotsCount(config, options, status) {
|
|
141
141
|
name,
|
142
142
|
typeof browser === 'object'
|
143
143
|
? {
|
144
|
-
name:
|
144
|
+
name: name,
|
145
145
|
gridUrl: browser.gridUrl ? sanitizeGridUrl(browser.gridUrl) : undefined,
|
146
146
|
browserName: browser.browserName,
|
147
147
|
browserVersion: browser.browserVersion,
|
@@ -156,9 +156,9 @@ async function sendScreenshotsCount(config, options, status) {
|
|
156
156
|
};
|
157
157
|
const tests = {};
|
158
158
|
Object.values(status?.tests ?? {})
|
159
|
-
.filter(
|
159
|
+
.filter(types_js_1.isDefined)
|
160
160
|
.forEach((test) => {
|
161
|
-
(0, lodash_1.set)(tests, [...test.storyPath, test.testName, test.browser].filter(
|
161
|
+
(0, lodash_1.set)(tests, [...test.storyPath, test.testName, test.browser].filter(types_js_1.isDefined), test.id);
|
162
162
|
});
|
163
163
|
const testsMeta = { runId: uuid, tests };
|
164
164
|
const fullPathname = buildPathname('tests', testsMeta);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/server/telemetry.ts"],"names":[],"mappings":";;;;;AA0GA,oDAyGC;AAnND,gDAAwB;AACxB,kDAA0B;AAC1B,qCAA+B;AAC/B,2BAA+B;AAC/B,mCAA6B;AAC7B,+BAA0B;AAC1B,6BAAoC;AACpC,mCAAuC;AACvC,
|
1
|
+
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/server/telemetry.ts"],"names":[],"mappings":";;;;;AA0GA,oDAyGC;AAnND,gDAAwB;AACxB,kDAA0B;AAC1B,qCAA+B;AAC/B,2BAA+B;AAC/B,mCAA6B;AAC7B,+BAA0B;AAC1B,6BAAoC;AACpC,mCAAuC;AACvC,0CAAwE;AAExE,MAAM,aAAa,GAAG,kBAAkB,CAAC;AAEzC,MAAM,OAAO,GAAG,GAAG,CAAC,CAAC,cAAc;AACnC,MAAM,MAAM,GAAG,mBAAmB,CAAC;AACnC,MAAM,QAAQ,GAAG,WAAW,CAAC;AAC7B,MAAM,MAAM,GAAG,MAAM,CAAC;AAEtB,SAAS,aAAa,CAAC,KAAa,EAAE,IAA6B;IACjE,OAAO,gBAAgB,IAAA,cAAS,EAAC;QAC/B,EAAE,EAAE,OAAO;QACX,CAAC,EAAE,QAAQ;QACX,CAAC,EAAE,MAAM;QACT,CAAC,EAAE,KAAK;QACR,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;QACxB,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QAC5B,GAAG,EAAE,MAAM;KACZ,CAAC,EAAE,CAAC;AACP,CAAC;AAED,SAAS,eAAe,CAAC,OAAe;IACtC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;IAE7B,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9C,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;IAE9C,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;AACxB,CAAC;AAED,SAAS,aAAa;IACpB,IAAI,CAAC;QACH,MAAM,eAAe,GAAG,IAAA,cAAI,EAAC,eAAe,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAChE,MAAM,CAAC,EAAE,OAAO,CAAC,GAAG,2BAA2B,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACnF,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACzB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,SAAS,EAAE,KAAc,CAAC,CAAC;IACrC,CAAC;AACH,CAAC;AAED,SAAS,cAAc;IACrB,IAAI,CAAC;QACH,MAAM,iBAAiB,GAAG,IAAA,cAAI,EAAC,+BAA+B,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAClF,OAAO,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,SAAS,EAAE,KAAc,CAAC,CAAC;IACrC,CAAC;AACH,CAAC;AAED,SAAS,sBAAsB;IAC7B,IAAI,CAAC;QACH,MAAM,sBAAsB,GAAG,IAAA,cAAI,EAAC,0EAA0E,EAAE;YAC9G,MAAM,EAAE,IAAI;SACb,CAAC,CAAC;QACH,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,MAAM,CAAwB,CAAC;QAC1F,OAAO,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC1C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,SAAS,EAAE,KAAc,CAAC,CAAC;IACrC,CAAC;AACH,CAAC;AAED,SAAS,oBAAoB;IAC3B,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,IAAA,mBAAa,EAAC,UAAU,CAAC,CAAC,IAAI,CAAC;QACrD,MAAM,QAAQ,GAAG,IAAA,sBAAa,EAAC,aAAa,CAAC,CAAC;QAC9C,MAAM,cAAc,GAAG,QAAQ,CAAC,sBAAsB,CAAwB,CAAC;QAC/E,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACxC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,SAAS,EAAE,KAAc,CAAC,CAAC;IACrC,CAAC;AACH,CAAC;AAED,SAAS,WAAW,CAAC,OAA6B;IAChD,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,GAAG,GAAG,eAAK,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YACzC,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;gBACnB,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,IAAI,GAAG,CAAC,UAAU,GAAG,GAAG,EAAE,CAAC;oBAClD,OAAO,EAAE,CAAC;gBACZ,CAAC;qBAAM,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,IAAI,GAAG,CAAC,UAAU,GAAG,GAAG,EAAE,CAAC;oBACzD,MAAM,CAAC,IAAI,KAAK,CAAC,sBAAsB,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;gBAC5D,CAAC;qBAAM,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,IAAI,GAAG,CAAC,UAAU,GAAG,GAAG,EAAE,CAAC;oBACzD,MAAM,CAAC,IAAI,KAAK,CAAC,iBAAiB,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;gBACvD,CAAC;qBAAM,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,IAAI,GAAG,CAAC,UAAU,GAAG,GAAG,EAAE,CAAC;oBACzD,MAAM,CAAC,IAAI,KAAK,CAAC,iBAAiB,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;gBACvD,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,IAAI,KAAK,CAAC,2BAA2B,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;gBACjE,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC,CAAC;YAC/C,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAExB,GAAG,CAAC,GAAG,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;AACL,CAAC;AAEM,KAAK,UAAU,oBAAoB,CACxC,MAAuB,EACvB,OAAgB,EAChB,MAAsB;IAEtB,MAAM,CAAC,OAAO,CAAC,GAAG,aAAa,EAAE,CAAC;IAElC,MAAM,YAAY,GAAG,OAAO,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC;IAEtD,IAAI,CAAC,YAAY,IAAI,MAAM,CAAC,gBAAgB;QAAE,OAAO;IAErD,MAAM,IAAI,GAAG,IAAA,SAAE,GAAE,CAAC;IAElB,MAAM,CAAC,cAAc,EAAE,mBAAmB,CAAC,GAAG,oBAAoB,EAAE,CAAC;IACrE,MAAM,CAAC,gBAAgB,EAAE,qBAAqB,CAAC,GAAG,sBAAsB,EAAE,CAAC;IAC3E,MAAM,CAAC,WAAW,CAAC,GAAG,cAAc,EAAE,CAAC;IAEvC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAE7E,MAAM,UAAU,GAAG;QACjB,KAAK,EAAE,IAAI;QACX,OAAO,EAAE,OAAO,IAAI,SAAS;QAC7B,cAAc,EAAE,cAAc,IAAI,SAAS;QAC3C,gBAAgB,EAAE,gBAAgB,IAAI,SAAS;QAC/C,OAAO,EAAE,OAAO,CAAC,CAAC;QAClB,OAAO;QACP,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,cAAI,CAAC,QAAQ,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS;QACvG,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,eAAe,EAAE,MAAM,CAAC,eAAe,EAAE,YAAY,IAAI,SAAS;QAClE,MAAM,EAAE,CAAC,mBAAmB,EAAE,qBAAqB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;YAChE,CAAC,CAAC;gBACE,mBAAmB,CAAC,CAAC,CAAC,wCAAwC,mBAAmB,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,SAAS;gBACvG,qBAAqB,CAAC,CAAC,CAAC,0CAA0C,qBAAqB,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,SAAS;aAC9G,CAAC,MAAM,CAAC,OAAO,CAAC;YACnB,CAAC,CAAC,SAAS;KACd,CAAC;IAEF,MAAM,YAAY,GAAG;QACnB,KAAK,EAAE,IAAI;QACX,QAAQ,EAAE,MAAM,CAAC,WAAW,CAC1B,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC;YAC7D,IAAI;YACJ,OAAO,OAAO,KAAK,QAAQ;gBACzB,CAAC,CAAC;oBACE,IAAI,EAAE,IAAI;oBACV,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS;oBACvE,WAAW,EAAE,OAAO,CAAC,WAAW;oBAChC,cAAc,EAAE,OAAO,CAAC,cAAc;oBACtC,YAAY,EAAE,OAAO,CAAC,YAAY;oBAClC,QAAQ,EAAE,OAAO,CAAC,QAAQ;oBAC1B,KAAK,EAAE,OAAO,CAAC,KAAK;oBACpB,WAAW,EAAE,OAAO,CAAC,WAAW;oBAChC,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC;iBACtC;gBACH,CAAC,CAAC,OAAO;SACZ,CAAC,CACH;KACF,CAAC;IAEF,MAAM,KAAK,GAA4B,EAAE,CAAC;IAE1C,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC;SAC/B,MAAM,CAAC,oBAAS,CAAC;SACjB,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAChB,IAAA,YAAG,EAAC,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,oBAAS,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAC1F,CAAC,CAAC,CAAC;IAEL,MAAM,SAAS,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IAEzC,MAAM,YAAY,GAAG,aAAa,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACvD,mDAAmD;IACnD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;IAC5D,IAAI,MAAM,GAAa,EAAE,CAAC;IAC1B,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;QACpB,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC1C,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,WAAW,CAAC,CAAC;QAC9D,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;aACzC,GAAG,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,UAAU,GAAG,SAAS,EAAE,CAAC,UAAU,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;aAC/F,GAAG,CAAC,CAAC,SAAS,EAAE,GAAG,EAAE,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;IAC7F,CAAC;SAAM,CAAC;QACN,MAAM,GAAG,CAAC,YAAY,CAAC,CAAC;IAC1B,CAAC;IAED,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,WAAW,CAAC;YACV,IAAI,EAAE,mBAAmB;YACzB,IAAI,EAAE,aAAa,CAAC,QAAQ,EAAE,UAAU,CAAC;YACzC,QAAQ,EAAE,QAAQ;SACnB,CAAC;QACF,WAAW,CAAC;YACV,IAAI,EAAE,mBAAmB;YACzB,IAAI,EAAE,aAAa,CAAC,UAAU,EAAE,YAAY,CAAC;YAC7C,QAAQ,EAAE,QAAQ;SACnB,CAAC;QACF,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACtB,WAAW,CAAC;YACV,IAAI,EAAE,mBAAmB;YACzB,IAAI,EAAE,KAAK;YACX,QAAQ,EAAE,QAAQ;SACnB,CAAC,CACH;KACF,CAAC,CAAC;AACL,CAAC"}
|
package/dist/server/utils.d.ts
CHANGED
@@ -2,7 +2,6 @@ import { SkipOptions, SkipOption, TestData, ServerTest } from '../types.js';
|
|
2
2
|
export declare const isShuttingDown: {
|
3
3
|
current: boolean;
|
4
4
|
};
|
5
|
-
export declare const LOCALHOST_REGEXP: RegExp;
|
6
5
|
export declare const configExt: string[];
|
7
6
|
export declare const skipOptionKeys: string[];
|
8
7
|
export declare function shouldSkip(browser: string, meta: {
|
@@ -14,9 +13,9 @@ export declare function shouldSkipByOption(browser: string, meta: {
|
|
14
13
|
name: string;
|
15
14
|
}, skipOption: SkipOption | SkipOption[], reason: string, test?: string): string | boolean;
|
16
15
|
export declare function shutdownWorkers(): Promise<void>;
|
17
|
-
export declare function
|
18
|
-
export declare function
|
19
|
-
export declare function
|
16
|
+
export declare function getCreeveyCache(): Promise<string | undefined>;
|
17
|
+
export declare function runSequence(seq: (() => unknown)[], predicate: () => boolean): Promise<boolean>;
|
18
|
+
export declare function getTestPath(test: ServerTest): string[];
|
20
19
|
export declare function testsToImages(tests: (TestData | undefined)[]): Set<string>;
|
21
20
|
export declare const isInsideDocker: boolean;
|
22
21
|
export declare const downloadBinary: (downloadUrl: string, destination: string) => Promise<void>;
|
package/dist/server/utils.js
CHANGED
@@ -3,13 +3,13 @@ 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.downloadBinary = exports.isInsideDocker = exports.skipOptionKeys = exports.configExt = exports.
|
6
|
+
exports.downloadBinary = exports.isInsideDocker = exports.skipOptionKeys = exports.configExt = exports.isShuttingDown = void 0;
|
7
7
|
exports.shouldSkip = shouldSkip;
|
8
8
|
exports.shouldSkipByOption = shouldSkipByOption;
|
9
9
|
exports.shutdownWorkers = shutdownWorkers;
|
10
|
-
exports.shutdown = shutdown;
|
11
10
|
exports.getCreeveyCache = getCreeveyCache;
|
12
11
|
exports.runSequence = runSequence;
|
12
|
+
exports.getTestPath = getTestPath;
|
13
13
|
exports.testsToImages = testsToImages;
|
14
14
|
exports.readDirRecursive = readDirRecursive;
|
15
15
|
exports.tryToLoadTestsData = tryToLoadTestsData;
|
@@ -20,14 +20,12 @@ const cluster_1 = __importDefault(require("cluster"));
|
|
20
20
|
const path_1 = require("path");
|
21
21
|
const url_1 = require("url");
|
22
22
|
const module_1 = require("module");
|
23
|
-
const find_cache_dir_1 = __importDefault(require("find-cache-dir"));
|
24
23
|
const api_1 = require("tsx/esm/api");
|
25
24
|
const api_2 = require("tsx/cjs/api");
|
26
25
|
const types_js_1 = require("../types.js");
|
27
26
|
const messages_js_1 = require("./messages.js");
|
28
27
|
const importMetaUrl = (0, url_1.pathToFileURL)(__filename).href;
|
29
28
|
exports.isShuttingDown = { current: false };
|
30
|
-
exports.LOCALHOST_REGEXP = /(localhost|127\.0\.0\.1)/i;
|
31
29
|
exports.configExt = ['.js', '.mjs', '.ts', '.cjs', '.mts', '.cts'];
|
32
30
|
exports.skipOptionKeys = ['in', 'kinds', 'stories', 'tests', 'reason'];
|
33
31
|
function matchBy(pattern, value) {
|
@@ -81,17 +79,19 @@ async function shutdownWorkers() {
|
|
81
79
|
})));
|
82
80
|
(0, messages_js_1.emitShutdownMessage)();
|
83
81
|
}
|
84
|
-
function
|
85
|
-
|
86
|
-
}
|
87
|
-
function getCreeveyCache() {
|
88
|
-
return (0, find_cache_dir_1.default)({ name: 'creevey', cwd: (0, path_1.dirname)((0, url_1.fileURLToPath)(importMetaUrl)) });
|
82
|
+
async function getCreeveyCache() {
|
83
|
+
const { default: findCacheDir } = await import('find-cache-dir');
|
84
|
+
return findCacheDir({ name: 'creevey', cwd: (0, path_1.dirname)((0, url_1.fileURLToPath)(importMetaUrl)) });
|
89
85
|
}
|
90
86
|
async function runSequence(seq, predicate) {
|
91
87
|
for (const fn of seq) {
|
92
88
|
if (predicate())
|
93
89
|
await fn();
|
94
90
|
}
|
91
|
+
return predicate();
|
92
|
+
}
|
93
|
+
function getTestPath(test) {
|
94
|
+
return [...test.storyPath, test.testName, test.browser].filter(types_js_1.isDefined);
|
95
95
|
}
|
96
96
|
function testsToImages(tests) {
|
97
97
|
return new Set([].concat(...tests
|
@@ -144,6 +144,7 @@ function tryToLoadTestsData(filename) {
|
|
144
144
|
}
|
145
145
|
const [nodeVersion] = process.versions.node.split('.').map(Number);
|
146
146
|
async function loadThroughTSX(callback) {
|
147
|
+
// TODO Check if it work in node18 and type: 'module'
|
147
148
|
const unregister = nodeVersion > 18 ? (0, api_1.register)() : (0, api_2.register)();
|
148
149
|
const result = await callback((modulePath) => nodeVersion > 18
|
149
150
|
? import(modulePath)
|
package/dist/server/utils.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/server/utils.ts"],"names":[],"mappings":";;;;;;
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/server/utils.ts"],"names":[],"mappings":"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"}
|
@@ -0,0 +1,19 @@
|
|
1
|
+
import Logger from 'loglevel';
|
2
|
+
import { Args } from '@storybook/csf';
|
3
|
+
import { StoryInput, BaseCreeveyTestContext, CreeveyTestContext, StoriesRaw, CreeveyWebdriver } from '../types.js';
|
4
|
+
export declare const storybookRootID = "storybook-root";
|
5
|
+
export declare const LOCALHOST_REGEXP: RegExp;
|
6
|
+
export declare function resolveStorybookUrl(storybookUrl: string, checkUrl: (url: string) => Promise<boolean>, logger?: Logger.Logger): Promise<string>;
|
7
|
+
export declare function appendIframePath(url: string): string;
|
8
|
+
export declare function getAddresses(): string[];
|
9
|
+
export declare abstract class CreeveyWebdriverBase implements CreeveyWebdriver {
|
10
|
+
protected abstract takeScreenshot(captureElement: string | null, ignoreElements?: string | string[] | null): Promise<Buffer>;
|
11
|
+
protected abstract waitForComplete(callback: (isCompleted: boolean) => void): void;
|
12
|
+
protected abstract selectStory(id: string, waitForReady?: boolean): Promise<boolean>;
|
13
|
+
protected abstract updateStoryArgs(story: StoryInput, updatedArgs: Args): Promise<void>;
|
14
|
+
abstract getSessionId(): Promise<string>;
|
15
|
+
abstract openBrowser(fresh?: boolean): Promise<CreeveyWebdriver | null>;
|
16
|
+
abstract closeBrowser(): Promise<void>;
|
17
|
+
abstract loadStoriesFromBrowser(): Promise<StoriesRaw>;
|
18
|
+
switchStory(story: StoryInput, context: BaseCreeveyTestContext, logger: Logger.Logger): Promise<CreeveyTestContext>;
|
19
|
+
}
|
@@ -0,0 +1,79 @@
|
|
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.CreeveyWebdriverBase = exports.LOCALHOST_REGEXP = exports.storybookRootID = void 0;
|
7
|
+
exports.resolveStorybookUrl = resolveStorybookUrl;
|
8
|
+
exports.appendIframePath = appendIframePath;
|
9
|
+
exports.getAddresses = getAddresses;
|
10
|
+
const chalk_1 = __importDefault(require("chalk"));
|
11
|
+
const os_1 = require("os");
|
12
|
+
const logger_js_1 = require("./logger.js");
|
13
|
+
const types_js_1 = require("../types.js");
|
14
|
+
const messages_js_1 = require("./messages.js");
|
15
|
+
exports.storybookRootID = 'storybook-root';
|
16
|
+
exports.LOCALHOST_REGEXP = /(localhost|127\.0\.0\.1)/i;
|
17
|
+
const DOCKER_INTERNAL = 'host.docker.internal';
|
18
|
+
async function resolveStorybookUrl(storybookUrl, checkUrl, logger = logger_js_1.logger) {
|
19
|
+
logger.debug('Resolving storybook url');
|
20
|
+
const addresses = getAddresses();
|
21
|
+
for (const ip of addresses) {
|
22
|
+
const resolvedUrl = storybookUrl.replace(exports.LOCALHOST_REGEXP, ip);
|
23
|
+
logger.debug(`Checking storybook availability on ${chalk_1.default.magenta(resolvedUrl)}`);
|
24
|
+
if (await checkUrl(resolvedUrl)) {
|
25
|
+
logger.debug(`Resolved storybook url ${chalk_1.default.magenta(resolvedUrl)}`);
|
26
|
+
return resolvedUrl;
|
27
|
+
}
|
28
|
+
}
|
29
|
+
const error = new Error('Please specify `storybookUrl` with IP address that accessible from remote browser');
|
30
|
+
error.name = 'ResolveUrlError';
|
31
|
+
throw error;
|
32
|
+
}
|
33
|
+
function appendIframePath(url) {
|
34
|
+
return `${url.replace(/\/$/, '')}/iframe.html`;
|
35
|
+
}
|
36
|
+
function getAddresses() {
|
37
|
+
// TODO Check if docker is used
|
38
|
+
return [DOCKER_INTERNAL].concat(...Object.values((0, os_1.networkInterfaces)())
|
39
|
+
.filter(types_js_1.isDefined)
|
40
|
+
.map((network) => network.filter((info) => info.family == 'IPv4').map((info) => info.address)));
|
41
|
+
}
|
42
|
+
class CreeveyWebdriverBase {
|
43
|
+
async switchStory(story, context, logger) {
|
44
|
+
const { id, title, name, parameters } = story;
|
45
|
+
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)}`);
|
47
|
+
let storyPlayResolver;
|
48
|
+
let waitForComplete = new Promise((resolve) => (storyPlayResolver = resolve));
|
49
|
+
const unsubscribe = (0, messages_js_1.subscribeOn)('stories', (message) => {
|
50
|
+
if (message.type != 'capture')
|
51
|
+
return;
|
52
|
+
const { payload = {}, payload: { imageName } = {} } = message;
|
53
|
+
void this.takeScreenshot(payload.captureElement ?? captureElement, payload.ignoreElements ?? ignoreElements).then((screenshot) => {
|
54
|
+
context.screenshots.push({ imageName, screenshot });
|
55
|
+
this.waitForComplete(storyPlayResolver);
|
56
|
+
(0, messages_js_1.emitStoriesMessage)({ type: 'capture' });
|
57
|
+
});
|
58
|
+
});
|
59
|
+
const isCaptureCalled = await this.selectStory(id, waitForReady);
|
60
|
+
if (isCaptureCalled) {
|
61
|
+
logger.debug(`Capturing screenshots from ${chalk_1.default.magenta(id)} story's \`play()\` function`);
|
62
|
+
while (!(await waitForComplete)) {
|
63
|
+
waitForComplete = new Promise((resolve) => (storyPlayResolver = resolve));
|
64
|
+
}
|
65
|
+
}
|
66
|
+
unsubscribe();
|
67
|
+
if (isCaptureCalled)
|
68
|
+
logger.debug(`Story ${chalk_1.default.magenta(id)} completed capturing`);
|
69
|
+
else
|
70
|
+
logger.debug(`Story ${chalk_1.default.magenta(id)} ready for capturing`);
|
71
|
+
return Object.assign({
|
72
|
+
takeScreenshot: () => this.takeScreenshot(captureElement, ignoreElements),
|
73
|
+
updateStoryArgs: (updatedArgs) => this.updateStoryArgs(story, updatedArgs),
|
74
|
+
captureElement,
|
75
|
+
}, context);
|
76
|
+
}
|
77
|
+
}
|
78
|
+
exports.CreeveyWebdriverBase = CreeveyWebdriverBase;
|
79
|
+
//# sourceMappingURL=webdriver.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"webdriver.js","sourceRoot":"","sources":["../../src/server/webdriver.ts"],"names":[],"mappings":"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"}
|
@@ -1,5 +1,2 @@
|
|
1
|
-
import
|
2
|
-
export default function (
|
3
|
-
expected: Buffer | null;
|
4
|
-
onCompare: (actual: Buffer, expect?: Buffer, diff?: Buffer) => Promise<void>;
|
5
|
-
} | Buffer | null>, diffOptions: DiffOptions): ({ Assertion }: Chai.ChaiStatic, utils: Chai.ChaiUtils) => void;
|
1
|
+
import Logger from 'loglevel';
|
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;
|