@applitools/core 1.2.6 → 1.2.8
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/automation/locate.js +2 -2
- package/dist/automation/utils/take-screenshot.js +1 -0
- package/dist/check.js +9 -8
- package/dist/classic/check-and-close.js +14 -5
- package/dist/classic/check.js +10 -5
- package/dist/classic/extract-text.js +2 -2
- package/dist/classic/locate-text.js +2 -2
- package/dist/core.js +4 -4
- package/dist/extract-text.js +13 -3
- package/dist/locate-text.js +2 -0
- package/package.json +13 -13
- package/types/automation/locate.d.ts +2 -2
- package/types/automation/utils/take-screenshot.d.ts +4 -1
- package/types/core.d.ts +2 -2
- package/types/types.d.ts +4 -4
- package/dist/classic/utils/transform-check-settings.js +0 -68
- package/types/classic/utils/transform-check-settings.d.ts +0 -11
|
@@ -6,8 +6,8 @@ const take_screenshot_1 = require("./utils/take-screenshot");
|
|
|
6
6
|
function makeLocate({ spec, core, target: defaultTarget, logger: defaultLogger, }) {
|
|
7
7
|
return async function locate({ target = defaultTarget, settings, logger = defaultLogger, } = {}) {
|
|
8
8
|
logger.log('Command "locate" is called with settings', settings);
|
|
9
|
-
if (!spec.isDriver(target)) {
|
|
10
|
-
return core.locate({ target, settings: settings, logger });
|
|
9
|
+
if (!(spec === null || spec === void 0 ? void 0 : spec.isDriver(target))) {
|
|
10
|
+
return core.locate({ target: target, settings: settings, logger });
|
|
11
11
|
}
|
|
12
12
|
// TODO driver custom config
|
|
13
13
|
const driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger });
|
package/dist/check.js
CHANGED
|
@@ -31,8 +31,8 @@ const utils = __importStar(require("@applitools/utils"));
|
|
|
31
31
|
const chalk_1 = __importDefault(require("chalk"));
|
|
32
32
|
function makeCheck({ eyes, logger: defaultLogger, }) {
|
|
33
33
|
return async function check({ target, settings = {}, config, logger = defaultLogger, } = {}) {
|
|
34
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
|
|
35
|
-
var
|
|
34
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
|
|
35
|
+
var _s, _t, _u, _v;
|
|
36
36
|
settings = { ...config === null || config === void 0 ? void 0 : config.screenshot, ...config === null || config === void 0 ? void 0 : config.check, ...settings };
|
|
37
37
|
(_a = settings.fully) !== null && _a !== void 0 ? _a : (settings.fully = !settings.region && (!settings.frames || settings.frames.length === 0));
|
|
38
38
|
(_b = settings.waitBeforeCapture) !== null && _b !== void 0 ? _b : (settings.waitBeforeCapture = 100);
|
|
@@ -43,15 +43,16 @@ function makeCheck({ eyes, logger: defaultLogger, }) {
|
|
|
43
43
|
(_g = settings.matchLevel) !== null && _g !== void 0 ? _g : (settings.matchLevel = 'Strict');
|
|
44
44
|
(_h = settings.ignoreCaret) !== null && _h !== void 0 ? _h : (settings.ignoreCaret = true);
|
|
45
45
|
(_j = settings.sendDom) !== null && _j !== void 0 ? _j : (settings.sendDom = eyes.test.account.rcaEnabled || settings.matchLevel === 'Layout' || settings.enablePatterns || settings.useDom);
|
|
46
|
-
(_k = settings.
|
|
47
|
-
(_l =
|
|
46
|
+
(_k = settings.autProxy) !== null && _k !== void 0 ? _k : (settings.autProxy = eyes.test.server.proxy);
|
|
47
|
+
(_l = settings.useDom) !== null && _l !== void 0 ? _l : (settings.useDom = false);
|
|
48
|
+
(_m = (_s = settings).retryTimeout) !== null && _m !== void 0 ? _m : (_s.retryTimeout = 2000);
|
|
48
49
|
settings.lazyLoad = settings.lazyLoad === true ? {} : settings.lazyLoad;
|
|
49
50
|
if (settings.lazyLoad) {
|
|
50
|
-
(
|
|
51
|
-
(
|
|
52
|
-
(
|
|
51
|
+
(_o = (_t = settings.lazyLoad).scrollLength) !== null && _o !== void 0 ? _o : (_t.scrollLength = 300);
|
|
52
|
+
(_p = (_u = settings.lazyLoad).waitingTime) !== null && _p !== void 0 ? _p : (_u.waitingTime = 2000);
|
|
53
|
+
(_q = (_v = settings.lazyLoad).maxAmountToScroll) !== null && _q !== void 0 ? _q : (_v.maxAmountToScroll = 15000);
|
|
53
54
|
}
|
|
54
|
-
(
|
|
55
|
+
(_r = settings.waitBetweenStitches) !== null && _r !== void 0 ? _r : (settings.waitBetweenStitches = utils.types.isObject(settings.lazyLoad) ? settings.lazyLoad.waitingTime : 100);
|
|
55
56
|
if (settings.matchLevel === 'Content') {
|
|
56
57
|
logger.console.log(chalk_1.default.yellow(`The "Content" match level value has been deprecated, use "IgnoreColors" instead.`));
|
|
57
58
|
}
|
|
@@ -27,20 +27,29 @@ exports.makeCheckAndClose = void 0;
|
|
|
27
27
|
const driver_1 = require("@applitools/driver");
|
|
28
28
|
const take_screenshot_1 = require("../automation/utils/take-screenshot");
|
|
29
29
|
const take_dom_capture_1 = require("./utils/take-dom-capture");
|
|
30
|
-
const
|
|
30
|
+
const to_base_check_settings_1 = require("../utils/to-base-check-settings");
|
|
31
31
|
const wait_for_lazy_load_1 = require("../utils/wait-for-lazy-load");
|
|
32
32
|
const utils = __importStar(require("@applitools/utils"));
|
|
33
33
|
function makeCheckAndClose({ spec, eyes, target: defaultTarget, logger: defaultLogger, }) {
|
|
34
34
|
return async function checkAndClose({ target = defaultTarget, settings, logger = defaultLogger, } = {}) {
|
|
35
35
|
logger.log('Command "checkAndClose" is called with settings', settings);
|
|
36
|
-
if (!spec.isDriver(target)) {
|
|
37
|
-
return eyes.checkAndClose({
|
|
36
|
+
if (!(spec === null || spec === void 0 ? void 0 : spec.isDriver(target))) {
|
|
37
|
+
return eyes.checkAndClose({
|
|
38
|
+
target: target,
|
|
39
|
+
settings: settings,
|
|
40
|
+
logger,
|
|
41
|
+
});
|
|
38
42
|
}
|
|
39
43
|
// TODO driver custom config
|
|
40
44
|
const driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger });
|
|
41
45
|
if (settings.lazyLoad)
|
|
42
46
|
await (0, wait_for_lazy_load_1.waitForLazyLoad)({ driver, settings: settings.lazyLoad !== true ? settings.lazyLoad : {}, logger });
|
|
43
|
-
const
|
|
47
|
+
const { elementReferencesToCalculate, getBaseCheckSettings } = (0, to_base_check_settings_1.toBaseCheckSettings)({ settings });
|
|
48
|
+
const screenshot = await (0, take_screenshot_1.takeScreenshot)({
|
|
49
|
+
driver,
|
|
50
|
+
settings: { ...settings, regionsToCalculate: elementReferencesToCalculate },
|
|
51
|
+
logger,
|
|
52
|
+
});
|
|
44
53
|
const baseTarget = {
|
|
45
54
|
name: await driver.getTitle(),
|
|
46
55
|
source: await driver.getUrl(),
|
|
@@ -48,7 +57,7 @@ function makeCheckAndClose({ spec, eyes, target: defaultTarget, logger: defaultL
|
|
|
48
57
|
locationInViewport: utils.geometry.location(screenshot.region),
|
|
49
58
|
isTransformed: true,
|
|
50
59
|
};
|
|
51
|
-
const baseSettings =
|
|
60
|
+
const baseSettings = getBaseCheckSettings({ calculatedRegions: screenshot.calculatedRegions });
|
|
52
61
|
if (driver.isWeb && settings.sendDom) {
|
|
53
62
|
if (settings.fully)
|
|
54
63
|
await screenshot.scrollingElement.setAttribute('data-applitools-scroll', 'true');
|
package/dist/classic/check.js
CHANGED
|
@@ -27,15 +27,15 @@ exports.makeCheck = void 0;
|
|
|
27
27
|
const driver_1 = require("@applitools/driver");
|
|
28
28
|
const take_screenshot_1 = require("../automation/utils/take-screenshot");
|
|
29
29
|
const take_dom_capture_1 = require("./utils/take-dom-capture");
|
|
30
|
-
const
|
|
30
|
+
const to_base_check_settings_1 = require("../utils/to-base-check-settings");
|
|
31
31
|
const wait_for_lazy_load_1 = require("../utils/wait-for-lazy-load");
|
|
32
32
|
const utils = __importStar(require("@applitools/utils"));
|
|
33
33
|
function makeCheck({ spec, eyes, target: defaultTarget, logger: defaultLogger, }) {
|
|
34
34
|
return async function check({ target = defaultTarget, settings = {}, logger = defaultLogger, } = {}) {
|
|
35
35
|
var _a;
|
|
36
36
|
logger.log('Command "check" is called with settings', settings);
|
|
37
|
-
if (!spec.isDriver(target)) {
|
|
38
|
-
return eyes.check({ target, settings: settings, logger });
|
|
37
|
+
if (!(spec === null || spec === void 0 ? void 0 : spec.isDriver(target))) {
|
|
38
|
+
return eyes.check({ target: target, settings: settings, logger });
|
|
39
39
|
}
|
|
40
40
|
// TODO driver custom config
|
|
41
41
|
const driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger });
|
|
@@ -48,8 +48,13 @@ function makeCheck({ spec, eyes, target: defaultTarget, logger: defaultLogger, }
|
|
|
48
48
|
let baseTarget;
|
|
49
49
|
let baseSettings;
|
|
50
50
|
let results;
|
|
51
|
+
const { elementReferencesToCalculate, getBaseCheckSettings } = (0, to_base_check_settings_1.toBaseCheckSettings)({ settings });
|
|
51
52
|
do {
|
|
52
|
-
const screenshot = await (0, take_screenshot_1.takeScreenshot)({
|
|
53
|
+
const screenshot = await (0, take_screenshot_1.takeScreenshot)({
|
|
54
|
+
driver,
|
|
55
|
+
settings: { ...settings, regionsToCalculate: elementReferencesToCalculate },
|
|
56
|
+
logger,
|
|
57
|
+
});
|
|
53
58
|
baseTarget = {
|
|
54
59
|
name: await driver.getTitle(),
|
|
55
60
|
source: await driver.getUrl(),
|
|
@@ -57,7 +62,7 @@ function makeCheck({ spec, eyes, target: defaultTarget, logger: defaultLogger, }
|
|
|
57
62
|
locationInViewport: utils.geometry.location(screenshot.region),
|
|
58
63
|
isTransformed: true,
|
|
59
64
|
};
|
|
60
|
-
baseSettings =
|
|
65
|
+
baseSettings = getBaseCheckSettings({ calculatedRegions: screenshot.calculatedRegions });
|
|
61
66
|
if (driver.isWeb && settings.sendDom) {
|
|
62
67
|
if (settings.fully)
|
|
63
68
|
await screenshot.scrollingElement.setAttribute('data-applitools-scroll', 'true');
|
|
@@ -32,8 +32,8 @@ const snippets_1 = require("@applitools/snippets");
|
|
|
32
32
|
function makeExtractText({ spec, eyes, target: defaultTarget, logger: defaultLogger, }) {
|
|
33
33
|
return async function extractText({ target = defaultTarget, settings, logger = defaultLogger, } = {}) {
|
|
34
34
|
logger.log('Command "extractText" is called with settings', settings);
|
|
35
|
-
if (!spec.isDriver(target)) {
|
|
36
|
-
return eyes.extractText({ target, settings: settings, logger });
|
|
35
|
+
if (!(spec === null || spec === void 0 ? void 0 : spec.isDriver(target))) {
|
|
36
|
+
return eyes.extractText({ target: target, settings: settings, logger });
|
|
37
37
|
}
|
|
38
38
|
settings = utils.types.isArray(settings) ? settings : [settings];
|
|
39
39
|
// TODO driver custom config
|
|
@@ -31,8 +31,8 @@ const utils = __importStar(require("@applitools/utils"));
|
|
|
31
31
|
function makeLocateText({ spec, eyes, target: defaultTarget, logger: defaultLogger, }) {
|
|
32
32
|
return async function locateText({ target = defaultTarget, settings, logger = defaultLogger, } = {}) {
|
|
33
33
|
logger.log('Command "locateText" is called with settings', settings);
|
|
34
|
-
if (!spec.isDriver(target)) {
|
|
35
|
-
return eyes.locateText({ target, settings: settings, logger });
|
|
34
|
+
if (!(spec === null || spec === void 0 ? void 0 : spec.isDriver(target))) {
|
|
35
|
+
return eyes.locateText({ target: target, settings: settings, logger });
|
|
36
36
|
}
|
|
37
37
|
// TODO driver custom config
|
|
38
38
|
const driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger });
|
package/dist/core.js
CHANGED
|
@@ -34,15 +34,15 @@ const make_manager_1 = require("./make-manager");
|
|
|
34
34
|
const close_batch_1 = require("./close-batch");
|
|
35
35
|
const delete_test_1 = require("./delete-test");
|
|
36
36
|
const utils = __importStar(require("@applitools/utils"));
|
|
37
|
-
function makeCore({ spec, concurrency, core, agentId = 'core', cwd = process.cwd(), logger, }) {
|
|
37
|
+
function makeCore({ spec, concurrency, core, agentId = 'core', cwd = process.cwd(), logger, } = {}) {
|
|
38
38
|
var _a;
|
|
39
39
|
logger = (_a = logger === null || logger === void 0 ? void 0 : logger.extend({ label: 'core' })) !== null && _a !== void 0 ? _a : (0, logger_1.makeLogger)({ label: 'core' });
|
|
40
40
|
logger.log(`Core is initialized ${core ? 'with' : 'without'} custom base core`);
|
|
41
41
|
core !== null && core !== void 0 ? core : (core = (0, core_base_1.makeCore)({ agentId, cwd, logger }));
|
|
42
42
|
return utils.general.extend(core, {
|
|
43
|
-
isDriver: spec.isDriver,
|
|
44
|
-
isElement: spec.isElement,
|
|
45
|
-
isSelector: spec.isSelector,
|
|
43
|
+
isDriver: spec === null || spec === void 0 ? void 0 : spec.isDriver,
|
|
44
|
+
isElement: spec === null || spec === void 0 ? void 0 : spec.isElement,
|
|
45
|
+
isSelector: spec === null || spec === void 0 ? void 0 : spec.isSelector,
|
|
46
46
|
getViewportSize: (0, get_viewport_size_1.makeGetViewportSize)({ spec, logger }),
|
|
47
47
|
setViewportSize: (0, set_viewport_size_1.makeSetViewportSize)({ spec, logger }),
|
|
48
48
|
locate: (0, locate_1.makeLocate)({ spec, core, logger }),
|
package/dist/extract-text.js
CHANGED
|
@@ -27,9 +27,19 @@ exports.makeExtractText = void 0;
|
|
|
27
27
|
const utils = __importStar(require("@applitools/utils"));
|
|
28
28
|
function makeExtractText({ eyes, logger: defaultLogger, }) {
|
|
29
29
|
return async function extractText({ target, settings, config, logger = defaultLogger, }) {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
30
|
+
var _a;
|
|
31
|
+
if (utils.types.isArray(settings)) {
|
|
32
|
+
settings = settings.map(settings => {
|
|
33
|
+
var _a;
|
|
34
|
+
settings = { ...config === null || config === void 0 ? void 0 : config.screenshot, ...settings };
|
|
35
|
+
(_a = settings.autProxy) !== null && _a !== void 0 ? _a : (settings.autProxy = eyes.test.server.proxy);
|
|
36
|
+
return settings;
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
settings = { ...config === null || config === void 0 ? void 0 : config.screenshot, ...settings };
|
|
41
|
+
(_a = settings.autProxy) !== null && _a !== void 0 ? _a : (settings.autProxy = eyes.test.server.proxy);
|
|
42
|
+
}
|
|
33
43
|
const results = await eyes.extractText({ target: target, settings, logger });
|
|
34
44
|
return results;
|
|
35
45
|
};
|
package/dist/locate-text.js
CHANGED
|
@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.makeLocateText = void 0;
|
|
4
4
|
function makeLocateText({ eyes, logger: defaultLogger, }) {
|
|
5
5
|
return async function locateText({ target, settings, config, logger = defaultLogger, }) {
|
|
6
|
+
var _a;
|
|
6
7
|
settings = { ...config === null || config === void 0 ? void 0 : config.screenshot, ...settings };
|
|
8
|
+
(_a = settings.autProxy) !== null && _a !== void 0 ? _a : (settings.autProxy = eyes.test.server.proxy);
|
|
7
9
|
const results = await eyes.locateText({ target: target, settings, logger });
|
|
8
10
|
return results;
|
|
9
11
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@applitools/core",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.8",
|
|
4
4
|
"homepage": "https://applitools.com",
|
|
5
5
|
"bugs": {
|
|
6
6
|
"url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
|
|
@@ -61,27 +61,27 @@
|
|
|
61
61
|
}
|
|
62
62
|
},
|
|
63
63
|
"dependencies": {
|
|
64
|
-
"@applitools/core-base": "1.1.
|
|
64
|
+
"@applitools/core-base": "1.1.9",
|
|
65
65
|
"@applitools/dom-capture": "11.2.0",
|
|
66
66
|
"@applitools/dom-snapshot": "4.7.0",
|
|
67
|
-
"@applitools/driver": "1.11.
|
|
68
|
-
"@applitools/logger": "1.1.
|
|
69
|
-
"@applitools/nml-client": "1.3.
|
|
70
|
-
"@applitools/req": "1.1.
|
|
71
|
-
"@applitools/screenshoter": "3.7.
|
|
67
|
+
"@applitools/driver": "1.11.3",
|
|
68
|
+
"@applitools/logger": "1.1.28",
|
|
69
|
+
"@applitools/nml-client": "1.3.7",
|
|
70
|
+
"@applitools/req": "1.1.13",
|
|
71
|
+
"@applitools/screenshoter": "3.7.4",
|
|
72
72
|
"@applitools/snippets": "2.4.6",
|
|
73
|
-
"@applitools/ufg-client": "1.1.
|
|
74
|
-
"@applitools/utils": "1.3.
|
|
73
|
+
"@applitools/ufg-client": "1.1.3",
|
|
74
|
+
"@applitools/utils": "1.3.14",
|
|
75
75
|
"abort-controller": "3.0.0",
|
|
76
76
|
"throat": "6.0.1"
|
|
77
77
|
},
|
|
78
78
|
"devDependencies": {
|
|
79
79
|
"@applitools/bongo": "^2.2.0",
|
|
80
80
|
"@applitools/sdk-fake-eyes-server": "^2.1.3",
|
|
81
|
-
"@applitools/spec-driver-puppeteer": "^1.1.
|
|
82
|
-
"@applitools/spec-driver-selenium": "^1.5.
|
|
83
|
-
"@applitools/spec-driver-webdriverio": "^1.4.
|
|
84
|
-
"@applitools/test-server": "^1.1.
|
|
81
|
+
"@applitools/spec-driver-puppeteer": "^1.1.20",
|
|
82
|
+
"@applitools/spec-driver-selenium": "^1.5.6",
|
|
83
|
+
"@applitools/spec-driver-webdriverio": "^1.4.4",
|
|
84
|
+
"@applitools/test-server": "^1.1.9",
|
|
85
85
|
"@applitools/test-utils": "^1.5.2",
|
|
86
86
|
"@types/mocha": "^9.1.1",
|
|
87
87
|
"@types/node": "12",
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Target, LocateSettings, LocateResult } from './types';
|
|
2
|
-
import type { Core as BaseCore } from '@applitools/core-base';
|
|
2
|
+
import type { Core as BaseCore, Target as BaseTarget } from '@applitools/core-base';
|
|
3
3
|
import { type Logger } from '@applitools/logger';
|
|
4
4
|
import { type SpecDriver } from '@applitools/driver';
|
|
5
5
|
declare type Options<TDriver, TContext, TElement, TSelector> = {
|
|
@@ -9,7 +9,7 @@ declare type Options<TDriver, TContext, TElement, TSelector> = {
|
|
|
9
9
|
logger?: Logger;
|
|
10
10
|
};
|
|
11
11
|
export declare function makeLocate<TDriver, TContext, TElement, TSelector>({ spec, core, target: defaultTarget, logger: defaultLogger, }: Options<TDriver, TContext, TElement, TSelector>): <TLocator extends string>({ target, settings, logger, }?: {
|
|
12
|
-
target?: Target<TDriver
|
|
12
|
+
target?: Target<TDriver> | BaseTarget;
|
|
13
13
|
settings?: LocateSettings<TLocator, TElement, TSelector>;
|
|
14
14
|
logger?: Logger;
|
|
15
15
|
}) => Promise<LocateResult<TLocator>>;
|
|
@@ -8,9 +8,12 @@ export declare type Screenshot = {
|
|
|
8
8
|
element: Element<unknown, unknown, unknown, unknown>;
|
|
9
9
|
scrollingElement: Element<unknown, unknown, unknown, unknown>;
|
|
10
10
|
restoreState(): Promise<void>;
|
|
11
|
+
calculatedRegions: [];
|
|
11
12
|
};
|
|
12
13
|
export declare function takeScreenshot<TDriver, TContext, TElement, TSelector>({ driver, settings, logger, }: {
|
|
13
14
|
driver: Driver<TDriver, TContext, TElement, TSelector>;
|
|
14
|
-
settings: ScreenshotSettings<TElement, TSelector
|
|
15
|
+
settings: ScreenshotSettings<TElement, TSelector> & {
|
|
16
|
+
regionsToCalculate?: any[];
|
|
17
|
+
};
|
|
15
18
|
logger: Logger;
|
|
16
19
|
}): Promise<Screenshot>;
|
package/types/core.d.ts
CHANGED
|
@@ -3,12 +3,12 @@ import type { Core as BaseCore } from '@applitools/core-base';
|
|
|
3
3
|
import { type SpecDriver } from '@applitools/driver';
|
|
4
4
|
import { type Logger } from '@applitools/logger';
|
|
5
5
|
declare type Options<TDriver, TContext, TElement, TSelector> = {
|
|
6
|
-
spec
|
|
6
|
+
spec?: SpecDriver<TDriver, TContext, TElement, TSelector>;
|
|
7
7
|
concurrency?: number;
|
|
8
8
|
core?: BaseCore;
|
|
9
9
|
agentId?: string;
|
|
10
10
|
cwd?: string;
|
|
11
11
|
logger?: Logger;
|
|
12
12
|
};
|
|
13
|
-
export declare function makeCore<TDriver, TContext, TElement, TSelector>({ spec, concurrency, core, agentId, cwd, logger, }
|
|
13
|
+
export declare function makeCore<TDriver, TContext, TElement, TSelector>({ spec, concurrency, core, agentId, cwd, logger, }?: Options<TDriver, TContext, TElement, TSelector>): Core<TDriver, TElement, TSelector>;
|
|
14
14
|
export {};
|
package/types/types.d.ts
CHANGED
|
@@ -42,13 +42,13 @@ export interface EyesManager<TDriver, TElement, TSelector, TType extends 'classi
|
|
|
42
42
|
}) => Promise<TestResultSummary<TType>>;
|
|
43
43
|
}
|
|
44
44
|
export interface ClassicEyes<TDriver, TElement, TSelector, TTarget = Target<TDriver, 'classic'>> extends ClassicCore.Eyes<TDriver, TElement, TSelector, TTarget> {
|
|
45
|
-
check(options
|
|
45
|
+
check(options?: {
|
|
46
46
|
target?: TTarget;
|
|
47
47
|
settings?: Partial<CheckSettings<TElement, TSelector, 'classic'>>;
|
|
48
48
|
config?: Config<TElement, TSelector, 'classic'>;
|
|
49
49
|
logger?: Logger;
|
|
50
50
|
}): Promise<CheckResult<'classic'>[]>;
|
|
51
|
-
checkAndClose(options
|
|
51
|
+
checkAndClose(options?: {
|
|
52
52
|
target?: TTarget;
|
|
53
53
|
settings?: Partial<CheckSettings<TElement, TSelector, 'classic'> & CloseSettings<'classic'>>;
|
|
54
54
|
config?: Config<TElement, TSelector, 'classic'>;
|
|
@@ -73,13 +73,13 @@ export interface ClassicEyes<TDriver, TElement, TSelector, TTarget = Target<TDri
|
|
|
73
73
|
}): Promise<TestResult<'classic'>[]>;
|
|
74
74
|
}
|
|
75
75
|
export interface UFGEyes<TDriver, TElement, TSelector, TTarget = Target<TDriver, 'ufg'>> extends UFGCore.Eyes<TDriver, TElement, TSelector, TTarget> {
|
|
76
|
-
check(options
|
|
76
|
+
check(options?: {
|
|
77
77
|
target?: TTarget;
|
|
78
78
|
settings?: Partial<CheckSettings<TElement, TSelector, 'ufg'>>;
|
|
79
79
|
config?: Config<TElement, TSelector, 'ufg'>;
|
|
80
80
|
logger?: Logger;
|
|
81
81
|
}): Promise<CheckResult<'ufg'>[]>;
|
|
82
|
-
checkAndClose(options
|
|
82
|
+
checkAndClose(options?: {
|
|
83
83
|
target?: TTarget;
|
|
84
84
|
settings?: Partial<CheckSettings<TElement, TSelector, 'ufg'> & CloseSettings<'ufg'>>;
|
|
85
85
|
config?: Config<TElement, TSelector, 'ufg'>;
|
|
@@ -1,68 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.transformCheckSettings = void 0;
|
|
27
|
-
const utils = __importStar(require("@applitools/utils"));
|
|
28
|
-
async function transformCheckSettings({ context, settings, screenshot, logger: _logger, }) {
|
|
29
|
-
return {
|
|
30
|
-
...settings,
|
|
31
|
-
region: undefined,
|
|
32
|
-
normalization: undefined,
|
|
33
|
-
ignoreRegions: await transformRegions({ regions: settings.ignoreRegions }),
|
|
34
|
-
layoutRegions: await transformRegions({ regions: settings.layoutRegions }),
|
|
35
|
-
contentRegions: await transformRegions({ regions: settings.contentRegions }),
|
|
36
|
-
strictRegions: await transformRegions({ regions: settings.strictRegions }),
|
|
37
|
-
floatingRegions: await transformRegions({ regions: settings.floatingRegions }),
|
|
38
|
-
accessibilityRegions: await transformRegions({ regions: settings.accessibilityRegions }),
|
|
39
|
-
};
|
|
40
|
-
async function transformRegions({ regions = [], }) {
|
|
41
|
-
var _a;
|
|
42
|
-
const transformedRegions = [];
|
|
43
|
-
for (const region of regions) {
|
|
44
|
-
const { region: reference, ...options } = utils.types.has(region, 'region') ? region : { region };
|
|
45
|
-
if (utils.types.has(reference, ['x', 'y', 'width', 'height'])) {
|
|
46
|
-
transformedRegions.push(region);
|
|
47
|
-
}
|
|
48
|
-
else {
|
|
49
|
-
const elements = await context.elements(reference);
|
|
50
|
-
if (elements.length === 0)
|
|
51
|
-
continue;
|
|
52
|
-
const contextLocationInViewport = await elements[0].context.getLocationInViewport();
|
|
53
|
-
for (const element of elements) {
|
|
54
|
-
const elementRegionInViewport = utils.geometry.offset(await element.getRegion(), contextLocationInViewport);
|
|
55
|
-
const elementRegionInTarget = utils.geometry.offsetNegative(elementRegionInViewport, utils.geometry.location(screenshot.region));
|
|
56
|
-
const elementRegionIScaled = utils.geometry.scale(elementRegionInTarget, context.driver.viewportScale);
|
|
57
|
-
transformedRegions.push({
|
|
58
|
-
region: elementRegionIScaled,
|
|
59
|
-
regionId: utils.types.isString(element.commonSelector) ? element.commonSelector : (_a = element.commonSelector) === null || _a === void 0 ? void 0 : _a.selector,
|
|
60
|
-
...options,
|
|
61
|
-
});
|
|
62
|
-
}
|
|
63
|
-
}
|
|
64
|
-
}
|
|
65
|
-
return transformedRegions;
|
|
66
|
-
}
|
|
67
|
-
}
|
|
68
|
-
exports.transformCheckSettings = transformCheckSettings;
|
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
import type { CheckSettings } from '../types';
|
|
2
|
-
import type { CheckSettings as BaseCheckSettings } from '@applitools/core-base';
|
|
3
|
-
import { type Logger } from '@applitools/logger';
|
|
4
|
-
import { type Context } from '@applitools/driver';
|
|
5
|
-
import { type Screenshot } from '../../automation/utils/take-screenshot';
|
|
6
|
-
export declare function transformCheckSettings<TDriver, TContext, TElement, TSelector>({ context, settings, screenshot, logger, }: {
|
|
7
|
-
context: Context<TDriver, TContext, TElement, TSelector>;
|
|
8
|
-
settings: CheckSettings<TElement, TSelector>;
|
|
9
|
-
screenshot: Screenshot;
|
|
10
|
-
logger: Logger;
|
|
11
|
-
}): Promise<BaseCheckSettings>;
|