From f1c91a4ce05d73a6fedc4ec6d31ba3e9fb4268db Mon Sep 17 00:00:00 2001 From: saikrishna321 Date: Mon, 5 Feb 2024 22:48:18 +0800 Subject: [PATCH] Update test to consider df:options as object and also df: caps --- src/CapabilityManager.ts | 1 - src/modules | 2 +- src/plugin.ts | 1 - test/e2e/android/conf.spec.js | 6 ++++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/CapabilityManager.ts b/src/CapabilityManager.ts index ac813f724..4b79cec45 100644 --- a/src/CapabilityManager.ts +++ b/src/CapabilityManager.ts @@ -85,6 +85,5 @@ export function getDeviceFarmCapabilities(caps: ISessionCapability) { }, {} as Record, ); - return _.merge(deviceFarmOptions, individualCapabilities); } diff --git a/src/modules b/src/modules index 68fac6e03..46ce9029b 160000 --- a/src/modules +++ b/src/modules @@ -1 +1 @@ -Subproject commit 68fac6e0389478452989b9a05dcfccd7236b6dc9 +Subproject commit 46ce9029bf7e8ebf845fbe5ff3c18aa5350334d8 diff --git a/src/plugin.ts b/src/plugin.ts index 07706fadd..f8fdc5239 100644 --- a/src/plugin.ts +++ b/src/plugin.ts @@ -337,7 +337,6 @@ class DevicePlugin extends BasePlugin { const sessionId = (session as CreateSessionResponseInternal).value[0]; const sessionResponse = (session as CreateSessionResponseInternal).value[1]; const deviceFarmCapabilities = getDeviceFarmCapabilities(caps); - log.info(`📱 Device UDID ${device.udid} blocked for session ${sessionId}`); await updatedAllocatedDevice(device, { busy: true, diff --git a/test/e2e/android/conf.spec.js b/test/e2e/android/conf.spec.js index c84ebf050..11495057b 100644 --- a/test/e2e/android/conf.spec.js +++ b/test/e2e/android/conf.spec.js @@ -13,8 +13,10 @@ const capabilities = { platformName: 'Android', 'appium:uiautomator2ServerInstallTimeout': '50000', 'appium:automationName': 'UIAutomator2', - 'appium:build': 'DeviceFarm BuildName 2', - 'appium:record_video': true, + 'df:build': 'DeviceFarm BuildName 4', + 'df:options': { + record_video: true, + }, 'appium:app': 'https://github.com/AppiumTestDistribution/appium-demo/blob/main/VodQA.apk?raw=true', };