patch(vest): support nested omitWhen calls

ealush · Feb 9, 2022 · f601e1c · f601e1c · vercel · Feb 9, 2022
1 parent 070d0d5
commit f601e1c
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 10 deletions.
diff --git a/packages/vest/src/core/isolate/isolates/__tests__/omitWhen.test.ts b/packages/vest/src/core/isolate/isolates/__tests__/omitWhen.test.ts
@@ -158,4 +158,67 @@ describe('omitWhen', () => {
       expect(cb4).toHaveBeenCalledTimes(1);
     });
   });
+
+  describe('nested calls', () => {
+    let suite;
+
+    describe('omitted in non-omitted', () => {
+      beforeEach(() => {
+        suite = vest.create(() => {
+          vest.omitWhen(false, () => {
+            vest.test('outer', () => false);
+
+            vest.omitWhen(true, () => {
+              vest.test('outer', () => false);
+            });
+          });
+        });
+        suite();
+      });
+      it('Should run `outer` and omit `inner`', () => {
+        expect(suite.get().testCount).toBe(1);
+        expect(suite.get().hasErrors('outer')).toBe(true);
+        expect(suite.get().hasErrors('inner')).toBe(false);
+      });
+    });
+
+    describe('omitted in omitted', () => {
+      beforeEach(() => {
+        suite = vest.create(() => {
+          vest.omitWhen(true, () => {
+            vest.test('outer', () => false);
+
+            vest.omitWhen(true, () => {
+              vest.test('outer', () => false);
+            });
+          });
+        });
+        suite();
+      });
+      it('Should omit both `outer` and `inner`', () => {
+        expect(suite.get().testCount).toBe(0);
+        expect(suite.get().hasErrors('outer')).toBe(false);
+        expect(suite.get().hasErrors('inner')).toBe(false);
+      });
+    });
+    describe('non-omitted in omitted', () => {
+      beforeEach(() => {
+        suite = vest.create(() => {
+          vest.omitWhen(true, () => {
+            vest.test('outer', () => false);
+
+            vest.omitWhen(false, () => {
+              vest.test('outer', () => false);
+            });
+          });
+        });
+        suite();
+      });
+      it('Should omit both', () => {
+        expect(suite.get().testCount).toBe(0);
+        expect(suite.get().hasErrors('outer')).toBe(false);
+        expect(suite.get().hasErrors('inner')).toBe(false);
+      });
+    });
+  });
 });
diff --git a/packages/vest/src/core/isolate/isolates/omitWhen.ts b/packages/vest/src/core/isolate/isolates/omitWhen.ts
@@ -21,10 +21,12 @@ export default function omitWhen(
   isolate({ type: IsolateTypes.OMIT_WHEN }, () => {
     ctx.run(
       {
-        omitted: optionalFunctionValue(
-          conditional,
-          optionalFunctionValue(produceDraft)
-        ),
+        omitted:
+          isOmitted() ||
+          optionalFunctionValue(
+            conditional,
+            optionalFunctionValue(produceDraft)
+          ),
       },
       () => callback()
     );

diff --git a/packages/vest/src/core/isolate/isolates/skipWhen.ts b/packages/vest/src/core/isolate/isolates/skipWhen.ts
@@ -2,7 +2,6 @@ import optionalFunctionValue from 'optionalFunctionValue';
 
 import { IsolateTypes } from 'IsolateTypes';
 import ctx from 'ctx';
-import { isExcludedIndividually } from 'exclusive';
 import { isolate } from 'isolate';
 import { produceDraft, TDraftResult } from 'produceDraft';
 
@@ -36,3 +35,7 @@ export default function skipWhen(
     );
   });
 }
+
+export function isExcludedIndividually(): boolean {
+  return !!ctx.useX().skipped;
+}
diff --git a/packages/vest/src/core/test/lib/registerPrevRunTest.ts b/packages/vest/src/core/test/lib/registerPrevRunTest.ts
@@ -2,10 +2,11 @@ import isPromise from 'isPromise';
 
 import VestTest from 'VestTest';
 import cancelOverriddenPendingTest from 'cancelOverriddenPendingTest';
-import { isExcluded, isExcludedIndividually } from 'exclusive';
+import { isExcluded } from 'exclusive';
 import { isOmitted } from 'omitWhen';
 import registerTest from 'registerTest';
 import runAsyncTest from 'runAsyncTest';
+import { isExcludedIndividually } from 'skipWhen';
 import * as testCursor from 'testCursor';
 import { useTestAtCursor, useSetTestAtCursor } from 'useTestAtCursor';
 

diff --git a/packages/vest/src/hooks/exclusive.ts b/packages/vest/src/hooks/exclusive.ts
@@ -6,6 +6,7 @@ import optionalFunctionValue from 'optionalFunctionValue';
 import VestTest from 'VestTest';
 import ctx from 'ctx';
 import { ERROR_HOOK_CALLED_OUTSIDE } from 'hookErrors';
+import { isExcludedIndividually } from 'skipWhen';
 
 type TExclusionItem = string | string[] | undefined;
 
@@ -37,10 +38,6 @@ export function skip(item: TExclusionItem): void {
 skip.group = (item: TExclusionItem) =>
   addTo(ExclusionGroup.SKIP, 'groups', item);
 
-export function isExcludedIndividually(): boolean {
-  return !!ctx.useX().skipped;
-}
-
 //Checks whether a certain test profile excluded by any of the exclusion groups.
 
 // eslint-disable-next-line complexity, max-statements, max-lines-per-function