@applitools/core 2.4.7 → 2.4.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/CHANGELOG.md CHANGED
@@ -2,6 +2,13 @@
2
2
 
3
3
  ## Unreleased
4
4
 
5
+ ## 2.4.8 - 2023/4/5
6
+
7
+ ### Features
8
+ ### Bug fixes
9
+ - Fixed screenshot framing
10
+ - Fixed issue with css fetching for dom capture
11
+
5
12
  ## 2.4.7 - 2023/4/4
6
13
 
7
14
  ### Features
@@ -60,7 +60,7 @@ function makeExtractText({ core, spec, logger: defaultLogger }) {
60
60
  await screenshot.scrollingElement.setAttribute('data-applitools-scroll', 'true');
61
61
  else
62
62
  await ((_a = screenshot.element) === null || _a === void 0 ? void 0 : _a.setAttribute('data-applitools-scroll', 'true'));
63
- baseTarget.dom = await (0, take_dom_capture_1.takeDomCapture)({ driver, logger }).catch(() => undefined);
63
+ baseTarget.dom = await (0, take_dom_capture_1.takeDomCapture)({ driver, settings: { proxy: settings.proxy }, logger }).catch(() => undefined);
64
64
  }
65
65
  delete settings.region;
66
66
  delete settings.normalization;
@@ -44,7 +44,7 @@ function makeLocateText({ core, spec, logger: defaultLogger }) {
44
44
  if (environment.isWeb) {
45
45
  // if (settings.fully) await screenshot.scrollingElement.setAttribute('data-applitools-scroll', 'true')
46
46
  // else await screenshot.element?.setAttribute('data-applitools-scroll', 'true')
47
- // baseTarget.dom = await takeDomCapture({driver, logger}).catch(() => null)
47
+ // baseTarget.dom = await takeDomCapture({driver, settings: {proxy: settings.proxy}, logger}).catch(() => null)
48
48
  }
49
49
  const results = await core.base.locateText({
50
50
  target: baseTarget,
@@ -69,7 +69,7 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, logger: defaultL
69
69
  await screenshot.scrollingElement.setAttribute('data-applitools-scroll', 'true');
70
70
  else
71
71
  await ((_a = screenshot.element) === null || _a === void 0 ? void 0 : _a.setAttribute('data-applitools-scroll', 'true'));
72
- baseTarget.dom = await (0, take_dom_capture_1.takeDomCapture)({ driver, logger }).catch(() => undefined);
72
+ baseTarget.dom = await (0, take_dom_capture_1.takeDomCapture)({ driver, settings: { proxy: eyes.test.server.proxy }, logger }).catch(() => undefined);
73
73
  }
74
74
  if (settings.pageId) {
75
75
  const scrollingElement = await driver.mainContext.getScrollingElement();
@@ -78,7 +78,7 @@ function makeCheck({ eyes, target: defaultTarget, spec, logger: defaultLogger, }
78
78
  await screenshot.scrollingElement.setAttribute('data-applitools-scroll', 'true');
79
79
  else
80
80
  await ((_c = screenshot.element) === null || _c === void 0 ? void 0 : _c.setAttribute('data-applitools-scroll', 'true'));
81
- baseTarget.dom = await (0, take_dom_capture_1.takeDomCapture)({ driver, logger }).catch(() => undefined);
81
+ baseTarget.dom = await (0, take_dom_capture_1.takeDomCapture)({ driver, settings: { proxy: eyes.test.server.proxy }, logger }).catch(() => undefined);
82
82
  }
83
83
  if (settings.pageId) {
84
84
  const scrollingElement = await driver.mainContext.getScrollingElement();
@@ -75,10 +75,12 @@ async function takeDomCapture({ driver, settings, logger, }) {
75
75
  limit: 1,
76
76
  validate: ({ response, error }) => !!error || !response.ok,
77
77
  },
78
+ proxy: settings === null || settings === void 0 ? void 0 : settings.proxy,
78
79
  fetch: settings === null || settings === void 0 ? void 0 : settings.fetch,
79
80
  });
80
- logger.log(`Request to download css that was sent to the address "[GET]${url}" respond with ${response.statusText}(${response.status})`, response.ok ? `and css of length ${(await response.clone().text()).length} chars` : '');
81
- return { url, css: response.ok ? encodeJSON(await response.text()) : '' };
81
+ const css = await response.text();
82
+ logger.log(`Request to download css that was sent to the address "[GET]${url}" respond with ${response.statusText}(${response.status})`, response.ok ? `and css of length ${css.length} chars` : '');
83
+ return { url, css: response.ok ? encodeJSON(css) : '' };
82
84
  }
83
85
  catch (error) {
84
86
  logger.error(`Request to download css that was sent to the address "[GET]${url}" failed with error`, error);
@@ -50,8 +50,8 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, signal, logger:
50
50
  });
51
51
  const uniqueRenderers = (0, uniquify_renderers_1.uniquifyRenderers)((_a = settings.renderers) !== null && _a !== void 0 ? _a : []);
