@applitools/rendering-grid-client
Advanced tools
Comparing version 1.1.14 to 2.0.1
{ | ||
"name": "@applitools/rendering-grid-client", | ||
"version": "1.1.14", | ||
"version": "2.0.1", | ||
"description": "", | ||
@@ -38,3 +38,3 @@ "main": "src/rendering-grid-client.js", | ||
"dependencies": { | ||
"@applitools/eyes.sdk.core": "^1.7.0", | ||
"@applitools/eyes.sdk.core": "^1.8.0", | ||
"@applitools/functional-commons": "^1.0.18", | ||
@@ -41,0 +41,0 @@ "cssom": "git+https://github.com/amitzur/CSSOM.git#925260ff2c8f8387cf76df4d5776a06044a644c8", |
'use strict'; | ||
const {RectangleSize, RenderRequest, RenderInfo} = require('@applitools/eyes.sdk.core'); | ||
const {RenderRequest, RenderInfo} = require('@applitools/eyes.sdk.core'); | ||
const createRGridDom = require('./createRGridDom'); | ||
function createRenderRequests({url, resources, cdt, browsers, renderInfo, sizeMode}) { | ||
function createRenderRequests({ | ||
url, | ||
resources, | ||
cdt, | ||
browsers, | ||
renderInfo, | ||
sizeMode, | ||
selector, | ||
region, | ||
scriptHooks, | ||
}) { | ||
const rGridDom = createRGridDom({resources, cdt}); | ||
@@ -15,5 +25,6 @@ | ||
rGridDom, | ||
RenderInfo.fromRectangleSize(new RectangleSize({width, height}), sizeMode), | ||
RenderInfo.fromObject({width, height, sizeMode, selector, region}), | ||
'Linux', | ||
name, | ||
scriptHooks, | ||
), | ||
@@ -20,0 +31,0 @@ ); |
@@ -18,5 +18,4 @@ 'use strict'; | ||
async open(appName, testName, viewportSize, browserName) { | ||
async open(appName, testName, viewportSize) { | ||
await super.openBase(appName, testName); | ||
browserName && this.setHostApp(browserName); | ||
@@ -89,5 +88,9 @@ this._viewportSizeHandler.set(new RectangleSize(viewportSize)); // Not doing this causes an exception at a later | ||
async getInferredEnvironment() { | ||
return await ''; // TODO what does this mean? should there be something meaningful here? | ||
return this.inferredEnvironment; | ||
} | ||
setInferredEnvironment(value) { | ||
this.inferredEnvironment = value; | ||
} | ||
async getTitle() { | ||
@@ -94,0 +97,0 @@ return await 'some title'; // TODO what should this be? is it connected with the tag in `checkWindow` somehow? |
@@ -22,6 +22,2 @@ 'use strict'; | ||
// TODO replace with getInferredEnvironment once render service returns userAgent | ||
const getHostAppFromBrowserName = browserName => | ||
browserName.charAt(0).toUpperCase() + browserName.slice(1); | ||
async function openEyes({ | ||
@@ -64,3 +60,6 @@ appName, | ||
sizeMode = 'full-page', | ||
selector, | ||
region, | ||
domCapture, | ||
scriptHooks, | ||
}) { | ||
@@ -96,6 +95,10 @@ async function checkWindowJob(prevJobPromise = presult(Promise.resolve()), index) { | ||
); | ||
const [screenshotUrl] = await waitForRenderedStatus([renderId], renderWrapper, () => error); | ||
const [{imageLocation, userAgent}] = await waitForRenderedStatus( | ||
[renderId], | ||
renderWrapper, | ||
() => error, | ||
); | ||
if (screenshotUrl) { | ||
logger.log(`screenshot available for ${renderId} at ${screenshotUrl}`); | ||
if (imageLocation) { | ||
logger.log(`screenshot available for ${renderId} at ${imageLocation}`); | ||
} else { | ||
@@ -105,2 +108,5 @@ logger.log(`screenshot NOT available for ${renderId}`); | ||
const wrapper = wrappers[index]; | ||
wrapper.setInferredEnvironment(`useragent:${userAgent}`); | ||
await prevJobPromise; | ||
@@ -121,3 +127,3 @@ | ||
results.push(await wrappers[index].checkWindow({screenshotUrl, tag, domUrl})); | ||
results.push(await wrapper.checkWindow({screenshotUrl: imageLocation, tag, domUrl})); | ||
} | ||
@@ -135,2 +141,5 @@ | ||
sizeMode, | ||
selector, | ||
region, | ||
scriptHooks, | ||
}); | ||
@@ -262,8 +271,3 @@ const renderIds = await renderBatch(renderRequests, renderWrapper, resourceCache); | ||
await wrappers[i].open( | ||
appName, | ||
testName, | ||
{width, height}, | ||
browser.name && getHostAppFromBrowserName(browser.name), // TODO replace with getInferredEnvironment once render service returns userAgent | ||
); | ||
await wrappers[i].open(appName, testName, {width, height}); | ||
} | ||
@@ -270,0 +274,0 @@ } |
@@ -33,3 +33,3 @@ 'use strict'; | ||
clearTimeout(timeoutId); | ||
return renderStatuses.map(rs => rs.getImageLocation()); | ||
return renderStatuses.map(rs => rs.toJSON()); | ||
} catch (ex) { | ||
@@ -36,0 +36,0 @@ if (timeoutReached) { |
1205
43195