testdriverai 4.0.20 → 4.0.22

package/lib/commands.js

@@ -27,6 +27,9 @@ class AiError extends Error {
     this.attachScreenshot = attatchScreenshot;
   }
 }
+
+const commandOrControl = process.platform === 'darwin' ? 'command' : 'control';
+
 const findImageOnScreen = async (relativePath, haystack, restrictToWindow) => {
   let displayMultiple = await getDisplayMultiple();
 
@@ -176,11 +179,11 @@ const scroll = async(direction = 'down', amount = 300) => {
 
   switch (direction) {
     case 'up':
-      await robot.scrollMouse(0, amount);
+      await robot.keyTap("pageup");
       await redraw.wait(2000);
       break;
     case 'down':
-      await robot.scrollMouse(0, amount * -1);
+      await robot.keyTap("pagedown");
       await redraw.wait(2000);
       break;
     case 'left':
@@ -445,8 +448,7 @@ let commands = {
 
     try {
       // use robot to press CMD+F
-      await robot.keyTap('f', 'command');
-      await robot.keyTap('command');
+      await robot.keyTap('f', commandOrControl);
       // type the text
       await robot.typeString(text);
       await redraw.wait(2000);

package/lib/focus-application.js

@@ -6,11 +6,14 @@ const scriptPath = path.join(__dirname, "focusWindow.ps1");
 
 // apple script that focuses on a window
 const appleScriptShow = (windowName) => `
-tell application "${windowName}" to set miniaturized of every window to false
-`;
+tell application "System Events" to tell process "${windowName}"
+    set frontmost to true
+end tell`;
 
 const appleScriptHide = (windowName) => `
-tell application "${windowName}" to set miniaturized of every window to true`;
+tell application "System Events" to tell process "${windowName}"
+    set frontmost to false
+end tell`;
 
 async function focusApplication(appName) {
   try {

package/package.json

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