refactor: move tests to specificly related folders

Author: joshuaellis

.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

jest.config.js

@@ -2,6 +2,6 @@
 const { jest: jestConfig } = require('kcd-scripts/config')
 
 module.exports = Object.assign(jestConfig, {
-  roots: ['<rootDir>/src', '<rootDir>/test'],
-  testMatch: ['<rootDir>/test/**/*.(ts|tsx|js)']
+  roots: ['<rootDir>/src'],
+  testMatch: ['<rootDir>/**/__tests__/*.(ts|tsx|js)']
 })

test/tsconfig.json renamed to src/__tests__/tsconfig.json

@@ -1,8 +1,8 @@
 {
-  "extends": "../tsconfig",
+  "extends": "../../tsconfig",
   "compilerOptions": {
     "declaration": false
   },
   "exclude": [],
-  "include": ["./**/*.ts"]
+  "include": ["**/*.test.(ts|tsx)"]
 }

test/dom/asyncHook.ts renamed to src/dom/__tests__/asyncHook.test.ts

@@ -1,5 +1,5 @@
 import { useState, useRef, useEffect } from 'react'
-import { renderHook } from '../../src/dom'
+import { renderHook } from '../index'
 
 describe('async hook tests', () => {
   const useSequence = (...values: string[]) => {

test/native/autoCleanup.disabled.ts renamed to 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('../index') as ReactHooksRenderer).renderHook
   })
 
   test('first', () => {

test/server/autoCleanup.noAfterEach.ts renamed to 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/server') as ReactHooksRenderer).renderHook
+    renderHook = (require('../index') as ReactHooksRenderer).renderHook
   })
 
   test('first', () => {

test/dom/autoCleanup.ts renamed to src/dom/__tests__/autoCleanup.test.ts

@@ -1,5 +1,5 @@
 import { useEffect } from 'react'
-import { renderHook } from '../../src/dom'
+import { renderHook } from '../index'
 
 // This verifies that by importing RHTL in an
 // environment which supports afterEach (like Jest)

test/dom/cleanup.ts renamed to 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 () => {

test/dom/customHook.ts renamed to 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 '../index'
 
 describe('custom hook tests', () => {
   function useCounter() {

test/dom/errorHook.ts renamed to src/dom/__tests__/errorHook.test.ts

@@ -1,5 +1,5 @@
 import { useState, useEffect } from 'react'
-import { renderHook } from '../../src/dom'
+import { renderHook } from '../index'
 
 describe('error hook tests', () => {
   function useError(throwError?: boolean) {

test/dom/resultHistory.ts renamed to src/dom/__tests__/resultHistory.test.ts

@@ -1,4 +1,4 @@
-import { renderHook } from '../../src/dom'
+import { renderHook } from '../index'
 
 describe('result history tests', () => {
   let count = 0

test/dom/suspenseHook.ts renamed to src/dom/__tests__/suspenseHook.test.ts

@@ -1,4 +1,4 @@
-import { renderHook } from '../../src/dom'
+import { renderHook } from '../index'
 
 describe('suspense hook tests', () => {
   const cache: { value?: Promise<string | Error> | string | Error } = {}

test/dom/useContext.tsx renamed to src/dom/__tests__/useContext.test.tsx

@@ -1,5 +1,5 @@
 import React, { createContext, useContext } from 'react'
-import { renderHook } from '../../src/dom'
+import { renderHook } from '../index'
 
 describe('useContext tests', () => {
   test('should get default value from context', () => {

test/dom/useEffect.ts renamed to src/dom/__tests__/useEffect.test.ts

@@ -1,5 +1,5 @@
 import { useEffect, useLayoutEffect } from 'react'
-import { renderHook } from '../../src/dom'
+import { renderHook } from '../index'
 
 describe('useEffect tests', () => {
   test('should handle useEffect hook', () => {

test/dom/useMemo.ts renamed to src/dom/__tests__/useMemo.test.ts

@@ -1,5 +1,5 @@
 import { useMemo, useCallback } from 'react'
-import { renderHook } from '../../src/dom'
+import { renderHook } from '../index'
 
 describe('useCallback tests', () => {
   test('should handle useMemo hook', () => {

test/dom/useReducer.ts renamed to src/dom/__tests__/useReducer.test.ts

@@ -1,5 +1,5 @@
 import { useReducer } from 'react'
-import { renderHook, act } from '../../src/dom'
+import { renderHook, act } from '../index'
 
 describe('useReducer tests', () => {
   test('should handle useReducer hook', () => {

test/dom/useRef.ts renamed to src/dom/__tests__/useRef.test.ts

@@ -1,5 +1,5 @@
 import { useRef, useImperativeHandle } from 'react'
-import { renderHook } from '../../src/dom'
+import { renderHook } from '../index'
 
 describe('useHook tests', () => {
   test('should handle useRef hook', () => {

test/dom/useState.ts renamed to src/dom/__tests__/useState.test.ts

@@ -1,5 +1,5 @@
 import { useState } from 'react'
-import { renderHook, act } from '../../src/dom'
+import { renderHook, act } from '../index'
 
 describe('useState tests', () => {
   test('should use setState value', () => {

test/native/asyncHook.ts renamed to src/native/__tests__/asyncHook.test.ts

@@ -1,5 +1,5 @@
 import { useState, useRef, useEffect } from 'react'
-import { renderHook } from '../../src/native'
+import { renderHook } from '../index'
 
 describe('async hook tests', () => {
   const useSequence = (...values: string[]) => {

test/dom/autoCleanup.disabled.ts renamed to src/native/__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('../index') as ReactHooksRenderer).renderHook
   })
 
   test('first', () => {

test/dom/autoCleanup.noAfterEach.ts renamed to src/native/__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('../index') as ReactHooksRenderer).renderHook
   })
 
   test('first', () => {

test/native/autoCleanup.ts renamed to src/native/__tests__/autoCleanup.test.ts

@@ -1,5 +1,5 @@
 import { useEffect } from 'react'
-import { renderHook } from '../../src/native'
+import { renderHook } from '../index'
 
 // This verifies that by importing RHTL in an
 // environment which supports afterEach (like Jest)

test/native/cleanup.ts renamed to 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 () => {

test/native/customHook.ts renamed to 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 '../index'
 
 describe('custom hook tests', () => {
   function useCounter() {

test/native/errorHook.ts renamed to src/native/__tests__/errorHook.test.ts

@@ -1,5 +1,5 @@
 import { useState, useEffect } from 'react'
-import { renderHook } from '../../src/native'
+import { renderHook } from '../index'
 
 describe('error hook tests', () => {
   function useError(throwError?: boolean) {

test/native/resultHistory.ts renamed to src/native/__tests__/resultHistory.test.ts

@@ -1,4 +1,4 @@
-import { renderHook } from '../../src/native'
+import { renderHook } from '../index'
 
 describe('result history tests', () => {
   let count = 0

test/native/suspenseHook.ts renamed to src/native/__tests__/suspenseHook.test.ts

@@ -1,4 +1,4 @@
-import { renderHook } from '../../src/native'
+import { renderHook } from '../index'
 
 describe('suspense hook tests', () => {
   const cache: { value?: Promise<string | Error> | string | Error } = {}

test/native/useContext.tsx renamed to src/native/__tests__/useContext.test.tsx

@@ -1,5 +1,5 @@
 import React, { createContext, useContext } from 'react'
-import { renderHook } from '../../src/native'
+import { renderHook } from '../index'
 
 describe('useContext tests', () => {
   test('should get default value from context', () => {

test/native/useEffect.ts renamed to src/native/__tests__/useEffect.test.ts

@@ -1,5 +1,5 @@
 import { useEffect, useLayoutEffect } from 'react'
-import { renderHook } from '../../src/native'
+import { renderHook } from '../index'
 
 describe('useEffect tests', () => {
   test('should handle useEffect hook', () => {

test/native/useMemo.ts renamed to src/native/__tests__/useMemo.test.ts

@@ -1,5 +1,5 @@
 import { useMemo, useCallback } from 'react'
-import { renderHook } from '../../src/native'
+import { renderHook } from '../index'
 
 describe('useCallback tests', () => {
   test('should handle useMemo hook', () => {

test/native/useReducer.ts renamed to src/native/__tests__/useReducer.test.ts

@@ -1,5 +1,5 @@
 import { useReducer } from 'react'
-import { renderHook, act } from '../../src/native'
+import { renderHook, act } from '../index'
 
 describe('useReducer tests', () => {
   test('should handle useReducer hook', () => {

test/native/useRef.ts renamed to src/native/__tests__/useRef.test.ts

@@ -1,5 +1,5 @@
 import { useRef, useImperativeHandle } from 'react'
-import { renderHook } from '../../src/native'
+import { renderHook } from '../index'
 
 describe('useHook tests', () => {
   test('should handle useRef hook', () => {

test/native/useState.ts renamed to src/native/__tests__/useState.test.ts

@@ -1,5 +1,5 @@
 import { useState } from 'react'
-import { renderHook, act } from '../../src/native'
+import { renderHook, act } from '../index'
 
 describe('useState tests', () => {
   test('should use setState value', () => {

test/server/asyncHook.ts renamed to src/server/__tests__/asyncHook.test.ts

@@ -1,6 +1,6 @@
 import { useState, useRef, useEffect } from 'react'
 
-import { renderHook } from '../../src/server'
+import { renderHook } from '../index'
 
 describe('async hook tests', () => {
   const useSequence = (...values: string[]) => {

test/server/autoCleanup.disabled.ts renamed to src/server/__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('../index') as ReactHooksRenderer).renderHook
   })
 
   test('first', () => {

test/native/autoCleanup.noAfterEach.ts renamed to src/server/__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('../index') as ReactHooksRenderer).renderHook
   })
 
   test('first', () => {

test/server/autoCleanup.ts renamed to src/server/__tests__/autoCleanup.test.ts

@@ -1,5 +1,5 @@
 import { useEffect } from 'react'
-import { renderHook } from '../../src/server'
+import { renderHook } from '../index'
 
 // This verifies that by importing RHTL in an
 // environment which supports afterEach (like Jest)

test/server/cleanup.ts renamed to src/server/__tests__/cleanup.test.ts

@@ -1,5 +1,5 @@
 import { useEffect } from 'react'
-import { renderHook, cleanup } from '../../src/server'
+import { renderHook, cleanup } from '../index'
 
 describe('cleanup tests', () => {
   test('should flush effects on cleanup', async () => {

test/server/customHook.ts renamed to 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 '../index'
 
 describe('custom hook tests', () => {
   function useCounter() {

test/server/errorHook.ts renamed to src/server/__tests__/errorHook.test.ts

@@ -1,6 +1,6 @@
 import { useState, useEffect } from 'react'
 
-import { renderHook } from '../../src/server'
+import { renderHook } from '../index'
 
 describe('error hook tests', () => {
   function useError(throwError?: boolean) {

test/server/hydrationErrors.ts renamed to src/server/__tests__/hydrationErrors.test.ts

@@ -1,5 +1,5 @@
 import { useState, useCallback } from 'react'
-import { renderHook } from '../../src/server'
+import { renderHook } from '../index'
 
 describe('hydration errors tests', () => {
   function useCounter() {

test/server/useContext.tsx renamed to src/server/__tests__/useContext.test.tsx

@@ -1,5 +1,5 @@
 import React, { createContext, useContext } from 'react'
-import { renderHook } from '../../src/server'
+import { renderHook } from '../index'
 
 describe('useContext tests', () => {
   test('should get default value from context', () => {

test/server/useEffect.ts renamed to src/server/__tests__/useEffect.test.ts

@@ -1,5 +1,5 @@
 import { useEffect } from 'react'
-import { renderHook } from '../../src/server'
+import { renderHook } from '../index'
 
 describe('useEffect tests', () => {
   test('should handle useEffect hook', () => {

test/server/useMemo.ts renamed to src/server/__tests__/useMemo.test.ts

@@ -1,5 +1,5 @@
 import { useMemo, useCallback } from 'react'
-import { renderHook } from '../../src/server'
+import { renderHook } from '../index'
 
 describe('useCallback tests', () => {
   test('should handle useMemo hook', () => {

test/server/useReducer.ts renamed to src/server/__tests__/useReducer.test.ts

@@ -1,5 +1,5 @@
 import { useReducer } from 'react'
-import { renderHook, act } from '../../src/server'
+import { renderHook, act } from '../index'
 
 describe('useReducer tests', () => {
   test('should handle useReducer hook', () => {