minor(vest): add skipped tests to result as well (ealush#600)

shani-arnon · May 11, 2021 · 0bb9347 · 0bb9347
1 parent 72b3e40
commit 0bb9347
Show file tree

Hide file tree

Showing 20 changed files with 419 additions and 90 deletions.
diff --git a/packages/vest/src/__tests__/__snapshots__/infra.test.js.snap b/packages/vest/src/__tests__/__snapshots__/infra.test.js.snap
@@ -76,11 +76,21 @@ Object {
   "name": "inventore-quis-impedit",
   "testCount": 1,
   "tests": Object {
+    "autem": Object {
+      "errorCount": 0,
+      "testCount": 0,
+      "warnCount": 0,
+    },
     "doloribus-enim-quisquam": Object {
       "errorCount": 0,
       "testCount": 1,
       "warnCount": 0,
     },
+    "soluta": Object {
+      "errorCount": 0,
+      "testCount": 0,
+      "warnCount": 0,
+    },
   },
   "warnCount": 0,
 }
@@ -110,6 +120,11 @@ Object {
         "Temporibus ex ex.",
       ],
     },
+    "doloribus-enim-quisquam": Object {
+      "errorCount": 0,
+      "testCount": 0,
+      "warnCount": 0,
+    },
   },
   "warnCount": 1,
 }
@@ -139,6 +154,11 @@ Object {
         "Temporibus ex ex.",
       ],
     },
+    "doloribus-enim-quisquam": Object {
+      "errorCount": 0,
+      "testCount": 0,
+      "warnCount": 0,
+    },
   },
   "warnCount": 1,
 }

diff --git a/packages/vest/src/__tests__/__snapshots__/integration.base.test.js.snap b/packages/vest/src/__tests__/__snapshots__/integration.base.test.js.snap
@@ -45,6 +45,11 @@ Object {
         "field_statement_4",
       ],
     },
+    "field_5": Object {
+      "errorCount": 0,
+      "testCount": 0,
+      "warnCount": 0,
+    },
   },
   "warnCount": 1,
 }

diff --git a/packages/vest/src/__tests__/__snapshots__/integration.stateful-async.test.js.snap b/packages/vest/src/__tests__/__snapshots__/integration.stateful-async.test.js.snap
@@ -8,7 +8,20 @@ Object {
   "getErrorsByGroup": [Function],
   "getWarnings": [Function],
   "getWarningsByGroup": [Function],
-  "groups": Object {},
+  "groups": Object {
+    "group": Object {
+      "field_1": Object {
+        "errorCount": 0,
+        "testCount": 0,
+        "warnCount": 0,
+      },
+      "field_4": Object {
+        "errorCount": 0,
+        "testCount": 0,
+        "warnCount": 0,
+      },
+    },
+  },
   "hasErrors": [Function],
   "hasErrorsByGroup": [Function],
   "hasWarnings": [Function],
@@ -29,6 +42,16 @@ Object {
       "testCount": 2,
       "warnCount": 0,
     },
+    "field_3": Object {
+      "errorCount": 0,
+      "testCount": 0,
+      "warnCount": 0,
+    },
+    "field_4": Object {
+      "errorCount": 0,
+      "testCount": 0,
+      "warnCount": 0,
+    },
   },
   "warnCount": 0,
 }
@@ -41,7 +64,20 @@ Object {
   "getErrorsByGroup": [Function],
   "getWarnings": [Function],
   "getWarningsByGroup": [Function],
-  "groups": Object {},
+  "groups": Object {
+    "group": Object {
+      "field_1": Object {
+        "errorCount": 0,
+        "testCount": 0,
+        "warnCount": 0,
+      },
+      "field_4": Object {
+        "errorCount": 0,
+        "testCount": 0,
+        "warnCount": 0,
+      },
+    },
+  },
   "hasErrors": [Function],
   "hasErrorsByGroup": [Function],
   "hasWarnings": [Function],
@@ -65,6 +101,16 @@ Object {
       "testCount": 2,
       "warnCount": 0,
     },
+    "field_3": Object {
+      "errorCount": 0,
+      "testCount": 0,
+      "warnCount": 0,
+    },
+    "field_4": Object {
+      "errorCount": 0,
+      "testCount": 0,
+      "warnCount": 0,
+    },
   },
   "warnCount": 0,
 }

diff --git a/packages/vest/src/__tests__/__snapshots__/integration.stateful-tests.test.js.snap b/packages/vest/src/__tests__/__snapshots__/integration.stateful-tests.test.js.snap
@@ -24,6 +24,26 @@ Object {
       "testCount": 1,
       "warnCount": 0,
     },
