[Shallow] Rename effect cleanup function to destroy to match rest of …

…react (facebook#15275)
insidewhy · Jul 26, 2019 · c486479 · c486479
1 parent b029466
commit c486479
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/packages/react-test-renderer/src/ReactShallowRenderer.js b/packages/react-test-renderer/src/ReactShallowRenderer.js
@@ -333,7 +333,7 @@ class ReactShallowRenderer {
             isLayoutEffect,
             create,
             inputs,
-            cleanup: null,
+            destroy: null,
             run: true,
           };
         } else {
@@ -343,7 +343,7 @@ class ReactShallowRenderer {
             isLayoutEffect,
             create,
             inputs,
-            cleanup: memoizedState.cleanup,
+            destroy: memoizedState.destroy,
             run:
               inputs == null ||
               !areHookInputsEqual(inputs, memoizedState.inputs),
@@ -754,10 +754,10 @@ class ReactShallowRenderer {
         memoizedState.isLayoutEffect === callLayoutEffects &&
         memoizedState.run
       ) {
-        if (memoizedState.cleanup) {
-          memoizedState.cleanup();
+        if (memoizedState.destroy) {
+          memoizedState.destroy();
         }
-        memoizedState.cleanup = memoizedState.create();
+        memoizedState.destroy = memoizedState.create();
       }
     }
   }

diff --git a/packages/react-test-renderer/src/__tests__/ReactShallowRendererHooks-test.js b/packages/react-test-renderer/src/__tests__/ReactShallowRendererHooks-test.js
@@ -281,7 +281,7 @@ describe('ReactShallowRenderer with hooks', () => {
       ]);
     });
 
-    it('should trigger effects and cleanup depending on inputs', () => {
+    it('should trigger effects and destroy depending on inputs', () => {
       let _setFriend;
       const happenings = [];
 
@@ -294,7 +294,7 @@ describe('ReactShallowRenderer with hooks', () => {
           () => {
             happenings.push('call friend effect');
             return () => {
-              happenings.push('cleanup friend effect');
+              happenings.push('destroy friend effect');
             };
           },
           [friend],
@@ -303,15 +303,15 @@ describe('ReactShallowRenderer with hooks', () => {
         React.useEffect(() => {
           happenings.push('call empty effect');
           return () => {
-            happenings.push('cleanup empty effect');
+            happenings.push('destroy empty effect');
           };
         });
 
         React.useEffect(
           () => {
             happenings.push('call cat effect');
             return () => {
-              happenings.push('cleanup cat effect');
+              happenings.push('destroy cat effect');
             };
           },
           [cat],
@@ -321,7 +321,7 @@ describe('ReactShallowRenderer with hooks', () => {
           () => {
             happenings.push('call both effect');
             return () => {
-              happenings.push('cleanup both effect');
+              happenings.push('destroy both effect');
             };
           },
           [friend, cat],
@@ -347,11 +347,11 @@ describe('ReactShallowRenderer with hooks', () => {
       happenings.splice(0);
       _setFriend('Maryam');
       expect(happenings).toEqual([
-        'cleanup friend effect',
+        'destroy friend effect',
         'call friend effect',
-        'cleanup empty effect',
+        'destroy empty effect',
         'call empty effect',
-        'cleanup both effect',
+        'destroy both effect',
         'call both effect',
       ]);
     });