@artilleryio/int-core 2.2.0-a4feb0d → 2.2.0-c1dac36

package/lib/engine_socketio.js

@@ -52,7 +52,9 @@ function markEndTime(ee, _, startedAt) {
 }
 
 function isResponseRequired(spec) {
-  return spec.emit && spec.response && spec.response.channel;
+  return (
+    spec.emit && spec.response && (spec.response.channel || spec.response.on)
+  );
 }
 
 function isAcknowledgeRequired(spec) {
@@ -60,8 +62,20 @@ function isAcknowledgeRequired(spec) {
 }
 
 function processResponse(ee, data, response, context, callback) {
+  function isValid(data, response) {
+    if (!Array.isArray(response.data)) {
+      //`json` key is added at some point to the response.data object, to use with `captureOrMatch` function
+      //we should omit it when comparing the response to the data
+      const responseDataWithoutJson = _.isObject(response.data)
+        ? _.omit(response.data, 'json')
+        : response.data;
+      return deepEqual(data[0], responseDataWithoutJson);
+    }
+
+    return deepEqual(data, response.data);
+  }
   // Do we have supplied data to validate?
-  if (response.data && !deepEqual(data, response.data)) {
+  if (response.data && !isValid(data, response)) {
     debug('data is not valid:');
     debug(data);
     debug(response);
@@ -186,9 +200,12 @@ SocketIoEngine.prototype.step = function (requestSpec, ee) {
       }
 
       if (isAcknowledgeRequired(requestSpec)) {
-        const ackCallback = function () {
+        const ackCallback = function (...args) {
           const response = {
-            data: template(requestSpec.acknowledge.data, context),
+            data: template(
+              requestSpec.acknowledge.data || requestSpec.acknowledge.args,
+              context
+            ),
             capture: template(requestSpec.acknowledge.capture, context),
             match: template(requestSpec.acknowledge.match, context)
           };
@@ -198,8 +215,9 @@ SocketIoEngine.prototype.step = function (requestSpec, ee) {
               r.json = '$.0'; // Default to the first callback argument
             }
           });
+
           // Acknowledge data can take up multiple arguments of the emit callback
-          processResponse(ee, arguments, response, context, function (err) {
+          processResponse(ee, args, response, context, function (err) {
             if (!err) {
               markEndTime(ee, context, startedAt);
             }
@@ -225,8 +243,14 @@ SocketIoEngine.prototype.step = function (requestSpec, ee) {
 
     if (isResponseRequired(requestSpec)) {
       const response = {
-        channel: template(requestSpec.response.channel, context),
-        data: template(requestSpec.response.data, context),
+        channel: template(
+          requestSpec.response.channel || requestSpec.response.on,
+          context
+        ),
+        data: template(
+          requestSpec.response.data || requestSpec.response.args,
+          context
+        ),
         capture: template(requestSpec.response.capture, context),
         match: template(requestSpec.response.match, context)
       };
@@ -234,9 +258,9 @@ SocketIoEngine.prototype.step = function (requestSpec, ee) {
       // Listen for the socket.io response on the specified channel
       let done = false;
 
-      socketio.on(response.channel, function receive(data) {
+      socketio.on(response.channel, function receive(...args) {
         done = true;
-        processResponse(ee, data, response, context, function (err) {
+        processResponse(ee, args, response, context, function (err) {
           if (!err) {
             markEndTime(ee, context, startedAt);
           }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@artilleryio/int-core",
-  "version": "2.2.0-a4feb0d",
+  "version": "2.2.0-c1dac36",
   "main": "./index.js",
   "license": "MPL-2.0",
   "dependencies": {
-    "@artilleryio/int-commons": "2.0.2-a4feb0d",
+    "@artilleryio/int-commons": "2.0.2-c1dac36",
     "@artilleryio/sketches-js": "^2.1.1",
     "agentkeepalive": "^4.1.0",
     "arrivals": "^2.1.2",