refactor: move tests to specifically related folders

joshuaellis · mpeyper · web-flow · commit 43891e197c99 · 2021-01-10T21:17:55.000+11:00
* refactor: move tests to specifically related folders

* chore(config): update outdated configs after test changes

* refactor: remove index from import paths in tests

Co-authored-by: Michael Peyper &lt;mpeyper7@gmail.com&gt;
diff --git a/.eslintrc b/.eslintrc
@@ -11,6 +11,6 @@
     "@typescript-eslint/no-invalid-void-type": "off"
   },
   "parserOptions": {
-    "project": ["./tsconfig.json", "./test/tsconfig.json", "./scripts/tsconfig.json"]
+    "project": ["./tsconfig.json", "./scripts/tsconfig.json"]
   }
 }
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,20 @@
+# node
 node_modules
-coverage
+
+# build generated
 lib
 dom
 native
 server
 pure
 .docz
 site
+
+# tests (need the !files because of the build generated above)
+coverage
+!src/dom
+!src/native
+!src/server
+
+# settings from IDE
 .vscode
diff --git a/jest.config.js b/jest.config.js
diff --git a/src/dom/__tests__/asyncHook.test.ts b/src/dom/__tests__/asyncHook.test.ts
@@ -1,5 +1,5 @@
 import { useState, useRef, useEffect } from 'react'
