@appium/images-plugin 1.2.4 → 1.3.1
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/LICENSE +2 -2
- package/README.md +2 -0
- package/build/lib/compare.d.ts +28 -0
- package/build/lib/compare.d.ts.map +1 -0
- package/build/lib/compare.js +59 -70
- package/build/lib/finder.d.ts +163 -0
- package/build/lib/finder.d.ts.map +1 -0
- package/build/lib/finder.js +323 -358
- package/build/lib/image-element.d.ts +108 -0
- package/build/lib/image-element.d.ts.map +1 -0
- package/build/lib/image-element.js +193 -224
- package/build/lib/logger.d.ts +3 -0
- package/build/lib/logger.d.ts.map +1 -0
- package/build/lib/logger.js +15 -5
- package/build/lib/plugin.d.ts +25 -0
- package/build/lib/plugin.d.ts.map +1 -0
- package/build/lib/plugin.js +88 -67
- package/build/tsconfig.tsbuildinfo +1 -1
- package/index.js +1 -3
- package/lib/compare.js +26 -11
- package/lib/finder.js +141 -83
- package/lib/image-element.js +69 -65
- package/lib/logger.js +3 -1
- package/lib/plugin.js +14 -15
- package/package.json +34 -24
- package/build/index.js +0 -27
- package/build/test/e2e/plugin-e2e-specs.js +0 -62
- package/build/test/fixtures/appstore.png +0 -0
- package/build/test/fixtures/img1.png +0 -0
- package/build/test/fixtures/img2.png +0 -0
- package/build/test/fixtures/img2_part.png +0 -0
- package/build/test/fixtures/index.js +0 -24
- package/build/test/unit/finder-specs.js +0 -334
- package/build/test/unit/image-element-specs.js +0 -275
- package/build/test/unit/plugin-specs.js +0 -149
|
@@ -1,334 +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
|
-
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
5
|
-
}) : (function(o, m, k, k2) {
|
|
6
|
-
if (k2 === undefined) k2 = k;
|
|
7
|
-
o[k2] = m[k];
|
|
8
|
-
}));
|
|
9
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
10
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
11
|
-
}) : function(o, v) {
|
|
12
|
-
o["default"] = v;
|
|
13
|
-
});
|
|
14
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
|
-
if (mod && mod.__esModule) return mod;
|
|
16
|
-
var result = {};
|
|
17
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
|
-
__setModuleDefault(result, mod);
|
|
19
|
-
return result;
|
|
20
|
-
};
|
|
21
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
22
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
23
|
-
};
|
|
24
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
25
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
26
|
-
const support_1 = require("@appium/support");
|
|
27
|
-
const base_driver_1 = __importDefault(require("@appium/base-driver"));
|
|
28
|
-
const index_1 = __importStar(require("../../index"));
|
|
29
|
-
const finder_1 = __importDefault(require("../../lib/finder"));
|
|
30
|
-
const image_element_1 = __importDefault(require("../../lib/image-element"));
|
|
31
|
-
const sinon_1 = __importDefault(require("sinon"));
|
|
32
|
-
const fixtures_1 = require("../fixtures");
|
|
33
|
-
const chai_1 = __importDefault(require("chai"));
|
|
34
|
-
const chai_as_promised_1 = __importDefault(require("chai-as-promised"));
|
|
35
|
-
const compareModule = require('../../lib/compare');
|
|
36
|
-
chai_1.default.use(chai_as_promised_1.default);
|
|
37
|
-
const should = chai_1.default.should();
|
|
38
|
-
const plugin = new index_1.default();
|
|
39
|
-
class PluginDriver extends base_driver_1.default {
|
|
40
|
-
async getWindowSize() { }
|
|
41
|
-
async getScreenshot() { }
|
|
42
|
-
findElement(strategy, selector) {
|
|
43
|
-
return plugin.findElement(lodash_1.default.noop, this, strategy, selector);
|
|
44
|
-
}
|
|
45
|
-
findElements(strategy, selector) {
|
|
46
|
-
return plugin.findElements(lodash_1.default.noop, this, strategy, selector);
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
describe('finding elements by image', function () {
|
|
50
|
-
describe('findElement', function () {
|
|
51
|
-
it('should use a different special method to find element by image', async function () {
|
|
52
|
-
const d = new PluginDriver();
|
|
53
|
-
sinon_1.default.stub(plugin.finder, 'findByImage').returns(true);
|
|
54
|
-
sinon_1.default.stub(d, 'findElOrElsWithProcessing').returns(false);
|
|
55
|
-
await d.findElement(index_1.IMAGE_STRATEGY, 'foo').should.eventually.be.true;
|
|
56
|
-
await d.findElements(index_1.IMAGE_STRATEGY, 'foo').should.eventually.be.true;
|
|
57
|
-
});
|
|
58
|
-
it('should not be able to find image element from any other element', async function () {
|
|
59
|
-
const d = new PluginDriver();
|
|
60
|
-
await d.findElementFromElement(index_1.IMAGE_STRATEGY, 'foo', 'elId')
|
|
61
|
-
.should.eventually.be.rejectedWith(/Locator Strategy.+is not supported/);
|
|
62
|
-
await d.findElementsFromElement(index_1.IMAGE_STRATEGY, 'foo', 'elId')
|
|
63
|
-
.should.eventually.be.rejectedWith(/Locator Strategy.+is not supported/);
|
|
64
|
-
});
|
|
65
|
-
});
|
|
66
|
-
describe('findByImage', function () {
|
|
67
|
-
const rect = { x: 10, y: 20, width: 30, height: 40 };
|
|
68
|
-
const score = 0.9;
|
|
69
|
-
const size = { width: 100, height: 200 };
|
|
70
|
-
const screenshot = 'iVBORfoo';
|
|
71
|
-
const template = 'iVBORbar';
|
|
72
|
-
let compareStub;
|
|
73
|
-
let d = new PluginDriver();
|
|
74
|
-
let f = new finder_1.default(d);
|
|
75
|
-
function basicStub(driver, finder) {
|
|
76
|
-
const sizeStub = sinon_1.default.stub(driver, 'getWindowSize').returns(size);
|
|
77
|
-
const screenStub = sinon_1.default.stub(finder, 'getScreenshotForImageFind').returns(screenshot);
|
|
78
|
-
return { sizeStub, screenStub };
|
|
79
|
-
}
|
|
80
|
-
function basicImgElVerify(imgElProto, finder) {
|
|
81
|
-
const imgElId = imgElProto.ELEMENT;
|
|
82
|
-
finder.imgElCache.has(imgElId).should.be.true;
|
|
83
|
-
const imgEl = finder.imgElCache.get(imgElId);
|
|
84
|
-
(imgEl instanceof image_element_1.default).should.be.true;
|
|
85
|
-
imgEl.rect.should.eql(rect);
|
|
86
|
-
imgEl.score.should.eql(score);
|
|
87
|
-
return imgEl;
|
|
88
|
-
}
|
|
89
|
-
beforeEach(function () {
|
|
90
|
-
compareStub = sinon_1.default.stub(compareModule, 'compareImages').returns({ rect, score });
|
|
91
|
-
d = new PluginDriver();
|
|
92
|
-
f = new finder_1.default(d);
|
|
93
|
-
basicStub(d, f);
|
|
94
|
-
});
|
|
95
|
-
afterEach(function () {
|
|
96
|
-
compareStub.restore();
|
|
97
|
-
});
|
|
98
|
-
it('should find an image element happypath', async function () {
|
|
99
|
-
const imgElProto = await f.findByImage(template, { multiple: false });
|
|
100
|
-
basicImgElVerify(imgElProto, f);
|
|
101
|
-
});
|
|
102
|
-
it('should find image elements happypath', async function () {
|
|
103
|
-
compareStub.restore();
|
|
104
|
-
compareStub = sinon_1.default.stub(compareModule, 'compareImages').returns([{ rect, score }]);
|
|
105
|
-
const els = await f.findByImage(template, { multiple: true });
|
|
106
|
-
els.should.have.length(1);
|
|
107
|
-
basicImgElVerify(els[0], f);
|
|
108
|
-
});
|
|
109
|
-
it('should fail if driver does not support getWindowSize', async function () {
|
|
110
|
-
d.getWindowSize = null;
|
|
111
|
-
await f.findByImage(template, { multiple: false })
|
|
112
|
-
.should.eventually.be.rejectedWith(/driver does not support/);
|
|
113
|
-
});
|
|
114
|
-
it('should fix template size if requested', async function () {
|
|
115
|
-
const newTemplate = 'iVBORbaz';
|
|
116
|
-
await d.settings.update({ fixImageTemplateSize: true });
|
|
117
|
-
sinon_1.default.stub(f, 'ensureTemplateSize').returns(newTemplate);
|
|
118
|
-
const imgElProto = await f.findByImage(template, { multiple: false });
|
|
119
|
-
const imgEl = basicImgElVerify(imgElProto, f);
|
|
120
|
-
imgEl.template.should.eql(newTemplate);
|
|
121
|
-
lodash_1.default.last(compareStub.args)[2].should.eql(newTemplate);
|
|
122
|
-
});
|
|
123
|
-
it('should fix template size scale if requested', async function () {
|
|
124
|
-
const newTemplate = 'iVBORbaz';
|
|
125
|
-
await d.settings.update({ fixImageTemplateScale: true });
|
|
126
|
-
sinon_1.default.stub(f, 'fixImageTemplateScale').returns(newTemplate);
|
|
127
|
-
const imgElProto = await f.findByImage(template, { multiple: false });
|
|
128
|
-
const imgEl = basicImgElVerify(imgElProto, f);
|
|
129
|
-
imgEl.template.should.eql(newTemplate);
|
|
130
|
-
lodash_1.default.last(compareStub.args)[2].should.eql(newTemplate);
|
|
131
|
-
});
|
|
132
|
-
it('should not fix template size scale if it is not requested', async function () {
|
|
133
|
-
const newTemplate = 'iVBORbaz';
|
|
134
|
-
await d.settings.update({});
|
|
135
|
-
sinon_1.default.stub(f, 'fixImageTemplateScale').returns(newTemplate);
|
|
136
|
-
f.fixImageTemplateScale.callCount.should.eql(0);
|
|
137
|
-
});
|
|
138
|
-
it('should throw an error if template match fails', async function () {
|
|
139
|
-
compareStub.throws(new Error('Cannot find any occurrences'));
|
|
140
|
-
await f.findByImage(template, { multiple: false })
|
|
141
|
-
.should.eventually.be.rejectedWith(/element could not be located/);
|
|
142
|
-
});
|
|
143
|
-
it('should return empty array for multiple elements if template match fails', async function () {
|
|
144
|
-
compareStub.throws(new Error('Cannot find any occurrences'));
|
|
145
|
-
await f.findByImage(template, { multiple: true }).should.eventually.eql([]);
|
|
146
|
-
});
|
|
147
|
-
it('should respect implicit wait', async function () {
|
|
148
|
-
d.setImplicitWait(10);
|
|
149
|
-
compareStub.resetHistory();
|
|
150
|
-
compareStub.onCall(0).throws(new Error('Cannot find any occurrences'));
|
|
151
|
-
compareStub.returns({ rect, score });
|
|
152
|
-
const imgElProto = await f.findByImage(template, { multiple: false });
|
|
153
|
-
basicImgElVerify(imgElProto, f);
|
|
154
|
-
compareStub.callCount.should.eql(2);
|
|
155
|
-
});
|
|
156
|
-
it('should not add element to cache and return it directly when checking staleness', async function () {
|
|
157
|
-
const imgEl = await f.findByImage(template, { multiple: false, shouldCheckStaleness: true });
|
|
158
|
-
(imgEl instanceof image_element_1.default).should.be.true;
|
|
159
|
-
f.imgElCache.has(imgEl.id).should.be.false;
|
|
160
|
-
imgEl.rect.should.eql(rect);
|
|
161
|
-
});
|
|
162
|
-
});
|
|
163
|
-
describe('fixImageTemplateScale', function () {
|
|
164
|
-
const d = new PluginDriver();
|
|
165
|
-
const f = new finder_1.default(d);
|
|
166
|
-
const basicTemplate = 'iVBORbaz';
|
|
167
|
-
it('should not fix template size scale if no scale value', async function () {
|
|
168
|
-
await f.fixImageTemplateScale(basicTemplate, { fixImageTemplateScale: true })
|
|
169
|
-
.should.eventually.eql(basicTemplate);
|
|
170
|
-
});
|
|
171
|
-
it('should not fix template size scale if it is null', async function () {
|
|
172
|
-
await f.fixImageTemplateScale(basicTemplate, null)
|
|
173
|
-
.should.eventually.eql(basicTemplate);
|
|
174
|
-
});
|
|
175
|
-
it('should not fix template size scale if it is not number', async function () {
|
|
176
|
-
await f.fixImageTemplateScale(basicTemplate, 'wrong-scale')
|
|
177
|
-
.should.eventually.eql(basicTemplate);
|
|
178
|
-
});
|
|
179
|
-
it('should fix template size scale', async function () {
|
|
180
|
-
const actual = 'iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAWElEQVR4AU3BQRWAQAhAwa/PGBsEgrC16AFBKEIPXW7OXO+Rmey9iQjMjHFzrLUwM7qbqmLcHKpKRFBVuDvj4agq3B1VRUQYT2bS3QwRQVUZF/CaGRHB3wc1vSZbHO5+BgAAAABJRU5ErkJggg==';
|
|
181
|
-
await f.fixImageTemplateScale(fixtures_1.TINY_PNG, {
|
|
182
|
-
fixImageTemplateScale: true, xScale: 1.5, yScale: 1.5
|
|
183
|
-
}).should.eventually.eql(actual);
|
|
184
|
-
});
|
|
185
|
-
it('should not fix template size scale because of fixImageTemplateScale being false', async function () {
|
|
186
|
-
await f.fixImageTemplateScale(fixtures_1.TINY_PNG, {
|
|
187
|
-
fixImageTemplateScale: false, xScale: 1.5, yScale: 1.5
|
|
188
|
-
}).should.eventually.eql(fixtures_1.TINY_PNG);
|
|
189
|
-
});
|
|
190
|
-
it('should fix template size scale with default scale', async function () {
|
|
191
|
-
const actual = 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABwUlEQVR4AaXBPUsrQQCG0SeX+cBdkTjwTpG1NPgLpjY/fW1stt4UYmm2cJqwMCsaw70uJJ3CBc9Z/P3Cl+12S9u2tG1L27bEGLm/v2ez2bDZbJDEd/7wS4YT7z3X19fc3Nxwd3dHXdd47xnHkefnZ8ZxpKoq6rqmqiqMMcwMJ1VV0TQN0zThnOPj44O6rsk503UdkmiahqZpWK1WGGOYGU7quqZpGqy1SCLnTM6Z19dXcs5IYpomrLVI4uLigpnhpKoqVqsVkjgcDjw9PdF1HTlnuq5DEs45JHE4HDgznByPR97e3pimiVIK4zhyPB7x3hNCIITA5eUl3nsWiwVnhpNSCsMwsNvtGIaB/X5PKQVJpJSQxHq9RhLOOc4MJ9M0sdvt2G639H3PTBIxRiQhCUnEGLHWcmY4KaUwDAN93/P4+MhyuSSlhCRSSkjCOYe1FmstZ6bve2YvLy/s93tmy+USSUhCEpIIIfAd8/DwwOz9/Z1SCpJIKSGJ9XqNJJxz/MS0bcvs6uoKScQYkYQkJBFjxFrLT0zbtsxub29JKSGJlBKScM5hrcVay09MzplZjJHPz0+894QQCCHwP/7wS/8A4e6nAg+R8LwAAAAASUVORK5CYII=';
|
|
192
|
-
await f.fixImageTemplateScale(fixtures_1.TINY_PNG, {
|
|
193
|
-
defaultImageTemplateScale: 4.0
|
|
194
|
-
}).should.eventually.eql(actual);
|
|
195
|
-
});
|
|
196
|
-
it('should fix template size scale with default scale and image scale', async function () {
|
|
197
|
-
const actual = 'iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAACaUlEQVR4AbXBMWvrWBSF0c9BsFPtW91UR1U6+///FKlKKt8qqnyqnMozggkI8xgMj6x1uv+L/6zryrIsrOvKsiys68qyLFwuF87nM5fLhfP5zOVy4Xw+84wXftkLv2ziQBK26b0TEVQVu4jANrvM5Hq9spOEJCQhCUlI4mjiQBK26b1TVewkYRvb7DKTMQaZiW1s01rDNraRxNHEgSRaa1QVO0m01jjKTDKTXe+d3jtVxU4SjyYOJGGbnSRs03snM8lMMpPb7UZmkplEBFXFThK2eTRxIAnbSMI2VcX39zdjDMYYZCaZyRiDMQZVxU4StqkqHk0cSEISf5KZ7DKTMQbLsrCTRGuN3jtVxaOJg6qiqqgqqoqqoqoYY5CZ7GwTEdzvd97f34kIeu/YRhKPJg6qiswkM7ndbmQmmUlmkpnsbBMR2CYimOeZ3ju2kcSjiYOqIjP5+vpi2za2bWPbNo5aa7TW2PXe6b3Te6e1hiQeTRxUFbfbjW3bGGNwvV4ZY2Ab27TWsI1tbGMb27TWsI0kHk0cVBWZybZtXK9XPj8/+fj4YJ5nIoLWGraJCOZ5RhKSkIQkJPFo4qCqyEy2bWOMwefnJ+u6cjqdsM3ONvM8cz6feca0ris/rtcrmcnONhHB/X7n/f2diKD3jm0k8axpWRZ+ZCaZyc42EYFtIoJ5num9YxtJPGta15U/sY1tdm9vb/Te6b1jG0k8a1qWhR+2sU1rjdYatrGNbWxjm9YaknjWtK4rPyKCiKC1hm0igojg9fUVSUhCEpJ41rQsC0e22dkmIrhcLvyNF/7H6XTib73wy174Zf8AJEsePtlPj10AAAAASUVORK5CYII=';
|
|
198
|
-
await f.fixImageTemplateScale(fixtures_1.TINY_PNG, {
|
|
199
|
-
defaultImageTemplateScale: 4.0,
|
|
200
|
-
fixImageTemplateScale: true,
|
|
201
|
-
xScale: 1.5, yScale: 1.5
|
|
202
|
-
}).should.eventually.eql(actual);
|
|
203
|
-
});
|
|
204
|
-
it('should not fix template size scale with default scale and image scale', async function () {
|
|
205
|
-
const actual = 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABwUlEQVR4AaXBPUsrQQCG0SeX+cBdkTjwTpG1NPgLpjY/fW1stt4UYmm2cJqwMCsaw70uJJ3CBc9Z/P3Cl+12S9u2tG1L27bEGLm/v2ez2bDZbJDEd/7wS4YT7z3X19fc3Nxwd3dHXdd47xnHkefnZ8ZxpKoq6rqmqiqMMcwMJ1VV0TQN0zThnOPj44O6rsk503UdkmiahqZpWK1WGGOYGU7quqZpGqy1SCLnTM6Z19dXcs5IYpomrLVI4uLigpnhpKoqVqsVkjgcDjw9PdF1HTlnuq5DEs45JHE4HDgznByPR97e3pimiVIK4zhyPB7x3hNCIITA5eUl3nsWiwVnhpNSCsMwsNvtGIaB/X5PKQVJpJSQxHq9RhLOOc4MJ9M0sdvt2G639H3PTBIxRiQhCUnEGLHWcmY4KaUwDAN93/P4+MhyuSSlhCRSSkjCOYe1FmstZ6bve2YvLy/s93tmy+USSUhCEpIIIfAd8/DwwOz9/Z1SCpJIKSGJ9XqNJJxz/MS0bcvs6uoKScQYkYQkJBFjxFrLT0zbtsxub29JKSGJlBKScM5hrcVay09MzplZjJHPz0+894QQCCHwP/7wS/8A4e6nAg+R8LwAAAAASUVORK5CYII=';
|
|
206
|
-
await f.fixImageTemplateScale(fixtures_1.TINY_PNG, {
|
|
207
|
-
defaultImageTemplateScale: 4.0,
|
|
208
|
-
fixImageTemplateScale: false,
|
|
209
|
-
xScale: 1.5, yScale: 1.5
|
|
210
|
-
}).should.eventually.eql(actual);
|
|
211
|
-
});
|
|
212
|
-
it('should not fix template size scale because of ignoreDefaultImageTemplateScale', async function () {
|
|
213
|
-
await f.fixImageTemplateScale(fixtures_1.TINY_PNG, {
|
|
214
|
-
defaultImageTemplateScale: 4.0,
|
|
215
|
-
ignoreDefaultImageTemplateScale: true,
|
|
216
|
-
}).should.eventually.eql(fixtures_1.TINY_PNG);
|
|
217
|
-
});
|
|
218
|
-
it('should ignore defaultImageTemplateScale to fix template size scale because of ignoreDefaultImageTemplateScale', async function () {
|
|
219
|
-
const actual = 'iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAWElEQVR4AU3BQRWAQAhAwa/PGBsEgrC16AFBKEIPXW7OXO+Rmey9iQjMjHFzrLUwM7qbqmLcHKpKRFBVuDvj4agq3B1VRUQYT2bS3QwRQVUZF/CaGRHB3wc1vSZbHO5+BgAAAABJRU5ErkJggg==';
|
|
220
|
-
await f.fixImageTemplateScale(fixtures_1.TINY_PNG, {
|
|
221
|
-
defaultImageTemplateScale: 4.0,
|
|
222
|
-
ignoreDefaultImageTemplateScale: true,
|
|
223
|
-
fixImageTemplateScale: true,
|
|
224
|
-
xScale: 1.5, yScale: 1.5
|
|
225
|
-
}).should.eventually.eql(actual);
|
|
226
|
-
});
|
|
227
|
-
});
|
|
228
|
-
describe('ensureTemplateSize', function () {
|
|
229
|
-
const d = new PluginDriver();
|
|
230
|
-
const f = new finder_1.default(d);
|
|
231
|
-
it('should not resize the template if it is smaller than the screen', async function () {
|
|
232
|
-
const screen = fixtures_1.TINY_PNG_DIMS.map((n) => n * 2);
|
|
233
|
-
await f.ensureTemplateSize(fixtures_1.TINY_PNG, ...screen)
|
|
234
|
-
.should.eventually.eql(fixtures_1.TINY_PNG);
|
|
235
|
-
});
|
|
236
|
-
it('should not resize the template if it is the same size as the screen', async function () {
|
|
237
|
-
await f.ensureTemplateSize(fixtures_1.TINY_PNG, ...fixtures_1.TINY_PNG_DIMS)
|
|
238
|
-
.should.eventually.eql(fixtures_1.TINY_PNG);
|
|
239
|
-
});
|
|
240
|
-
it('should resize the template if it is bigger than the screen', async function () {
|
|
241
|
-
const screen = fixtures_1.TINY_PNG_DIMS.map((n) => n / 2);
|
|
242
|
-
const newTemplate = await f.ensureTemplateSize(fixtures_1.TINY_PNG, ...screen);
|
|
243
|
-
newTemplate.should.not.eql(fixtures_1.TINY_PNG);
|
|
244
|
-
newTemplate.length.should.be.below(fixtures_1.TINY_PNG.length);
|
|
245
|
-
});
|
|
246
|
-
});
|
|
247
|
-
describe('getScreenshotForImageFind', function () {
|
|
248
|
-
let d;
|
|
249
|
-
let f;
|
|
250
|
-
beforeEach(function () {
|
|
251
|
-
d = new PluginDriver();
|
|
252
|
-
f = new finder_1.default(d);
|
|
253
|
-
sinon_1.default.stub(d, 'getScreenshot').returns(fixtures_1.TINY_PNG);
|
|
254
|
-
});
|
|
255
|
-
it('should fail if driver does not support getScreenshot', async function () {
|
|
256
|
-
const d = new base_driver_1.default();
|
|
257
|
-
const f = new finder_1.default(d);
|
|
258
|
-
await f.getScreenshotForImageFind()
|
|
259
|
-
.should.eventually.be.rejectedWith(/driver does not support/);
|
|
260
|
-
});
|
|
261
|
-
it('should not adjust or verify screenshot if asked not to by settings', async function () {
|
|
262
|
-
await d.settings.update({ fixImageFindScreenshotDims: false });
|
|
263
|
-
const screen = fixtures_1.TINY_PNG_DIMS.map((n) => n + 1);
|
|
264
|
-
const { b64Screenshot, scale } = await f.getScreenshotForImageFind(...screen);
|
|
265
|
-
b64Screenshot.should.eql(fixtures_1.TINY_PNG);
|
|
266
|
-
should.equal(scale, undefined);
|
|
267
|
-
});
|
|
268
|
-
it('should return screenshot without adjustment if it matches screen size', async function () {
|
|
269
|
-
const { b64Screenshot, scale } = await f.getScreenshotForImageFind(...fixtures_1.TINY_PNG_DIMS);
|
|
270
|
-
b64Screenshot.should.eql(fixtures_1.TINY_PNG);
|
|
271
|
-
should.equal(scale, undefined);
|
|
272
|
-
});
|
|
273
|
-
it('should return scaled screenshot with same aspect ratio if matching screen aspect ratio', async function () {
|
|
274
|
-
const screen = fixtures_1.TINY_PNG_DIMS.map((n) => n * 1.5);
|
|
275
|
-
const { b64Screenshot, scale } = await f.getScreenshotForImageFind(...screen);
|
|
276
|
-
b64Screenshot.should.not.eql(fixtures_1.TINY_PNG);
|
|
277
|
-
const screenshotObj = await support_1.imageUtil.getJimpImage(b64Screenshot);
|
|
278
|
-
screenshotObj.bitmap.width.should.eql(screen[0]);
|
|
279
|
-
screenshotObj.bitmap.height.should.eql(screen[1]);
|
|
280
|
-
scale.should.eql({ xScale: 1.5, yScale: 1.5 });
|
|
281
|
-
});
|
|
282
|
-
it('should return scaled screenshot with different aspect ratio if not matching screen aspect ratio', async function () {
|
|
283
|
-
// try first with portrait screen, screen = 8 x 12
|
|
284
|
-
let screen = [fixtures_1.TINY_PNG_DIMS[0] * 2, fixtures_1.TINY_PNG_DIMS[1] * 3];
|
|
285
|
-
let expectedScale = { xScale: 2.67, yScale: 4 };
|
|
286
|
-
const { b64Screenshot, scale } = await f.getScreenshotForImageFind(...screen);
|
|
287
|
-
b64Screenshot.should.not.eql(fixtures_1.TINY_PNG);
|
|
288
|
-
let screenshotObj = await support_1.imageUtil.getJimpImage(b64Screenshot);
|
|
289
|
-
screenshotObj.bitmap.width.should.eql(screen[0]);
|
|
290
|
-
screenshotObj.bitmap.height.should.eql(screen[1]);
|
|
291
|
-
scale.xScale.toFixed(2).should.eql(expectedScale.xScale.toString());
|
|
292
|
-
scale.yScale.should.eql(expectedScale.yScale);
|
|
293
|
-
// then with landscape screen, screen = 12 x 8
|
|
294
|
-
screen = [fixtures_1.TINY_PNG_DIMS[0] * 3, fixtures_1.TINY_PNG_DIMS[1] * 2];
|
|
295
|
-
expectedScale = { xScale: 4, yScale: 2.67 };
|
|
296
|
-
const { b64Screenshot: newScreen, scale: newScale } = await f.getScreenshotForImageFind(...screen);
|
|
297
|
-
newScreen.should.not.eql(fixtures_1.TINY_PNG);
|
|
298
|
-
screenshotObj = await support_1.imageUtil.getJimpImage(newScreen);
|
|
299
|
-
screenshotObj.bitmap.width.should.eql(screen[0]);
|
|
300
|
-
screenshotObj.bitmap.height.should.eql(screen[1]);
|
|
301
|
-
newScale.xScale.should.eql(expectedScale.xScale);
|
|
302
|
-
newScale.yScale.toFixed(2).should.eql(expectedScale.yScale.toString());
|
|
303
|
-
});
|
|
304
|
-
it('should return scaled screenshot with different aspect ratio if not matching screen aspect ratio with fixImageTemplateScale', async function () {
|
|
305
|
-
// try first with portrait screen, screen = 8 x 12
|
|
306
|
-
let screen = [fixtures_1.TINY_PNG_DIMS[0] * 2, fixtures_1.TINY_PNG_DIMS[1] * 3];
|
|
307
|
-
let expectedScale = { xScale: 2.67, yScale: 4 };
|
|
308
|
-
const { b64Screenshot, scale } = await f.getScreenshotForImageFind(...screen);
|
|
309
|
-
b64Screenshot.should.not.eql(fixtures_1.TINY_PNG);
|
|
310
|
-
let screenshotObj = await support_1.imageUtil.getJimpImage(b64Screenshot);
|
|
311
|
-
screenshotObj.bitmap.width.should.eql(screen[0]);
|
|
312
|
-
screenshotObj.bitmap.height.should.eql(screen[1]);
|
|
313
|
-
scale.xScale.toFixed(2).should.eql(expectedScale.xScale.toString());
|
|
314
|
-
scale.yScale.should.eql(expectedScale.yScale);
|
|
315
|
-
// 8 x 12 stretched TINY_PNG
|
|
316
|
-
await f.fixImageTemplateScale(b64Screenshot, { fixImageTemplateScale: true, scale })
|
|
317
|
-
.should.eventually.eql('iVBORw0KGgoAAAANSUhEUgAAAAgAAAAMCAYAAABfnvydAAAAJ0lEQVR4AYXBAQEAIACDMKR/p0fTBrKdbZcPCRIkSJAgQYIECRIkPAzBA1TpeNwZAAAAAElFTkSuQmCC');
|
|
318
|
-
// then with landscape screen, screen = 12 x 8
|
|
319
|
-
screen = [fixtures_1.TINY_PNG_DIMS[0] * 3, fixtures_1.TINY_PNG_DIMS[1] * 2];
|
|
320
|
-
expectedScale = { xScale: 4, yScale: 2.67 };
|
|
321
|
-
const { b64Screenshot: newScreen, scale: newScale } = await f.getScreenshotForImageFind(...screen);
|
|
322
|
-
newScreen.should.not.eql(fixtures_1.TINY_PNG);
|
|
323
|
-
screenshotObj = await support_1.imageUtil.getJimpImage(newScreen);
|
|
324
|
-
screenshotObj.bitmap.width.should.eql(screen[0]);
|
|
325
|
-
screenshotObj.bitmap.height.should.eql(screen[1]);
|
|
326
|
-
newScale.xScale.should.eql(expectedScale.xScale);
|
|
327
|
-
newScale.yScale.toFixed(2).should.eql(expectedScale.yScale.toString());
|
|
328
|
-
// 12 x 8 stretched TINY_PNG
|
|
329
|
-
await f.fixImageTemplateScale(newScreen, { fixImageTemplateScale: true, scale })
|
|
330
|
-
.should.eventually.eql('iVBORw0KGgoAAAANSUhEUgAAAAwAAAAICAYAAADN5B7xAAAAI0lEQVR4AZXBAQEAMAyDMI5/T5W2ayB5245AIokkkkgiiST6+W4DTLyo5PUAAAAASUVORK5CYII=');
|
|
331
|
-
});
|
|
332
|
-
});
|
|
333
|
-
});
|
|
334
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"finder-specs.js","sourceRoot":"","sources":["../../../test/unit/finder-specs.js"],"names":[],"mappings":"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"}
|