Merge pull request #1421 from blackflux/dev

[Gally]: master <- dev

Author: simlu

src/modules/request-recorder.js

@@ -178,10 +178,9 @@ export default (opts) => {
             scope.filteringRequestBody = (body) => {
               if (anyFlagPresent(['magic', 'body'])) {
                 const idx = pendingMocks.findIndex((m) => m.idx === scopeIdx);
-                const requestBody = tryParseJson(body);
-                const requestBodyStr = nullAsString(requestBody);
-                if (!isEqual(scope.body, requestBodyStr)) {
-                  pendingMocks[idx].record.body = requestBodyStr;
+                const requestBody = nullAsString(tryParseJson(body));
+                if (!isEqual(scope.body, requestBody)) {
+                  pendingMocks[idx].record.body = requestBody;
                 }
                 return scope.body;
               }
@@ -215,6 +214,18 @@ export default (opts) => {
                 interceptor.delayBody(pendingMocks[idx].record.delayBody);
               }
 
+              const hasSentBody = requestBodyString !== undefined;
+              // eslint-disable-next-line no-underscore-dangle
+              const hasRecordBody = interceptor._requestBody !== undefined;
+              if (hasSentBody !== hasRecordBody) {
+                if (anyFlagPresent(['magic', 'body'])) {
+                  pendingMocks[idx].record.body = nullAsString(tryParseJson(requestBodyString));
+                } else {
+                  // eslint-disable-next-line no-param-reassign
+                  interceptor.errorMessage = 'Recording body mismatch';
+                }
+              }
+
               if (anyFlagPresent(['magic', 'headers'])) {
                 // add new headers
                 const reqheaders = {

src/modules/request-recorder/apply-modifiers.js

@@ -9,9 +9,7 @@ export default (input, modifiers) => {
         const unknownModifiers = modifierNames
           .filter((n) => typeof modifiers[n] !== 'function');
         if (unknownModifiers.length !== 0) {
-          // eslint-disable-next-line no-console
-          console.warn(`Unknown Modifier(s) detected: ${unknownModifiers.join(', ')}`);
-          return;
+          throw new Error(`Unknown Modifier(s) detected: ${unknownModifiers.join(', ')}`);
         }
         // eslint-disable-next-line no-param-reassign
         delete parent[k];

test/modules/request-recorder.spec.js

@@ -186,7 +186,7 @@ describe('Testing RequestRecorder', { useTmpDir: true, timestamp: 0 }, () => {
       expect(recorder.get()).to.deep.equal([]);
     });
 
-    it('Testing unknown modifiers (top level)', async ({ recorder }) => {
+    it('Testing unknown modifiers (top level)', async ({ capture }) => {
       prepareCassette({
         'response|jsonStringify|toBase64': {},
         'body|jsonStringify|toBase64': {
@@ -195,18 +195,19 @@ describe('Testing RequestRecorder', { useTmpDir: true, timestamp: 0 }, () => {
           }
         }
       });
-      await validate({
+      const err = await capture(() => validate({
         json: true,
-        body: undefined,
-        response: ''
-      });
-      expect(recorder.get()).to.deep.equal([
-        'Unknown Modifier(s) detected: jsonStringify, toBase64',
-        'Unknown Modifier(s) detected: jsonStringify, toBase64'
-      ]);
+        body: {
+          payload: {
+            key: 'value'
+          }
+        },
+        response: {}
+      }));
+      expect(err.message).to.deep.equal('Unknown Modifier(s) detected: jsonStringify, toBase64');
     });
 
-    it('Testing unknown modifiers (nested)', async ({ recorder }) => {
+    it('Testing unknown modifiers (nested)', async ({ capture }) => {
       prepareCassette({
         response: {},
         body: {
@@ -215,18 +216,17 @@ describe('Testing RequestRecorder', { useTmpDir: true, timestamp: 0 }, () => {
           }
         }
       });
-      await validate({
+
+      const err = await capture(() => validate({
         json: true,
         body: {
-          'payload|jsonStringify|toBase64': {
+          payload: {
             key: 'value'
           }
         },
         response: {}
-      });
-      expect(recorder.get()).to.deep.equal([
-        'Unknown Modifier(s) detected: jsonStringify, toBase64'
-      ]);
+      }));
+      expect(err.message).to.deep.equal('Unknown Modifier(s) detected: jsonStringify, toBase64');
     });
   });
 
@@ -317,6 +317,41 @@ describe('Testing RequestRecorder', { useTmpDir: true, timestamp: 0 }, () => {
       await runner('body', { body: null });
     });
 
+    it('Testing body healing with missing body', async () => {
+      await runner('body', {
+        body: {},
+        cassetteContent: [
+          {
+            scope: server.uri,
+            method: 'GET',
+            path: '/?q=1',
+            status: 200,
+            reqheaders: {},
+            response: { data: '1' },
+            responseIsBinary: false
+          }
+        ]
+      });
+    });
+
+    it('Testing missing body error', async ({ capture }) => {
+      const err = await capture(() => runner(false, {
+        body: {},
+        cassetteContent: [
+          {
+            scope: server.uri,
+            method: 'GET',
+            path: '/?q=1',
+            status: 200,
+            reqheaders: {},
+            response: { data: '1' },
+            responseIsBinary: false
+          }
+        ]
+      }));
+      expect(err.message).to.deep.equal('Recording body mismatch');
+    });
+
     it('Testing body healing with mismatched request method', async () => {
       await runner('body', { raises: true, heals: false, method: 'POST' });
     });