(#324) Updated assert to handle valid find parameter types

Author: s1hofmann

Diff for: lib/assert.class.ts

@@ -1,37 +1,42 @@
 import {LocationParameters} from "./locationparameters.class";
 import {Region} from "./region.class";
 import {ScreenClass} from "./screen.class";
+import {FirstArgumentType} from "./typings";
 
 export class AssertClass {
     constructor(private screen: ScreenClass) {
     }
 
-    public async isVisible(pathToNeedle: string, searchRegion?: Region, confidence?: number) {
+    public async isVisible(needle: FirstArgumentType<typeof ScreenClass.prototype.find>, searchRegion?: Region, confidence?: number) {
+        const identifier = (typeof needle === "string") ? needle : (await needle).id;
+
         try {
             await this.screen.find(
-                pathToNeedle,
+                needle,
                 {searchRegion, confidence} as LocationParameters,
             );
         } catch (err) {
             if (searchRegion !== undefined) {
                 throw new Error(
-                    `Element '${pathToNeedle}' not found in region ${searchRegion.toString()}. Reason: ${err}`,
+                    `Element '${identifier}' not found in region ${searchRegion.toString()}. Reason: ${err}`,
                 );
             } else {
-                throw new Error(`Element '${pathToNeedle}' not found. Reason: ${err}`);
+                throw new Error(`Element '${identifier}' not found. Reason: ${err}`);
             }
         }
     }
 
-    public async notVisible(pathToNeedle: string, searchRegion?: Region, confidence?: number) {
+    public async notVisible(needle: FirstArgumentType<typeof ScreenClass.prototype.find>, searchRegion?: Region, confidence?: number) {
+        const identifier = (typeof needle === "string") ? needle : (await needle).id;
+
         try {
             await this.screen.find(
-                pathToNeedle,
+                needle,
                 {searchRegion, confidence} as LocationParameters,
             );
         } catch (err) {
             return;
         }
-        throw new Error(`'${pathToNeedle}' is visible`);
+        throw new Error(`'${identifier}' is visible`);
     }
 }