Pr/cleanup renderhooks #106
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| afterEach(require('./src').cleanup) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,8 @@ | ||
| import React, { Suspense } from 'react' | ||
| import { act, create } from 'react-test-renderer' | ||
|
|
||
| const unmounts = [] | ||
|
|
||
| function TestHook({ callback, hookProps, onError, children }) { | ||
| try { | ||
| children(callback(hookProps)) | ||
|
|
@@ -51,6 +53,11 @@ function resultContainer() { | |
| } | ||
| } | ||
|
|
||
| function cleanup() { | ||
| unmounts.forEach((unmount) => unmount()) | ||
| unmounts.length = 0 | ||
|
There was a problem hiding this comment. is there significant difference between this and There was a problem hiding this comment. I was thinking to use either mutable or immutable approach. Personally, i prefer the immutable way as i suggested in the issue. but i saw the way that you are using the and i tried to follow the same pattern for consistency (mutable). I don't have a strong opinion on this, it's up to you. |
||
| } | ||
|
|
||
| function renderHook(callback, { initialProps, wrapper } = {}) { | ||
| const { result, setValue, setError, addResolver } = resultContainer() | ||
| const hookProps = { current: initialProps } | ||
|
|
@@ -73,6 +80,14 @@ function renderHook(callback, { initialProps, wrapper } = {}) { | |
| }) | ||
| const { unmount, update } = testRenderer | ||
|
|
||
| function unmountHook() { | ||
|
There was a problem hiding this comment. what happens if someone calls this then then There was a problem hiding this comment. I see there is a test around this case. I personally feel that having There was a problem hiding this comment. I agree with you, i will fix it. |
||
| act(() => { | ||
| unmount() | ||
| }) | ||
| } | ||
|
|
||
| unmounts.push(unmountHook) | ||
|
|
||
| return { | ||
| result, | ||
| waitForNextUpdate: () => new Promise((resolve) => addResolver(resolve)), | ||
|
|
@@ -82,12 +97,8 @@ function renderHook(callback, { initialProps, wrapper } = {}) { | |
| update(toRender()) | ||
| }) | ||
| }, | ||
| unmount: unmountHook | ||
| } | ||
| } | ||
|
|
||
| export { renderHook, cleanup, act } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| import { useEffect } from 'react' | ||
| import { renderHook, cleanup } from 'src' | ||
|
|
||
| describe('cleanup tests', () => { | ||
| let sideEffect = {} | ||
|
|
||
| function useEffectsCounter({ initialProps }) { | ||
| return renderHook( | ||
| ({ id }) => { | ||
| useEffect(() => { | ||
| sideEffect[id] = 0 | ||
| return () => { | ||
| sideEffect[id] = sideEffect[id] + 1 | ||
| } | ||
| }, [id]) | ||
| }, | ||
| { initialProps } | ||
| ) | ||
| } | ||
|
|
||
| afterEach(() => (sideEffect = {})) | ||
|
|
||
| test('should unmount the tests', () => { | ||
| useEffectsCounter({ initialProps: { id: 1 } }) | ||
| useEffectsCounter({ initialProps: { id: 10 } }) | ||
| useEffectsCounter({ initialProps: { id: 100 } }) | ||
|
|
||
| cleanup() | ||
|
|
||
| expect(sideEffect).toEqual({ 1: 1, 10: 1, 100: 1 }) | ||
| }) | ||
|
|
||
| test('should not cleanup a hook that have already unmounted', () => { | ||
| const { unmount } = useEffectsCounter({ initialProps: { id: 1 } }) | ||
|
|
||
| unmount() | ||
| cleanup() | ||
|
|
||
| expect(sideEffect).toEqual({ 1: 1 }) | ||
| }) | ||
|
|
||
| test('should not unmount a hook that have already cleaned up', () => { | ||
| const { unmount } = useEffectsCounter({ initialProps: { id: 1 } }) | ||
|
|
||
| cleanup() | ||
| unmount() | ||
|
|
||
| expect(sideEffect).toEqual({ 1: 1 }) | ||
| }) | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this should be requireing
./libso that it picks up the compiled version after publishing.