patch(vest): refresh tests after cancel

ealush · Nov 10, 2021 · 5bcc14a · 5bcc14a
1 parent fd049e8
commit 5bcc14a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/packages/vest/src/core/suite/create.ts b/packages/vest/src/core/suite/create.ts
@@ -11,6 +11,7 @@ import matchingFieldName from 'matchingFieldName';
 import omitOptionalTests from 'omitOptionalTests';
 import { IVestResult, produceFullResult } from 'produce';
 import { produceDraft, TDraftResult } from 'produceDraft';
+import removeTestFromState from 'removeTestFromState';
 import { useTestObjects, usePrevTestObjects } from 'stateHooks';
 import { initBus } from 'vestBus';
 
@@ -67,6 +68,7 @@ export default function create<T extends (...args: any[]) => void>(
         asArray(testObjects).forEach(testObject => {
           if (matchingFieldName(testObject, name)) {
             testObject.cancel();
+            removeTestFromState(testObject);
           }
         });
       }),

diff --git a/packages/vest/src/core/test/VestTest.ts b/packages/vest/src/core/test/VestTest.ts
@@ -1,7 +1,7 @@
 import genId from 'genId';
 
-import removeTestFromState from 'removeTestFromState';
 import shouldUseErrorAsMessage from 'shouldUseErrorAsMessage';
+import { useRefreshTestObjects } from 'stateHooks';
 
 export default class VestTest {
   fieldName: string;
@@ -86,7 +86,7 @@ export default class VestTest {
 
   cancel(): void {
     this.setStatus(STATUS_CANCELED);
-    removeTestFromState(this);
+    useRefreshTestObjects();
   }
 
   omit(): void {

diff --git a/packages/vest/src/core/test/__tests__/VestTest.test.ts b/packages/vest/src/core/test/__tests__/VestTest.test.ts
@@ -73,7 +73,7 @@ describe('VestTest', () => {
   });
 
   describe('testObject.cancel', () => {
-    it('Should remove a testObject from the state', () => {
+    it('Should set the testObject to cancel', () => {
       return new Promise<void>(done => {
         let testObject: VestTest;
         const suite = vest.create(() => {
@@ -86,8 +86,8 @@ describe('VestTest', () => {
           testObject.cancel();
         });
         suite();
-        expect(suite.get().tests.f1).toBeUndefined();
-        expect(suite.get().tests.f2).toBeDefined();
+
+        expect(testObject.isCanceled()).toBe(true);
         done();
       });
     });