testdriverai 4.0.29 → 4.0.31

package/lib/commands.js

@@ -190,7 +190,41 @@ const scroll = async(direction = 'down', amount = 300) => {
   }
 }
 
+// perform a mouse click
+const click = async(x, y, button = 'left', click = 'single') => {
+
+  await redraw.start();
+
+  log('debug', chalk.dim(`${click} ${button} clicking at ${x}, ${y}...`), true) 
+
+  x = parseInt(x);
+  y = parseInt(y);
+
+  let double = click == 'double' ? true : false;
+  robot.moveMouseSmooth(x, y, .1);
+  await delay(1000); // wait for the mouse to move
+  robot.mouseClick(button, double);
+  await redraw.wait(2000);
+  return;
+};
+
+const hover = async(x, y) => {
+
+  await redraw.start();
+
+  x = parseInt(x);
+  y = parseInt(y);
+
+  await robot.moveMouseSmooth(x, y, .1);
+  await redraw.wait(2000);
+
+  return;
+}
+
 let commands = {
+  scroll: scroll,
+  click: click,
+  hover: hover,
     // method, levenshein, dice, or combined
     // leven = this is turbo, all around good for text similarity
     // dice = this is good for short strings, but not as good for long strings
@@ -248,35 +282,6 @@ let commands = {
     }
 
   },
-  // perform a mouse click
-  click: async(x, y, button = 'left', click = 'single') => {
-
-    await redraw.start();
-  
-    log('debug', chalk.dim(`${click} ${button} clicking at ${x}, ${y}...`), true) 
-  
-    x = parseInt(x);
-    y = parseInt(y);
-  
-    let double = click == 'double' ? true : false;
-    robot.moveMouseSmooth(x, y, .1);
-    await delay(1000); // wait for the mouse to move
-    robot.mouseClick(button, double);
-    await redraw.wait(2000);
-    return;
-  },
-  hover: async(x, y) => {
-
-    await redraw.start();
-  
-    x = parseInt(x);
-    y = parseInt(y);
-  
-    await robot.moveMouseSmooth(x, y, .1);
-    await redraw.wait(2000);
-  
-    return;
-  },
   "match-image": async(relativePath, action = 'click', button = 'left', clickType = 'single') => {
 
     let image = await captureScreenPNG()
@@ -289,7 +294,11 @@ let commands = {
       throw new AiError(`Image not found: ${relativePath}`)
     } else {
 
-      await routeClick(result.centerX * displayMultiple, result.centerY * displayMultiple, action, button, clickType);
+      if (action === 'click') {
+        await click(result.centerX * displayMultiple, result.centerY * displayMultiple, button, clickType);
+      } else if (action === 'hover') {
+        await hover(result.centerX * displayMultiple, result.centerY * displayMultiple);
+      }
     }
     
   },
@@ -435,7 +444,6 @@ let commands = {
     }
 
   },
-  scroll,
   "scroll-until-text": async(text, direction = 'down', maxDistance = 1200, method = 'ai') => {
 
     await redraw.start();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testdriverai",
-  "version": "4.0.29",
+  "version": "4.0.31",
   "description": "Next generation autonomous AI agent for end-to-end testing of web & desktop",
   "main": "index.js",
   "bin": {