Skip to content

refactor: move tests to specificly related folders #531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 10, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}
}
12 changes: 11 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -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
7 changes: 0 additions & 7 deletions jest.config.js

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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[]) => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion test/dom/cleanup.ts → src/dom/__tests__/cleanup.test.ts
Original file line number Diff line number Diff line change
@@ -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 () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { renderHook } from '../../src/dom'
import { renderHook } from '..'

describe('result history tests', () => {
let count = 0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { renderHook } from '../../src/dom'
import { renderHook } from '..'

describe('suspense hook tests', () => {
const cache: { value?: Promise<string | Error> | string | Error } = {}
Expand Down
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down
2 changes: 1 addition & 1 deletion test/dom/useMemo.ts → src/dom/__tests__/useMemo.test.ts
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down
2 changes: 1 addition & 1 deletion test/dom/useRef.ts → src/dom/__tests__/useRef.test.ts
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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[]) => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -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 () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { renderHook } from '../../src/native'
import { renderHook } from '..'

describe('result history tests', () => {
let count = 0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { renderHook } from '../../src/native'
import { renderHook } from '..'

describe('suspense hook tests', () => {
const cache: { value?: Promise<string | Error> | string | Error } = {}
Expand Down
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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[]) => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -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 () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useState, useCallback } from 'react'
import { renderHook } from '../../src/server'
import { renderHook } from '..'

describe('hydration errors tests', () => {
function useCounter() {
Expand Down
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect } from 'react'
import { renderHook } from '../../src/server'
import { renderHook } from '..'

describe('useEffect tests', () => {
test('should handle useEffect hook', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down
Loading