merge firstMatch and alwaysMatch

saikrishna321 · saikrishna321 · commit 0c65ec11fc87 · 2021-05-10T00:22:47.000+05:30
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "appium-device-farm",
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.6",
   "description": "An appium 2.0 plugin that manages and create driver session on available devices",
   "main": "./lib/index.js",
   "scripts": {
diff --git a/src/plugin.js b/src/plugin.js
@@ -14,7 +14,7 @@ export default class DevicePlugin extends BasePlugin {
   async createSession(next, driver, jwpDesCaps, jwpReqCaps, caps) {
     let freeDevice;
     await this.commandsQueueGuard.acquire('DeviceManager', async function () {
-      let firstMatch = caps.firstMatch[0];
+      let firstMatch = Object.assign({}, caps.firstMatch[0], caps.alwaysMatch);
       devices = await fetchDevices();
       let firstMatchPlatform = firstMatch['platformName'];
       freeDevice = devices.getFreeDevice(firstMatchPlatform);

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "appium-device-farm",`
`3`		`- "version": "1.0.0-beta.5",`
	`3`	`+ "version": "1.0.0-beta.6",`
`4`	`4`	`"description": "An appium 2.0 plugin that manages and create driver session on available devices",`
`5`	`5`	`"main": "./lib/index.js",`
`6`	`6`	`"scripts": {`