fix: payload should include all expect options

Author: carowright

src/AmfHelperMixin.js

@@ -524,6 +524,16 @@ export const AmfHelperMixin = (base) => class extends base {
    * @returns {Payload[]|undefined} Payload model if defined.
    */
   _computePayload(expects) {
+    if (Array.isArray(expects)) {
+      let payload = []
+      for (const expect of expects) {
+        const expectPayload = this._computePropertyArray(expect, this.ns.aml.vocabularies.apiContract.payload)
+        if (expectPayload) {
+          payload = payload.concat(expectPayload)
+        }
+      }
+      return payload
+    }
     return this._computePropertyArray(expects, this.ns.aml.vocabularies.apiContract.payload);
   }
 

test/helper/amf-helper-mixin.test.js

@@ -1793,6 +1793,23 @@ describe('AmfHelperMixin', () => {
           });
           assert.equal(spy.args[0][1], element.ns.raml.vocabularies.apiContract.payload);
         });
+
+        it('Returns payloads of each element in array', () => {
+          const spy = sinon.spy(element, '_computePropertyArray');
+          const pKey = element._getAmfKey(element.ns.aml.vocabularies.apiContract.payload)
+          const expect = {
+            '@id': 'amf://1',
+            '@type': ['test'],
+            [pKey]: [
+              {
+                '@id': 'amf://2'
+              }
+            ]
+          }
+          const payloads = element._computePayload([expect, expect])
+          assert.equal(spy.args[0][1], element.ns.raml.vocabularies.apiContract.payload);
+          assert.lengthOf(payloads, 2);
+        });
       });
 
       describe('_computeReturns()', () => {