chore(appium): query state of app before trying to close

Satellite-im · Mar 19, 2024 · d0ba280 · d0ba280
1 parent 67d44b3
commit d0ba280
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 33 deletions.
diff --git a/config/wdio.mac.app.conf.ts b/config/wdio.mac.app.conf.ts
@@ -147,12 +147,28 @@ export const config: WebdriverIO.Config = {
         allureReporter.addAttachment(imageTitle, data, "image/png");
 
         // Close application if still open
-        await driver.executeScript("macos: terminateApp", [
-          {
-            bundleId: MACOS_BUNDLE_ID,
-          },
-        ]);
+        await terminateApplication(MACOS_BUNDLE_ID);
       }
     },
   },
 };
+
+export async function terminateApplication(bundle: string) {
+  const appState = await queryAppStateMacOS(bundle);
+  if (appState !== 1) {
+    await driver.executeScript("macos: terminateApp", [
+      {
+        bundleId: bundle,
+      },
+    ]);
+  }
+}
+
+export async function queryAppStateMacOS(bundle: string) {
+  const queryAppState = await driver.executeScript("macos: queryAppState", [
+    {
+      bundleId: bundle,
+    },
+  ]);
+  return queryAppState;
+}
diff --git a/config/wdio.mac.ci.conf.ts b/config/wdio.mac.ci.conf.ts
@@ -151,12 +151,28 @@ export const config: WebdriverIO.Config = {
         allureReporter.addAttachment(imageTitle, dataImage, "image/png");
 
         // Close application if still open
-        await driver.executeScript("macos: terminateApp", [
-          {
-            bundleId: MACOS_BUNDLE_ID,
-          },
-        ]);
+        await terminateApplication(MACOS_BUNDLE_ID);
       }
     },
   },
 };
+
+export async function terminateApplication(bundle: string) {
+  const appState = await queryAppStateMacOS(bundle);
+  if (appState !== 1) {
+    await driver.executeScript("macos: terminateApp", [
+      {
+        bundleId: bundle,
+      },
+    ]);
+  }
+}
+
+export async function queryAppStateMacOS(bundle: string) {
+  const queryAppState = await driver.executeScript("macos: queryAppState", [
+    {
+      bundleId: bundle,
+    },
+  ]);
+  return queryAppState;
+}
diff --git a/config/wdio.mac.multiremote.conf.ts b/config/wdio.mac.multiremote.conf.ts
@@ -151,36 +151,36 @@ export const config: WebdriverIO.Config = {
         allureReporter.addAttachment(imageTitle, data, "image/png");
 
         // Close applications if open
-        await driver.executeScript("macos: terminateApp", [
-          {
-            bundleId: MACOS_USER_A_BUNDLE_ID,
-          },
-        ]);
-        await driver.executeScript("macos: terminateApp", [
-          {
-            bundleId: MACOS_USER_B_BUNDLE_ID,
-          },
-        ]);
-        await driver.executeScript("macos: terminateApp", [
-          {
-            bundleId: MACOS_USER_C_BUNDLE_ID,
-          },
-        ]);
+        await terminateApplication(MACOS_USER_A_BUNDLE_ID);
+        await terminateApplication(MACOS_USER_B_BUNDLE_ID);
+        await terminateApplication(MACOS_USER_C_BUNDLE_ID);
       }
     },
   },
 
   afterSuite: async function (suite) {
     // Close second and third applications if open
+    await terminateApplication(MACOS_USER_B_BUNDLE_ID);
+    await terminateApplication(MACOS_USER_C_BUNDLE_ID);
+  },
+};
+
+export async function terminateApplication(bundle: string) {
+  const appState = await queryAppStateMacOS(bundle);
+  if (appState !== 1) {
     await driver.executeScript("macos: terminateApp", [
       {
-        bundleId: MACOS_USER_B_BUNDLE_ID,
-      },
-    ]);
-    await driver.executeScript("macos: terminateApp", [
-      {
-        bundleId: MACOS_USER_C_BUNDLE_ID,
+        bundleId: bundle,
       },
     ]);
-  },
-};
+  }
+}
+
+export async function queryAppStateMacOS(bundle: string) {
+  const queryAppState = await driver.executeScript("macos: queryAppState", [
+    {
+      bundleId: bundle,
+    },
+  ]);
+  return queryAppState;
+}