Fix capability checks for skipReport (#1120)

* Fix capability checks for skipReport

* bump up version for release

package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-device-farm",
-  "version": "8.4.7-rc.31",
+  "version": "8.4.7-rc.32",
   "description": "An appium 2.0 plugin that manages and create driver session on available devices",
   "main": "./lib/src/main.js",
   "scripts": {

src/CapabilityManager.ts

@@ -34,8 +34,9 @@ function deleteAlwaysMatch(caps: ISessionCapability, capabilityName: string) {
 }
 
 async function findAppPath(caps: any) {
-  if (caps.firstMatch[0]['df:skipReport']) return;
-  const fileName = _.has(caps, 'alwaysMatch') ? caps.alwaysMatch['appium:app'] : caps.firstMatch[0]['appium:app'];
+  const mergedCaps = Object.assign({}, caps.firstMatch ? caps.firstMatch[0] : {}, caps.alwaysMatch);
+  if (mergedCaps['df:skipReport']) return;
+  const fileName = mergedCaps['appium:app'];
   if (fileName?.startsWith('file')) {
     const appInfo: any = await prisma.appInformation.findFirst({
       where: { uploadedFileName: fileName as string },

src/plugin.ts

@@ -290,6 +290,7 @@ class DevicePlugin extends BasePlugin {
     } = caps;
     stripAppiumPrefixes(requiredCaps);
     stripAppiumPrefixes(allFirstMatchCaps);
+    const mergedCapabilites = Object.assign({}, caps.firstMatch[0], caps.alwaysMatch);
     await addNewPendingSession({
       ...Object.assign({}, caps.firstMatch[0], caps.alwaysMatch),
       capability_id: pendingSessionId,
@@ -376,7 +377,7 @@ class DevicePlugin extends BasePlugin {
       if (isRemoteOrCloudSession) {
         addProxyHandler(sessionId, device.host);
       }
-      if (!caps.alwaysMatch['df:skipReport']) {
+      if (!mergedCapabilites['df:skipReport']) {
         log.info('Skipping dashboard report');
         await EventBus.fire(
           new SessionCreatedEvent({