testdriverai 4.0.19 → 4.0.21

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();
 
@@ -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

@@ -2,14 +2,18 @@
 const path = require("path");
 const { execSync } = require("child_process");
 const { platform } = require("./system");
+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 {
@@ -20,7 +24,6 @@ async function focusApplication(appName) {
       // TODO: This needs fixing
       return await execSync(`wmctrl -a '${appName}'`);
     } else if (platform() == "windows") {
-      const scriptPath = path.join(__dirname, "focusWindow.ps1");
       return await execSync(`powershell "${scriptPath}" "${appName}" -Action "Show"`);
     }
 

package/package.json

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