@applitools/dom-utils
Advanced tools
Comparing version 4.6.21 to 4.6.22
@@ -6,2 +6,10 @@ # Change Log | ||
## [4.6.22](https://github.com/applitools/eyes.sdk.javascript1/compare/@applitools/dom-utils@4.6.21...@applitools/dom-utils@4.6.22) (2019-07-10) | ||
**Note:** Version bump only for package @applitools/dom-utils | ||
## [4.6.21](https://github.com/applitools/eyes.sdk.javascript1/compare/@applitools/dom-utils@4.6.20...@applitools/dom-utils@4.6.21) (2019-07-02) | ||
@@ -8,0 +16,0 @@ |
@@ -18,3 +18,2 @@ 'use strict'; | ||
class DomCapture { | ||
/** | ||
@@ -62,3 +61,3 @@ * @param {Logger} logger | ||
let asyncCaptureDomScript = | ||
const asyncCaptureDomScript = | ||
`var callback = arguments[arguments.length - 1]; | ||
@@ -79,7 +78,7 @@ (${captureDomScript})().then(res => { | ||
async getFrameDom(script, url) { | ||
let domSnapshotRaw = await this._driver.executeAsyncScript(script); | ||
const domSnapshotRaw = await this._driver.executeAsyncScript(script); | ||
const domSnapshotRawArr = domSnapshotRaw ? domSnapshotRaw.split('\n') : []; | ||
if (domSnapshotRawArr.length === 0 ) { | ||
if (domSnapshotRawArr.length === 0) { | ||
return {}; | ||
@@ -93,4 +92,4 @@ } | ||
let cssArr = []; | ||
for (let i = 1; i < cssEndIndex; i++) { | ||
const cssArr = []; | ||
for (let i = 1; i < cssEndIndex; i += 1) { | ||
cssArr.push(domSnapshotRawArr[i]); | ||
@@ -101,10 +100,9 @@ } | ||
for (const cssHref of cssArr) { | ||
if (!cssHref) { | ||
continue; | ||
if (cssHref) { | ||
cssPromises.push(this._downloadCss(url, cssHref)); | ||
} | ||
cssPromises.push(this._downloadCss(url, cssHref)); | ||
} | ||
const cssResArr = await Promise.all(cssPromises); | ||
for (const cssRes of cssResArr) { | ||
@@ -114,4 +112,4 @@ domSnapshot = domSnapshot.replace(`"${separatorJson.cssStartToken}${cssRes.href}${separatorJson.cssEndToken}"`, cssRes.css); | ||
let iframeArr = []; | ||
for (let i = cssEndIndex + 1; i < iframeEndIndex; i++) { | ||
const iframeArr = []; | ||
for (let i = cssEndIndex + 1; i < iframeEndIndex; i += 1) { | ||
iframeArr.push(domSnapshotRawArr[i]); | ||
@@ -121,14 +119,13 @@ } | ||
for (const iframeXpath of iframeArr) { | ||
if (!iframeXpath) { | ||
continue; | ||
if (iframeXpath) { | ||
const framesCount = await this._switchToFrame(iframeXpath); | ||
let domIFrame; | ||
try { | ||
domIFrame = await this.getFrameDom(script, url); | ||
} catch (ignored) { | ||
domIFrame = {}; | ||
} | ||
await this._switchToParentFrame(framesCount); | ||
domSnapshot = domSnapshot.replace(`"${separatorJson.iframeStartToken}${iframeXpath}${separatorJson.iframeEndToken}"`, domIFrame); | ||
} | ||
const framesCount = await this._switchToFrame(iframeXpath); | ||
let domIFrame; | ||
try { | ||
domIFrame = await this.getFrameDom(script, url); | ||
} catch (ignored) { | ||
domIFrame = {}; | ||
} | ||
await this._switchToParentFrame(framesCount); | ||
domSnapshot = domSnapshot.replace(`"${separatorJson.iframeStartToken}${iframeXpath}${separatorJson.iframeEndToken}"`, domIFrame); | ||
} | ||
@@ -153,3 +150,3 @@ | ||
await this._driver.switchTo().frame(iframeEl); | ||
framesCount = framesCount + 1; | ||
framesCount += 1; | ||
} | ||
@@ -192,3 +189,3 @@ | ||
this._logger.verbose(`downloading CSS in length of ${css.length} chars took ${timeStart.end().summary}`); | ||
return {'href': absHref, 'css': css}; | ||
return { href: absHref, css }; | ||
} catch (ex) { | ||
@@ -200,3 +197,3 @@ this._logger.verbose(ex.toString()); | ||
} | ||
return {'href': href, 'css': ''}; | ||
return { href, css: '' }; | ||
} | ||
@@ -203,0 +200,0 @@ } |
{ | ||
"name": "@applitools/dom-utils", | ||
"version": "4.6.21", | ||
"version": "4.6.22", | ||
"description": "Applitools DOM Utils is a shared utility package", | ||
@@ -27,4 +27,4 @@ "keywords": [ | ||
"dependencies": { | ||
"@applitools/dom-capture": "^7.0.11", | ||
"@applitools/eyes-common": "^3.7.2", | ||
"@applitools/dom-capture": "^7.0.15", | ||
"@applitools/eyes-common": "^3.8.0", | ||
"axios": "^0.19.0" | ||
@@ -35,3 +35,3 @@ }, | ||
"mocha": "^6.1.4", | ||
"selenium-webdriver": "^4.0.0-alpha.3" | ||
"selenium-webdriver": "^4.0.0-alpha.4" | ||
}, | ||
@@ -46,3 +46,3 @@ "scripts": { | ||
}, | ||
"gitHead": "c9bfc201d53a1feec273a51c1b5739f48fc44a90" | ||
"gitHead": "88861fea319bb5c3cf90cb817bbe84477136fc5f" | ||
} |
30734
169