testplane 8.46.3 → 8.46.4
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/build/package.json +1 -1
- package/build/src/browser/calibrator.js +11 -8
- package/build/src/browser/calibrator.js.map +1 -1
- package/build/src/browser/camera/index.js +1 -1
- package/build/src/browser/camera/index.js.map +1 -1
- package/build/src/browser/commands/assert-view/index.js +1 -1
- package/build/src/browser/commands/assert-view/index.js.map +1 -1
- package/build/src/browser/screen-shooter/viewport/index.js +2 -2
- package/build/src/browser/screen-shooter/viewport/index.js.map +1 -1
- package/build/src/image.d.ts +3 -1
- package/build/src/image.js +26 -1
- package/build/src/image.js.map +1 -1
- package/package.json +1 -1
package/build/package.json
CHANGED
|
@@ -23,7 +23,11 @@ class Calibrator {
|
|
|
23
23
|
const image = await browser.captureViewportImage();
|
|
24
24
|
const { innerWidth, pixelRatio } = features;
|
|
25
25
|
const hasPixelRatio = Boolean(pixelRatio && pixelRatio > 1.0);
|
|
26
|
-
const
|
|
26
|
+
const { width: imageWidth, height: imageHeight } = image.getSize();
|
|
27
|
+
const searchColor = image.hasICCPChunk
|
|
28
|
+
? await image.getRGB(Math.floor(imageWidth / 2), Math.floor(imageHeight / 2))
|
|
29
|
+
: { R: 148, G: 250, B: 0 };
|
|
30
|
+
const imageFeatures = await this._analyzeImage(image, { calculateColorLength: hasPixelRatio, searchColor });
|
|
27
31
|
if (!imageFeatures) {
|
|
28
32
|
throw new core_error_1.CoreError("Could not calibrate. This could be due to calibration page has failed to open properly");
|
|
29
33
|
}
|
|
@@ -37,7 +41,7 @@ class Calibrator {
|
|
|
37
41
|
return calibratedFeatures;
|
|
38
42
|
}
|
|
39
43
|
async _analyzeImage(image, params) {
|
|
40
|
-
const imageHeight =
|
|
44
|
+
const imageHeight = image.getSize().height;
|
|
41
45
|
for (let y = 0; y < imageHeight; y++) {
|
|
42
46
|
const result = await analyzeRow(y, image, params);
|
|
43
47
|
if (result) {
|
|
@@ -48,8 +52,8 @@ class Calibrator {
|
|
|
48
52
|
}
|
|
49
53
|
}
|
|
50
54
|
exports.Calibrator = Calibrator;
|
|
51
|
-
async function analyzeRow(row, image, params
|
|
52
|
-
const markerStart = await findMarkerInRow(row, image, DIRECTION.FORWARD);
|
|
55
|
+
async function analyzeRow(row, image, params) {
|
|
56
|
+
const markerStart = await findMarkerInRow(row, image, DIRECTION.FORWARD, params.searchColor);
|
|
53
57
|
if (markerStart === -1) {
|
|
54
58
|
return null;
|
|
55
59
|
}
|
|
@@ -57,13 +61,12 @@ async function analyzeRow(row, image, params = {}) {
|
|
|
57
61
|
if (!params.calculateColorLength) {
|
|
58
62
|
return result;
|
|
59
63
|
}
|
|
60
|
-
const markerEnd = await findMarkerInRow(row, image, DIRECTION.REVERSE);
|
|
64
|
+
const markerEnd = await findMarkerInRow(row, image, DIRECTION.REVERSE, params.searchColor);
|
|
61
65
|
const colorLength = markerEnd - markerStart + 1;
|
|
62
66
|
return { ...result, colorLength };
|
|
63
67
|
}
|
|
64
|
-
async function findMarkerInRow(row, image, searchDirection) {
|
|
65
|
-
const imageWidth =
|
|
66
|
-
const searchColor = { R: 148, G: 250, B: 0 };
|
|
68
|
+
async function findMarkerInRow(row, image, searchDirection, searchColor) {
|
|
69
|
+
const imageWidth = image.getSize().width;
|
|
67
70
|
if (searchDirection === DIRECTION.REVERSE) {
|
|
68
71
|
return searchReverse_();
|
|
69
72
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calibrator.js","sourceRoot":"","sources":["../../../src/browser/calibrator.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AACxB,4DAAmC;AACnC,6CAAyC;AAIzC,MAAM,SAAS,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAW,CAAC;AAwBtE,MAAa,UAAU;IAInB;QACI,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,YAAE,CAAC,YAAY,CAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,EAAE,cAAc,CAAC,EAAE,MAAM,CAAC,CAAC;IACnG,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,OAAwB;QACpC,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;YAC1B,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACnC,CAAC;QAED,MAAM,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAClC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,UAAU,CAAkB,IAAI,CAAC,OAAO,CAAC,CAAC;QACzE,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,oBAAoB,EAAE,CAAC;QAEnD,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,QAAQ,CAAC;QAC5C,MAAM,aAAa,GAAG,OAAO,CAAC,UAAU,IAAI,UAAU,GAAG,GAAG,CAAC,CAAC;QAC9D,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,EAAE,oBAAoB,EAAE,aAAa,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"calibrator.js","sourceRoot":"","sources":["../../../src/browser/calibrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,7 +45,7 @@ class Camera {
|
|
|
45
45
|
async captureViewportImage(page) {
|
|
46
46
|
const base64 = await this._takeScreenshot();
|
|
47
47
|
const image = image_1.Image.fromBase64(base64);
|
|
48
|
-
const { width, height } =
|
|
48
|
+
const { width, height } = image.getSize();
|
|
49
49
|
const imageArea = { left: 0, top: 0, width, height };
|
|
50
50
|
const calibratedArea = this._calibrateArea(imageArea);
|
|
51
51
|
const viewportCroppedArea = this._cropAreaToViewport(calibratedArea, page);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/browser/camera/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAuB;AACvB,uCAAoC;AACpC,+CAAiC;AAsBjC,MAAa,MAAM;IAKf,MAAM,CAAC,MAAM,CAAC,cAA8B,EAAE,cAAqC;QAC/E,OAAO,IAAI,IAAI,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;IACpD,CAAC;IAED,YAAY,cAA8B,EAAE,cAAqC;QAC7E,IAAI,CAAC,eAAe,GAAG,cAAc,CAAC;QACtC,IAAI,CAAC,eAAe,GAAG,cAAc,CAAC;QACtC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;IAC7B,CAAC;IAED,SAAS,CAAC,WAAwB;QAC9B,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,IAAe;QACtC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAC5C,MAAM,KAAK,GAAG,aAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAEvC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/browser/camera/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -64,7 +64,7 @@ module.exports.default = browser => {
|
|
|
64
64
|
const currImgInst = await screenShooter
|
|
65
65
|
.capture(page, screenshoterOpts)
|
|
66
66
|
.finally(() => browser.cleanupScreenshot(opts));
|
|
67
|
-
const currSize =
|
|
67
|
+
const currSize = currImgInst.getSize();
|
|
68
68
|
const currImg = { path: temp.path(Object.assign(tempOpts, { suffix: ".png" })), size: currSize };
|
|
69
69
|
const test = session.executionContext.ctx.currentTest;
|
|
70
70
|
const refImgAbsolutePath = config.getScreenshotPath(test, state);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/browser/commands/assert-view/index.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/browser/commands/assert-view/index.js"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,7 @@ module.exports = class Viewport {
|
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
28
|
async handleImage(image, area = {}) {
|
|
29
|
-
const { width, height } =
|
|
29
|
+
const { width, height } = image.getSize();
|
|
30
30
|
_.defaults(area, { left: 0, top: 0, width, height });
|
|
31
31
|
const capturedArea = this._transformToCaptureArea(area);
|
|
32
32
|
await image.crop(this._sanitize(this._transformToViewportOrigin(capturedArea)));
|
|
@@ -42,7 +42,7 @@ module.exports = class Viewport {
|
|
|
42
42
|
}
|
|
43
43
|
async extendBy(physicalScrollHeight, newImage) {
|
|
44
44
|
this._viewport.height += physicalScrollHeight;
|
|
45
|
-
const { width, height } =
|
|
45
|
+
const { width, height } = newImage.getSize();
|
|
46
46
|
await this.handleImage(newImage, {
|
|
47
47
|
left: 0,
|
|
48
48
|
top: height - physicalScrollHeight,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/browser/screen-shooter/viewport/index.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAE5B,MAAM,cAAc,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAEpD,MAAM,CAAC,OAAO,GAAG,MAAM,QAAQ;IAC3B,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI;QACjB,OAAO,IAAI,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,YAAY,IAAI,EAAE,KAAK,EAAE,IAAI;QACzB,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACrD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC;QACrC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC;IAC5B,CAAC;IAED,QAAQ,CAAC,OAAO;QACZ,MAAM,cAAc,GAAG,cAAc,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAElE,OAAO,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IACtE,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS;QAC9B,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACnC,MAAM,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YAE9D,IAAI,cAAc,KAAK,IAAI,EAAE,CAAC;gBAC1B,MAAM,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,EAAE,IAAI,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;YAC3G,CAAC;QACL,CAAC;IACL,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAK,EAAE,IAAI,GAAG,EAAE;QAC9B,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/browser/screen-shooter/viewport/index.js"],"names":[],"mappings":"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"}
|
package/build/src/image.d.ts
CHANGED
|
@@ -31,11 +31,13 @@ export declare class Image {
|
|
|
31
31
|
private _width;
|
|
32
32
|
private _height;
|
|
33
33
|
private _composeImages;
|
|
34
|
+
private _hasICCPChunk;
|
|
34
35
|
static create(buffer: Buffer): Image;
|
|
35
36
|
constructor(buffer: Buffer);
|
|
37
|
+
get hasICCPChunk(): boolean;
|
|
36
38
|
_getImgData(): Promise<Buffer>;
|
|
37
39
|
_ensureImagesHaveSameWidth(): void;
|
|
38
|
-
getSize():
|
|
40
|
+
getSize(): ImageSize;
|
|
39
41
|
crop(rect: Rect): Promise<void>;
|
|
40
42
|
addJoin(attachedImages: this[]): void;
|
|
41
43
|
applyJoin(): Promise<void>;
|
package/build/src/image.js
CHANGED
|
@@ -44,6 +44,26 @@ const extractBase64PngSize = (base64EncodedPng) => {
|
|
|
44
44
|
};
|
|
45
45
|
};
|
|
46
46
|
exports.extractBase64PngSize = extractBase64PngSize;
|
|
47
|
+
const hasICCPChunk = (buffer) => {
|
|
48
|
+
const auxChunkSizeBytes = 12; // 4 bytes for length, 4 bytes for type, 4 bytes for crc
|
|
49
|
+
const iCCPChunkType = Buffer.from("iCCP", "ascii").readUInt32BE(0);
|
|
50
|
+
const IDATChunkType = Buffer.from("IDAT", "ascii").readUInt32BE(0);
|
|
51
|
+
const PLTEChunkType = Buffer.from("PLTE", "ascii").readUInt32BE(0);
|
|
52
|
+
for (let nextChunkPointer = png_1.PNG_SIGNATURE.byteLength; nextChunkPointer <= buffer.length - auxChunkSizeBytes;) {
|
|
53
|
+
const chunkLength = buffer.readUInt32BE(nextChunkPointer);
|
|
54
|
+
const chunkType = buffer.readUInt32BE(nextChunkPointer + 4);
|
|
55
|
+
if (chunkType === iCCPChunkType) {
|
|
56
|
+
return true;
|
|
57
|
+
}
|
|
58
|
+
// If the iCCP chunk appears, it must precede the first IDAT chunk, and it must also precede the PLTE chunk if present
|
|
59
|
+
// https://libpng.org/pub/png/spec/1.2/PNG-Chunks.html#C.iCCP
|
|
60
|
+
if (chunkType === IDATChunkType || chunkType === PLTEChunkType) {
|
|
61
|
+
return false;
|
|
62
|
+
}
|
|
63
|
+
nextChunkPointer += chunkLength + auxChunkSizeBytes;
|
|
64
|
+
}
|
|
65
|
+
return false;
|
|
66
|
+
};
|
|
47
67
|
class Image {
|
|
48
68
|
static create(buffer) {
|
|
49
69
|
return new this(buffer);
|
|
@@ -51,12 +71,17 @@ class Image {
|
|
|
51
71
|
constructor(buffer) {
|
|
52
72
|
this._imgData = null;
|
|
53
73
|
this._composeImages = [];
|
|
74
|
+
this._hasICCPChunk = false;
|
|
54
75
|
this._width = buffer.readUInt32BE(png_1.PNG_WIDTH_OFFSET);
|
|
55
76
|
this._height = buffer.readUInt32BE(png_1.PNG_HEIGHT_OFFSET);
|
|
77
|
+
this._hasICCPChunk = hasICCPChunk(buffer);
|
|
56
78
|
this._imgDataPromise = jsquashDecode(buffer).then(({ data }) => {
|
|
57
79
|
return Buffer.from(data.buffer, data.byteOffset, data.byteLength);
|
|
58
80
|
});
|
|
59
81
|
}
|
|
82
|
+
get hasICCPChunk() {
|
|
83
|
+
return this._hasICCPChunk;
|
|
84
|
+
}
|
|
60
85
|
async _getImgData() {
|
|
61
86
|
if (this._imgData) {
|
|
62
87
|
return this._imgData;
|
|
@@ -73,7 +98,7 @@ class Image {
|
|
|
73
98
|
}
|
|
74
99
|
}
|
|
75
100
|
}
|
|
76
|
-
|
|
101
|
+
getSize() {
|
|
77
102
|
this._ensureImagesHaveSameWidth();
|
|
78
103
|
const height = this._composeImages.reduce((acc, img) => acc + img._height, this._height);
|
|
79
104
|
return { height, width: this._width };
|
package/build/src/image.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"image.js","sourceRoot":"","sources":["../../src/image.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,4DAAmC;AACnC,yDAAgD;AAEhD,yEAAiE;AACjE,yCAOyB;AA4BzB,MAAM,kBAAkB,GAAG,IAAI,OAAO,CAAU,OAAO,CAAC,EAAE;IACtD,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,4CAA4C,CAAC,CAAC;IAEnF,OAAO,CAAC,GAAG,CAAC;QACR,IAAA,uBAAO,EAA0C,wBAAwB,CAAC;QAC1E,YAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC;KACrC,CAAC;SACG,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAC/C,IAAI,CAAC,OAAO,CAAC,CAAC;AACvB,CAAC,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,CAAC,MAAmB,EAAsB,EAAE;IAC9D,OAAO,OAAO,CAAC,GAAG,CAAC;QACf,IAAA,uBAAO,EAA0C,wBAAwB,CAAC;QAC1E,kBAAkB;KACrB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,kBAAY,EAAE,CAAC,CAAC,CAAC;AACvE,CAAC,CAAC;AAEK,MAAM,oBAAoB,GAAG,CAAC,gBAAwB,EAAa,EAAE;IACxE,sCAAsC;IACtC,MAAM,UAAU,GAAG,gBAAgB,CAAC,QAAQ,CAAC,UAAU,CAAC;QACpD,CAAC,CAAE,gBAAgB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,GAAG,EAAa;QACtD,CAAC,CAAC,gBAAgB,CAAC;IAEvB,IAAI,UAAU,CAAC,MAAM,IAAI,0BAAoB,EAAE,CAAC;QAC5C,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,GAAG,CAAC,sBAAgB,EAAE,uBAAiB,CAAC,GAAG,CAAC,CAAC;IAC5E,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;IAC/D,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,iBAAiB,CAAC,EAAE,QAAQ,CAAC,CAAC;IAEhF,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,EAAE,mBAAa,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,mBAAa,CAAC,EAAE,CAAC;QACzE,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;IACvE,CAAC;IAED,OAAO;QACH,KAAK,EAAE,SAAS,CAAC,YAAY,CAAC,sBAAgB,CAAC;QAC/C,MAAM,EAAE,SAAS,CAAC,YAAY,CAAC,uBAAiB,CAAC;KACpD,CAAC;AACN,CAAC,CAAC;AAtBW,QAAA,oBAAoB,wBAsB/B;AAEF,MAAa,KAAK;
|
|
1
|
+
{"version":3,"file":"image.js","sourceRoot":"","sources":["../../src/image.ts"],"names":[],"mappings":"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"}
|