+    "field_2": Object {
+      "errorCount": 0,
+      "testCount": 0,
+      "warnCount": 0,
+    },
+    "field_3": Object {
+      "errorCount": 0,
+      "testCount": 0,
+      "warnCount": 0,
+    },
+    "field_4": Object {
+      "errorCount": 0,
+      "testCount": 0,
+      "warnCount": 0,
+    },
+    "field_5": Object {
+      "errorCount": 0,
+      "testCount": 0,
+      "warnCount": 0,
+    },
   },
   "warnCount": 0,
 }
@@ -53,6 +73,21 @@ Object {
       "testCount": 1,
       "warnCount": 0,
     },
+    "field_2": Object {
+      "errorCount": 0,
+      "testCount": 0,
+      "warnCount": 0,
+    },
+    "field_3": Object {
+      "errorCount": 0,
+      "testCount": 0,
+      "warnCount": 0,
+    },
+    "field_4": Object {
+      "errorCount": 0,
+      "testCount": 0,
+      "warnCount": 0,
+    },
     "field_5": Object {
       "errorCount": 2,
       "errors": Array [

diff --git a/packages/vest/src/__tests__/integration.base.test.js b/packages/vest/src/__tests__/integration.base.test.js
@@ -32,7 +32,7 @@ describe('Base behavior', () => {
     expect(res.tests).toHaveProperty('field_2');
     expect(res.tests).toHaveProperty('field_3');
     expect(res.tests).toHaveProperty('field_4');
-    expect(res.tests).not.toHaveProperty('field_5');
+    expect(res.tests.field_5.testCount).toBe(0);
     expect(suite(vest)).toMatchSnapshot();
   });
 

diff --git a/packages/vest/src/__tests__/integration.exclusive.test.js b/packages/vest/src/__tests__/integration.exclusive.test.js
@@ -7,51 +7,52 @@ beforeEach(() => {
 });
 
 describe('only', () => {
-  it('Should only have `only`ed fields', () => {
+  it('Should only count included fields', () => {
     const res = validate({
       only: ['field_1', 'field_2'],
     });
 
-    expect(res.tests).toHaveProperty('field_1');
-    expect(res.tests).toHaveProperty('field_2');
-    expect(res.tests).not.toHaveProperty('field_3');
-    expect(res.tests).not.toHaveProperty('field_4');
-    expect(res.tests).not.toHaveProperty('field_5');
+    expect(res.tests.field_1.testCount).toBe(1);
+    expect(res.tests.field_2.testCount).toBe(1);
+    expect(res.tests.field_3.testCount).toBe(0);
+    expect(res.tests.field_4.testCount).toBe(0);
+    expect(res.tests.field_5.testCount).toBe(0);
   });
-  it('Should only have `only`ed field', () => {
+  it('Should only count included field', () => {
     const res = validate({
       only: 'field_1',
     });
 
-    expect(res.tests).toHaveProperty('field_1');
-    expect(res.tests).not.toHaveProperty('field_2');
-    expect(res.tests).not.toHaveProperty('field_3');
-    expect(res.tests).not.toHaveProperty('field_4');
-    expect(res.tests).not.toHaveProperty('field_5');
+    expect(res.tests.field_1.testCount).toBe(1);
+    expect(res.tests.field_2.testCount).toBe(0);
+    expect(res.tests.field_3.testCount).toBe(0);
+    expect(res.tests.field_4.testCount).toBe(0);
+    expect(res.tests.field_5.testCount).toBe(0);
   });
 });
 describe('skip', () => {
-  it('Should have all but `skip`ped fields', () => {
+  it('Should count all but excluded fields', () => {
     const res = validate({
       skip: ['field_1', 'field_2'],
     });
 
-    expect(res.tests).not.toHaveProperty('field_1');
-    expect(res.tests).not.toHaveProperty('field_2');
-    expect(res.tests).toHaveProperty('field_3');
-    expect(res.tests).toHaveProperty('field_4');
-    expect(res.tests).toHaveProperty('field_5');
+    expect(res.tests.field_1.testCount).toBe(0);
+    expect(res.tests.field_2.testCount).toBe(0);
+    expect(res.tests.field_3.testCount).toBe(1);
+    expect(res.tests.field_4.testCount).toBe(1);
+    expect(res.tests.field_5.testCount).toBe(1);
   });
-  it('Should have all but `skip`ped field', () => {
+
+  it('Should count all but excluded field', () => {
     const res = validate({
       skip: 'field_1',
     });
 
-    expect(res.tests).not.toHaveProperty('field_1');
-    expect(res.tests).toHaveProperty('field_2');
-    expect(res.tests).toHaveProperty('field_3');
-    expect(res.tests).toHaveProperty('field_4');
-    expect(res.tests).toHaveProperty('field_5');
+    expect(res.tests.field_1.testCount).toBe(0);
+    expect(res.tests.field_2.testCount).toBe(1);
+    expect(res.tests.field_3.testCount).toBe(1);
+    expect(res.tests.field_4.testCount).toBe(1);
+    expect(res.tests.field_5.testCount).toBe(1);
   });
 });
 
@@ -63,9 +64,9 @@ describe('Combined', () => {
       skip_last: 'field_3',
     });
 
-    expect(res.tests).toHaveProperty('field_1');
-    expect(res.tests).toHaveProperty('field_2');
-    expect(res.tests).not.toHaveProperty('field_3');
+    expect(res.tests.field_1.testCount).toBe(1);
+    expect(res.tests.field_2.testCount).toBe(1);
+    expect(res.tests.field_3.testCount).toBe(0);
   });
 });
 

diff --git a/packages/vest/src/__tests__/integration.stateful-tests.test.js b/packages/vest/src/__tests__/integration.stateful-tests.test.js
@@ -8,15 +8,15 @@ describe('Stateful behavior', () => {
     result = validate({ only: 'field_1' });
     expect(result.tests.field_1.errorCount).toBe(1);
     expect(result.errorCount).toBe(1);
-    expect(Object.keys(result.tests)).toHaveLength(1);
+    expect(Object.keys(result.tests)).toHaveLength(5); // including 4 skipped tests
     expect(result.tests).toHaveProperty('field_1');
     expect(result).toMatchSnapshot();
 
     result = validate({ only: 'field_5' });
     expect(result.errorCount).toBe(3);
     expect(result.tests.field_1.errorCount).toBe(1);
     expect(result.tests.field_5.errorCount).toBe(2);
-    expect(Object.keys(result.tests)).toHaveLength(2);
+    expect(Object.keys(result.tests)).toHaveLength(5); // including 4 skipped tests
     expect(result.tests).toHaveProperty('field_1');
     expect(result.tests).toHaveProperty('field_5');
     expect(result).toMatchSnapshot();

diff --git a/packages/vest/src/core/produce/genTestsSummary.js b/packages/vest/src/core/produce/genTestsSummary.js
@@ -64,18 +64,23 @@ export default genTestsSummary;
  * @returns {Object} Test result summary
  */
 const genTestObject = (summaryKey, testObject) => {
-  const { fieldName, isWarning, failed, statement } = testObject;
+  const { fieldName, isWarning, failed, statement, skipped } = testObject;
 
   summaryKey[fieldName] = summaryKey[fieldName] || {
-    [SEVERITY_COUNT_WARN]: 0,
     [SEVERITY_COUNT_ERROR]: 0,
+    [SEVERITY_COUNT_WARN]: 0,
     [TEST_COUNT]: 0,
   };
 
   const testKey = summaryKey[fieldName];
 
+  if (skipped) {
+    return testKey;
+  }
+
   summaryKey[fieldName][TEST_COUNT]++;
 
+  // Adds to severity group
   const addTo = (count, group) => {
     testKey[count]++;
     if (statement) {

diff --git a/packages/vest/src/core/produce/produce.js b/packages/vest/src/core/produce/produce.js
@@ -1,4 +1,3 @@
-
 import createCache from 'cache';
 import context from 'ctx';
 import genTestsSummary from 'genTestsSummary';
@@ -28,8 +27,10 @@ const done = withArgs(args => {
 
   const output = produce();
 
-  // If we do not have any tests for current field
-  const shouldSkipRegistration = fieldName && !output.tests[fieldName];
+  // If we do not have any test runs for the current field
+  const shouldSkipRegistration =
+    fieldName &&
+    (!output.tests[fieldName] || output.tests[fieldName].testCount === 0);
 
   if (!isFunction(callback) || shouldSkipRegistration) {
     return output;

diff --git a/packages/vest/src/core/test/__tests__/__snapshots__/runAsyncTest.test.js.snap b/packages/vest/src/core/test/__tests__/__snapshots__/runAsyncTest.test.js.snap
@@ -11,6 +11,7 @@ Object {
         "fieldName": "field_1",
         "id": "0",
         "isWarning": false,
+        "skipped": false,
         "statement": "some statement string",
         "testFn": [Function],
       },