-import { renderHook } from '../../src/dom'
+import { renderHook } from '..'
 
 describe('async hook tests', () => {
   const useSequence = (...values: string[]) => {
diff --git a/src/dom/__tests__/autoCleanup.disabled.test.ts b/src/dom/__tests__/autoCleanup.disabled.test.ts
@@ -1,6 +1,6 @@
 import { useEffect } from 'react'
 
-import { ReactHooksRenderer } from 'types'
+import { ReactHooksRenderer } from '../../types/react'
 
 // This verifies that if RHTL_SKIP_AUTO_CLEANUP is set
 // then we DON'T auto-wire up the afterEach for folks
@@ -11,7 +11,7 @@ describe('skip auto cleanup (disabled) tests', () => {
   beforeAll(() => {
     process.env.RHTL_SKIP_AUTO_CLEANUP = 'true'
     // eslint-disable-next-line @typescript-eslint/no-var-requires
-    renderHook = (require('../../src/native') as ReactHooksRenderer).renderHook
+    renderHook = (require('..') as ReactHooksRenderer).renderHook
   })
 
   test('first', () => {
diff --git a/src/dom/__tests__/autoCleanup.noAfterEach.test.ts b/src/dom/__tests__/autoCleanup.noAfterEach.test.ts
@@ -1,6 +1,6 @@
 import { useEffect } from 'react'
 
-import { ReactHooksRenderer } from 'types'
+import { ReactHooksRenderer } from '../../types/react'
 
 // This verifies that if RHTL_SKIP_AUTO_CLEANUP is set
 // then we DON'T auto-wire up the afterEach for folks
@@ -13,7 +13,7 @@ describe('skip auto cleanup (no afterEach) tests', () => {
     // eslint-disable-next-line no-global-assign
     afterEach = false
     // eslint-disable-next-line @typescript-eslint/no-var-requires
-    renderHook = (require('../../src/native') as ReactHooksRenderer).renderHook
+    renderHook = (require('..') as ReactHooksRenderer).renderHook
   })
 
   test('first', () => {
diff --git a/src/dom/__tests__/autoCleanup.test.ts b/src/dom/__tests__/autoCleanup.test.ts
@@ -1,5 +1,5 @@
 import { useEffect } from 'react'
-import { renderHook } from '../../src/dom'
+import { renderHook } from '..'
 
 // This verifies that by importing RHTL in an
 // environment which supports afterEach (like Jest)
diff --git a/src/dom/__tests__/cleanup.test.ts b/src/dom/__tests__/cleanup.test.ts
@@ -1,5 +1,5 @@
 import { useEffect } from 'react'
-import { renderHook, cleanup, addCleanup, removeCleanup } from '../../src/dom/pure'
+import { renderHook, cleanup, addCleanup, removeCleanup } from '../pure'
 
 describe('cleanup tests', () => {
   test('should flush effects on cleanup', async () => {
diff --git a/src/dom/__tests__/customHook.test.ts b/src/dom/__tests__/customHook.test.ts
@@ -1,5 +1,5 @@
 import { useState, useCallback } from 'react'
-import { renderHook, act } from '../../src/dom'
+import { renderHook, act } from '..'
 
 describe('custom hook tests', () => {
   function useCounter() {
diff --git a/src/dom/__tests__/errorHook.test.ts b/src/dom/__tests__/errorHook.test.ts
@@ -1,5 +1,5 @@
 import { useState, useEffect } from 'react'
-import { renderHook } from '../../src/dom'
+import { renderHook } from '..'
 
 describe('error hook tests', () => {
   function useError(throwError?: boolean) {
diff --git a/src/dom/__tests__/resultHistory.test.ts b/src/dom/__tests__/resultHistory.test.ts
@@ -1,4 +1,4 @@
-import { renderHook } from '../../src/dom'
+import { renderHook } from '..'
 
 describe('result history tests', () => {
   let count = 0
diff --git a/src/dom/__tests__/suspenseHook.test.ts b/src/dom/__tests__/suspenseHook.test.ts
@@ -1,4 +1,4 @@
-import { renderHook } from '../../src/dom'
+import { renderHook } from '..'
 
 describe('suspense hook tests', () => {
   const cache: { value?: Promise<string | Error> | string | Error } = {}
diff --git a/src/dom/__tests__/useContext.test.tsx b/src/dom/__tests__/useContext.test.tsx
@@ -1,5 +1,5 @@
 import React, { createContext, useContext } from 'react'
-import { renderHook } from '../../src/dom'
+import { renderHook } from '..'
 
 describe('useContext tests', () => {
   test('should get default value from context', () => {
diff --git a/src/dom/__tests__/useEffect.test.ts b/src/dom/__tests__/useEffect.test.ts
@@ -1,5 +1,5 @@
 import { useEffect, useLayoutEffect } from 'react'
-import { renderHook } from '../../src/dom'
+import { renderHook } from '..'
 
 describe('useEffect tests', () => {
   test('should handle useEffect hook', () => {
diff --git a/src/dom/__tests__/useMemo.test.ts b/src/dom/__tests__/useMemo.test.ts
@@ -1,5 +1,5 @@
 import { useMemo, useCallback } from 'react'
-import { renderHook } from '../../src/dom'
+import { renderHook } from '..'
 
 describe('useCallback tests', () => {
   test('should handle useMemo hook', () => {
diff --git a/src/dom/__tests__/useReducer.test.ts b/src/dom/__tests__/useReducer.test.ts
@@ -1,5 +1,5 @@
 import { useReducer } from 'react'
-import { renderHook, act } from '../../src/dom'
+import { renderHook, act } from '..'
 
 describe('useReducer tests', () => {
   test('should handle useReducer hook', () => {
diff --git a/src/dom/__tests__/useRef.test.ts b/src/dom/__tests__/useRef.test.ts
@@ -1,5 +1,5 @@
 import { useRef, useImperativeHandle } from 'react'
-import { renderHook } from '../../src/dom'
+import { renderHook } from '..'
 
 describe('useHook tests', () => {
   test('should handle useRef hook', () => {
diff --git a/src/dom/__tests__/useState.test.ts b/src/dom/__tests__/useState.test.ts
@@ -1,5 +1,5 @@
 import { useState } from 'react'
-import { renderHook, act } from '../../src/dom'
+import { renderHook, act } from '..'
 
 describe('useState tests', () => {
   test('should use setState value', () => {
diff --git a/src/native/__tests__/asyncHook.test.ts b/src/native/__tests__/asyncHook.test.ts
@@ -1,5 +1,5 @@
 import { useState, useRef, useEffect } from 'react'
-import { renderHook } from '../../src/native'
+import { renderHook } from '..'
 
 describe('async hook tests', () => {
   const useSequence = (...values: string[]) => {
diff --git a/src/native/__tests__/autoCleanup.disabled.test.ts b/src/native/__tests__/autoCleanup.disabled.test.ts
@@ -1,6 +1,6 @@
 import { useEffect } from 'react'
 
-import { ReactHooksRenderer } from 'types'
+import { ReactHooksRenderer } from '../../types/react'
 
 // This verifies that if RHTL_SKIP_AUTO_CLEANUP is set
 // then we DON'T auto-wire up the afterEach for folks
@@ -11,7 +11,7 @@ describe('skip auto cleanup (disabled) tests', () => {
   beforeAll(() => {
     process.env.RHTL_SKIP_AUTO_CLEANUP = 'true'
     // eslint-disable-next-line @typescript-eslint/no-var-requires
-    renderHook = (require('../../src/server') as ReactHooksRenderer).renderHook
+    renderHook = (require('..') as ReactHooksRenderer).renderHook
   })
 
   test('first', () => {
diff --git a/src/native/__tests__/autoCleanup.noAfterEach.test.ts b/src/native/__tests__/autoCleanup.noAfterEach.test.ts
@@ -1,6 +1,6 @@
 import { useEffect } from 'react'
 
-import { ReactHooksRenderer } from 'types'
+import { ReactHooksRenderer } from '../../types/react'
 
 // This verifies that if RHTL_SKIP_AUTO_CLEANUP is set
 // then we DON'T auto-wire up the afterEach for folks
@@ -13,7 +13,7 @@ describe('skip auto cleanup (no afterEach) tests', () => {
     // eslint-disable-next-line no-global-assign
     afterEach = false
     // eslint-disable-next-line @typescript-eslint/no-var-requires
-    renderHook = (require('../../src/server') as ReactHooksRenderer).renderHook
+    renderHook = (require('..') as ReactHooksRenderer).renderHook
   })
 
   test('first', () => {
diff --git a/src/native/__tests__/autoCleanup.test.ts b/src/native/__tests__/autoCleanup.test.ts
@@ -1,5 +1,5 @@
 import { useEffect } from 'react'
-import { renderHook } from '../../src/native'
+import { renderHook } from '..'
 
 // This verifies that by importing RHTL in an
 // environment which supports afterEach (like Jest)
diff --git a/src/native/__tests__/cleanup.test.ts b/src/native/__tests__/cleanup.test.ts
@@ -1,5 +1,5 @@
 import { useEffect } from 'react'
-import { renderHook, cleanup, addCleanup, removeCleanup } from '../../src/native/pure'
+import { renderHook, cleanup, addCleanup, removeCleanup } from '../pure'
 
 describe('cleanup tests', () => {
   test('should flush effects on cleanup', async () => {
diff --git a/src/native/__tests__/customHook.test.ts b/src/native/__tests__/customHook.test.ts
@@ -1,5 +1,5 @@
 import { useState, useCallback } from 'react'
-import { renderHook, act } from '../../src/native'
+import { renderHook, act } from '..'
 
 describe('custom hook tests', () => {
   function useCounter() {
diff --git a/src/native/__tests__/errorHook.test.ts b/src/native/__tests__/errorHook.test.ts
@@ -1,5 +1,5 @@
 import { useState, useEffect } from 'react'
-import { renderHook } from '../../src/native'
+import { renderHook } from '..'
 
 describe('error hook tests', () => {
   function useError(throwError?: boolean) {
diff --git a/src/native/__tests__/resultHistory.test.ts b/src/native/__tests__/resultHistory.test.ts
@@ -1,4 +1,4 @@
-import { renderHook } from '../../src/native'
+import { renderHook } from '..'
 
 describe('result history tests', () => {
   let count = 0
diff --git a/src/native/__tests__/suspenseHook.test.ts b/src/native/__tests__/suspenseHook.test.ts
@@ -1,4 +1,4 @@
-import { renderHook } from '../../src/native'
+import { renderHook } from '..'
 
 describe('suspense hook tests', () => {
   const cache: { value?: Promise<string | Error> | string | Error } = {}
diff --git a/src/native/__tests__/useContext.test.tsx b/src/native/__tests__/useContext.test.tsx
@@ -1,5 +1,5 @@
 import React, { createContext, useContext } from 'react'
-import { renderHook } from '../../src/native'
+import { renderHook } from '..'
 
 describe('useContext tests', () => {
   test('should get default value from context', () => {
diff --git a/src/native/__tests__/useEffect.test.ts b/src/native/__tests__/useEffect.test.ts
@@ -1,5 +1,5 @@
 import { useEffect, useLayoutEffect } from 'react'
-import { renderHook } from '../../src/native'
+import { renderHook } from '..'
 
 describe('useEffect tests', () => {
   test('should handle useEffect hook', () => {
diff --git a/src/native/__tests__/useMemo.test.ts b/src/native/__tests__/useMemo.test.ts
@@ -1,5 +1,5 @@
 import { useMemo, useCallback } from 'react'
-import { renderHook } from '../../src/native'
+import { renderHook } from '..'
 
 describe('useCallback tests', () => {
   test('should handle useMemo hook', () => {
diff --git a/src/native/__tests__/useReducer.test.ts b/src/native/__tests__/useReducer.test.ts
@@ -1,5 +1,5 @@
 import { useReducer } from 'react'
-import { renderHook, act } from '../../src/native'
+import { renderHook, act } from '..'
 
 describe('useReducer tests', () => {
   test('should handle useReducer hook', () => {
diff --git a/src/native/__tests__/useRef.test.ts b/src/native/__tests__/useRef.test.ts
@@ -1,5 +1,5 @@
 import { useRef, useImperativeHandle } from 'react'
-import { renderHook } from '../../src/native'
+import { renderHook } from '..'
 
 describe('useHook tests', () => {
   test('should handle useRef hook', () => {
diff --git a/src/native/__tests__/useState.test.ts b/src/native/__tests__/useState.test.ts
@@ -1,5 +1,5 @@
 import { useState } from 'react'
-import { renderHook, act } from '../../src/native'
+import { renderHook, act } from '..'
 
 describe('useState tests', () => {
   test('should use setState value', () => {
diff --git a/src/server/__tests__/asyncHook.test.ts b/src/server/__tests__/asyncHook.test.ts
@@ -1,6 +1,6 @@
 import { useState, useRef, useEffect } from 'react'
 
-import { renderHook } from '../../src/server'
+import { renderHook } from '..'
 
 describe('async hook tests', () => {
   const useSequence = (...values: string[]) => {
diff --git a/src/server/__tests__/autoCleanup.disabled.test.ts b/src/server/__tests__/autoCleanup.disabled.test.ts
@@ -1,6 +1,6 @@
 import { useEffect } from 'react'
 
-import { ReactHooksRenderer } from 'types/react'
+import { ReactHooksRenderer } from '../../types/react'
 
 // This verifies that if RHTL_SKIP_AUTO_CLEANUP is set
 // then we DON'T auto-wire up the afterEach for folks
@@ -11,7 +11,7 @@ describe('skip auto cleanup (disabled) tests', () => {
   beforeAll(() => {
     process.env.RHTL_SKIP_AUTO_CLEANUP = 'true'
     // eslint-disable-next-line @typescript-eslint/no-var-requires
-    renderHook = (require('../../src/dom') as ReactHooksRenderer).renderHook
+    renderHook = (require('..') as ReactHooksRenderer).renderHook
   })
 
   test('first', () => {
diff --git a/src/server/__tests__/autoCleanup.noAfterEach.test.ts b/src/server/__tests__/autoCleanup.noAfterEach.test.ts
@@ -1,6 +1,6 @@
 import { useEffect } from 'react'
 
-import { ReactHooksRenderer } from 'types/react'
+import { ReactHooksRenderer } from '../../types/react'
 
 // This verifies that if RHTL_SKIP_AUTO_CLEANUP is set
 // then we DON'T auto-wire up the afterEach for folks
@@ -13,7 +13,7 @@ describe('skip auto cleanup (no afterEach) tests', () => {
     // eslint-disable-next-line no-global-assign
     afterEach = false
     // eslint-disable-next-line @typescript-eslint/no-var-requires
-    renderHook = (require('../../src/dom') as ReactHooksRenderer).renderHook
+    renderHook = (require('..') as ReactHooksRenderer).renderHook
   })
 
   test('first', () => {
diff --git a/src/server/__tests__/autoCleanup.test.ts b/src/server/__tests__/autoCleanup.test.ts
@@ -1,5 +1,5 @@
 import { useEffect } from 'react'
-import { renderHook } from '../../src/server'
+import { renderHook } from '..'
 
 // This verifies that by importing RHTL in an
 // environment which supports afterEach (like Jest)
diff --git a/src/server/__tests__/cleanup.test.ts b/src/server/__tests__/cleanup.test.ts
@@ -1,5 +1,5 @@
 import { useEffect } from 'react'
-import { renderHook, cleanup } from '../../src/server'
+import { renderHook, cleanup } from '..'
 
 describe('cleanup tests', () => {
   test('should flush effects on cleanup', async () => {
diff --git a/src/server/__tests__/customHook.test.ts b/src/server/__tests__/customHook.test.ts
@@ -1,5 +1,5 @@
 import { useState, useCallback } from 'react'
-import { renderHook, act } from '../../src/server'
+import { renderHook, act } from '..'
 
 describe('custom hook tests', () => {
   function useCounter() {
diff --git a/src/server/__tests__/errorHook.test.ts b/src/server/__tests__/errorHook.test.ts
@@ -1,6 +1,6 @@
 import { useState, useEffect } from 'react'
 
-import { renderHook } from '../../src/server'
+import { renderHook } from '..'
 
 describe('error hook tests', () => {
   function useError(throwError?: boolean) {
diff --git a/src/server/__tests__/hydrationErrors.test.ts b/src/server/__tests__/hydrationErrors.test.ts
@@ -1,5 +1,5 @@
 import { useState, useCallback } from 'react'
-import { renderHook } from '../../src/server'
+import { renderHook } from '..'
 
 describe('hydration errors tests', () => {
   function useCounter() {
diff --git a/src/server/__tests__/useContext.test.tsx b/src/server/__tests__/useContext.test.tsx
@@ -1,5 +1,5 @@
 import React, { createContext, useContext } from 'react'
-import { renderHook } from '../../src/server'
+import { renderHook } from '..'
 
 describe('useContext tests', () => {
   test('should get default value from context', () => {
diff --git a/src/server/__tests__/useEffect.test.ts b/src/server/__tests__/useEffect.test.ts
@@ -1,5 +1,5 @@
 import { useEffect } from 'react'
-import { renderHook } from '../../src/server'
+import { renderHook } from '..'
 
 describe('useEffect tests', () => {
   test('should handle useEffect hook', () => {
diff --git a/src/server/__tests__/useMemo.test.ts b/src/server/__tests__/useMemo.test.ts
@@ -1,5 +1,5 @@
 import { useMemo, useCallback } from 'react'
-import { renderHook } from '../../src/server'
+import { renderHook } from '..'
 
 describe('useCallback tests', () => {
   test('should handle useMemo hook', () => {
diff --git a/src/server/__tests__/useReducer.test.ts b/src/server/__tests__/useReducer.test.ts
@@ -1,5 +1,5 @@
 import { useReducer } from 'react'
-import { renderHook, act } from '../../src/server'
+import { renderHook, act } from '..'
 
 describe('useReducer tests', () => {
   test('should handle useReducer hook', () => {
diff --git a/src/server/__tests__/useRef.test.ts b/src/server/__tests__/useRef.test.ts
@@ -1,5 +1,5 @@
 import { useRef, useImperativeHandle } from 'react'
-import { renderHook } from '../../src/server'
+import { renderHook } from '..'
 
 describe('useHook tests', () => {
   test('should handle useRef hook', () => {
diff --git a/src/server/__tests__/useState.test.ts b/src/server/__tests__/useState.test.ts
diff --git a/test/tsconfig.json b/test/tsconfig.json
diff --git a/tsconfig.json b/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,6 @@`
`11`	`11`	`"@typescript-eslint/no-invalid-void-type": "off"`
`12`	`12`	`},`
`13`	`13`	`"parserOptions": {`
`14`		`- "project": ["./tsconfig.json", "./test/tsconfig.json", "./scripts/tsconfig.json"]`
	`14`	`+ "project": ["./tsconfig.json", "./scripts/tsconfig.json"]`
`15`	`15`	`}`
`16`	`16`	`}`