52
52
  const ufgClient = await eyes.core.getUFGClient({
53
- config: { ...eyes.test.account, ...eyes.test.account.ufg, proxy: eyes.test.server.proxy },
54
- concurrency: uniqueRenderers.length,
53
+ config: { ...eyes.test.ufgServer },
54
+ concurrency: uniqueRenderers.length || 5,
55
55
  logger,
56
56
  });
57
57
  let snapshots;
package/dist/ufg/check.js CHANGED
@@ -50,7 +50,7 @@ function makeCheck({ eyes, target: defaultTarget, spec, signal, logger: defaultL
50
50
  });
51
51
  const uniqueRenderers = (0, uniquify_renderers_1.uniquifyRenderers)((_a = settings.renderers) !== null && _a !== void 0 ? _a : []);
52
52
  const ufgClient = await eyes.core.getUFGClient({
53
- config: { ...eyes.test.account, ...eyes.test.account.ufg, proxy: eyes.test.server.proxy },
53
+ config: { ...eyes.test.ufgServer },
54
54
  concurrency: uniqueRenderers.length || 5,
55
55
  logger,
56
56
  });
@@ -36,7 +36,7 @@ function makeGetBaseEyes({ settings: defaultSettings, eyes, base, logger: defaul
36
36
  if (!settings)
37
37
  throw new Error('');
38
38
  const ufgClient = await eyes.core.getUFGClient({
39
- config: { ...eyes.test.account, ...eyes.test.account.ufg, proxy: eyes.test.server.proxy },
39
+ config: { ...eyes.test.ufgServer },
40
40
  logger,
41
41
  });
42
42
  const environment = await ufgClient.bookRenderer({ settings });
@@ -63,7 +63,8 @@ function makeOpenEyes({ core, spec, logger: defaultLogger }) {
63
63
  userTestId: settings.userTestId,
64
64
  batchId: (_a = settings.batch) === null || _a === void 0 ? void 0 : _a.id,
65
65
  keepBatchOpen: settings.keepBatchOpen,
66
- server: { serverUrl: settings.serverUrl, apiKey: settings.apiKey, proxy: settings.proxy },
66
+ server: account.server,
67
+ ufgServer: account.ufgServer,
67
68
  account,
68
69
  },
69
70
  get running() {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@applitools/core",
3
- "version": "2.4.7",
3
+ "version": "2.4.8",
4
4
  "homepage": "https://applitools.com",
5
5
  "bugs": {
6
6
  "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -75,19 +75,19 @@
75
75
  ]
76
76
  },
77
77
  "dependencies": {
78
- "@applitools/core-base": "1.1.45",
78
+ "@applitools/core-base": "1.1.46",
79
79
  "@applitools/dom-capture": "11.2.1",
80
- "@applitools/dom-snapshot": "4.7.7",
80
+ "@applitools/dom-snapshot": "4.7.8",
81
81
  "@applitools/driver": "1.11.39",
82
82
  "@applitools/ec-client": "1.2.19",
83
83
  "@applitools/logger": "1.1.48",
84
84
  "@applitools/nml-client": "1.3.44",
85
85
  "@applitools/req": "1.1.33",
86
- "@applitools/screenshoter": "3.7.34",
86
+ "@applitools/screenshoter": "3.7.35",
87
87
  "@applitools/snippets": "2.4.19",
88
88
  "@applitools/socket": "1.0.10",
89
89
  "@applitools/spec-driver-webdriver": "1.0.20",
90
- "@applitools/ufg-client": "1.2.6",
90
+ "@applitools/ufg-client": "1.2.7",
91
91
  "@applitools/utils": "1.3.32",
92
92
  "@types/ws": "8.5.4",
93
93
  "abort-controller": "3.0.0",
@@ -104,7 +104,7 @@
104
104
  "@applitools/spec-driver-selenium": "^1.5.37",
105
105
  "@applitools/spec-driver-webdriverio": "^1.4.35",
106
106
  "@applitools/test-server": "^1.1.28",
107
- "@applitools/test-utils": "^1.5.15",
107
+ "@applitools/test-utils": "^1.5.16",
108
108
  "@types/node": "^12.20.55",
109
109
  "@types/selenium-webdriver": "^4.1.2",
110
110
  "@types/yargs": "^17.0.22",
@@ -1,12 +1,13 @@
1
1
  import { type SpecType, type Driver } from '@applitools/driver';
2
2
  import { type Logger } from '@applitools/logger';
3
- import { type Fetch } from '@applitools/req';
3
+ import { type Fetch, type Proxy } from '@applitools/req';
4
4
  export type DomCaptureSettings = {
5
- fetch?: Fetch;
6
- fetchTimeout?: number;
7
5
  executionTimeout?: number;
8
6
  pollTimeout?: number;
7
+ fetchTimeout?: number;
9
8
  chunkByteLength?: number;
9
+ proxy?: Proxy;
10
+ fetch?: Fetch;
10
11
  };
11
12
  export declare function takeDomCapture<TSpec extends SpecType>({ driver, settings, logger, }: {
12
13
  driver: Driver<TSpec>;