fix: uninstall wda with '.xctrunner' suffix for real device

lib/real-device-management.js

@@ -1,7 +1,7 @@
 import { utilities, services } from 'appium-ios-device';
 import IOSDeploy from './ios-deploy';
 import log from './logger';
-
+import _ from 'lodash';
 
 async function getConnectedDevices () {
   return await utilities.getConnectedDevices();
@@ -72,28 +72,27 @@ function getRealDeviceObj (udid) {
  */
 
 /**
- * @param {RealDevice} The real device object which has 'udid' attribute
- * @param {string} cFBundleName The name of CFBundleName in Info.plist
+ * @param {RealDevice} device The real device object which has 'udid' attribute
+ * @param {string} bundleName The name of CFBundleName in Info.plist
  *
  * @returns {Array<string>} A list of User level apps' bundle ids which has
- *                          'CFBundleName' attribute as 'cFBundleName'.
+ *                          'CFBundleName' attribute as 'bundleName'.
  */
-async function getIBundleIdsByCFBundleName (device, cFBundleName) {
+async function getBundleIdsByBundleName (device, bundleName) {
   const service = await services.startInstallationProxyService(device.udid);
   try {
     const applications = await service.listApplications({applicationType: 'User'});
-    const bundleIds = [];
-    for (const [key, value] of Object.entries(applications)) {
-      if (value.CFBundleName === cFBundleName) {
-        bundleIds.push(key);
+    return _.reduce(applications, (acc, {CFBundleName}, key) => {
+      if (CFBundleName === bundleName) {
+        acc.push(key);
       }
-    }
-    return bundleIds;
+      return acc;
+    }, []);
   } finally {
     service.close();
   }
 }
 
 
 export { getConnectedDevices, getOSVersion, runRealDeviceReset, installToRealDevice,
-  getRealDeviceObj, getIBundleIdsByCFBundleName };
+  getRealDeviceObj, getBundleIdsByBundleName };

lib/simulator-management.js

@@ -1,3 +1,4 @@
+import B from 'bluebird';
 import path from 'path';
 import { getSimulator } from 'appium-ios-simulator';
 import { createDevice, getDevices, terminate, shutdown } from 'node-simctl';
@@ -216,11 +217,11 @@ async function shutdownOtherSimulators (currentDevice) {
 
 async function getInstalledBundleIds (device, candidateBundleIds) {
   const bundleIds = [];
-  for (const bundleId of candidateBundleIds) {
+  await B.filter(candidateBundleIds, async (bundleId) => {
     if (await device.isAppInstalled(bundleId)) {
       bundleIds.push(bundleId);
     }
-  }
+  });
   return bundleIds;
 }
 

lib/wda/webdriveragent.js

@@ -1,3 +1,4 @@
+import B from 'bluebird';
 import _ from 'lodash';
 import path from 'path';
 import url from 'url';
@@ -12,7 +13,7 @@ import iProxy from './iproxy';
 import { exec } from 'teen_process';
 import AsyncLock from 'async-lock';
 import { BOOTSTRAP_PATH, WDA_BUNDLE_ID, WDA_RUNNER_BUNDLE_ID, checkForDependencies } from 'appium-webdriveragent';
-import { getIBundleIdsByCFBundleName } from '../real-device-management';
+import { getBundleIdsByBundleName } from '../real-device-management';
 import { getInstalledBundleIds } from '../simulator-management';
 
 const WDA_LAUNCH_TIMEOUT = 60 * 1000;
@@ -174,9 +175,9 @@ class WebDriverAgent {
       }
 
       log.debug(`Uninstalling WDAs: '${bundleIds}'`);
-      for (const bundleId of bundleIds) {
+      await B.each(bundleIds, async (bundleId) => {
         await this.device.removeApp(bundleId);
-      }
+      });
     } catch (e) {
       log.warn(`WebDriverAgent uninstall failed. Perhaps, it is already uninstalled? Original error: ${JSON.stringify(e)}`);
     }
@@ -422,7 +423,7 @@ class WebDriverAgent {
    */
   async getInstalledWDBundleId () {
     return this.isRealDevice
-      ? await getIBundleIdsByCFBundleName(this.device, WDA_CF_BUNDLE_NAME)
+      ? await getBundleIdsByBundleName(this.device, WDA_CF_BUNDLE_NAME)
       : await getInstalledBundleIds(this.device, [WDA_BUNDLE_ID, WDA_BUNDLE_ID_XCODE11]);
   }
 }