Skip to content

Commit 99aec20

Browse files
committed
(#547) Updated toShow to support full search parameters, added the possibility to pass a region to directly specify a search region instead of the whole screen
1 parent 2d53a82 commit 99aec20

File tree

1 file changed

+36
-19
lines changed

1 file changed

+36
-19
lines changed
Lines changed: 36 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,44 @@
11
import { FindInput, ScreenClass } from "../../screen.class";
22
import { OptionalSearchParameters } from "../../optionalsearchparameters.class";
3+
import { isRegion, Region } from "../../region.class";
4+
import { screen } from "../../../index";
35

4-
export const toShow = async (
5-
received: ScreenClass,
6+
export const toShow = async <PROVIDER_DATA>(
7+
received: ScreenClass | Region,
68
needle: FindInput,
7-
confidence?: number
9+
parameters?: OptionalSearchParameters<PROVIDER_DATA>,
810
) => {
9-
let locationParams;
10-
if (confidence) {
11-
locationParams = new OptionalSearchParameters();
12-
locationParams.confidence = confidence;
13-
}
1411
const identifier = (await needle).id;
15-
try {
16-
await received.find(needle, locationParams);
17-
return {
18-
message: () => `Expected screen to not show ${identifier}`,
19-
pass: true,
20-
};
21-
} catch (err) {
22-
return {
23-
message: () => `Screen is not showing ${identifier}: ${err}`,
24-
pass: false,
25-
};
12+
if (isRegion(received)) {
13+
if (parameters != null) {
14+
parameters.searchRegion = received;
15+
} else {
16+
parameters = { searchRegion: received };
17+
}
18+
try {
19+
await screen.find(needle, parameters);
20+
return {
21+
message: () => `Expected screen to not show ${identifier}`,
22+
pass: true,
23+
};
24+
} catch (err) {
25+
return {
26+
message: () => `Screen is not showing ${identifier}: ${err}`,
27+
pass: false,
28+
};
29+
}
30+
} else {
31+
try {
32+
await received.find(needle, parameters);
33+
return {
34+
message: () => `Expected screen to not show ${identifier}`,
35+
pass: true,
36+
};
37+
} catch (err) {
38+
return {
39+
message: () => `Screen is not showing ${identifier}: ${err}`,
40+
pass: false,
41+
};
42+
}
2643
}
2744
};

0 commit comments

Comments
 (0)