Merge pull request #4487 from reduxjs/feature/test-dist-ci

reduxjs · Feb 13, 2023 · 8074e0a · 8074e0a
2 parents c3af089 + 4a35430
commit 8074e0a
Show file tree

Hide file tree

Showing 27 changed files with 785 additions and 1,814 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -6,7 +6,7 @@ jobs:
     name: Check for changes
     runs-on: ubuntu-latest
     outputs:
-      toolkit: ${{ steps.filter.outputs.toolkit }}
+      src: ${{ steps.filter.outputs.src }}
     steps:
       - uses: actions/checkout@v2
       - uses: dorny/paths-filter@v2
@@ -15,10 +15,11 @@ jobs:
           filters: |
             src:
               - 'src/**'
+              - 'test/**'
 
   build:
     needs: changes
-    #if: ${{ needs.changes.outputs.src == 'true' }}
+    if: ${{ needs.changes.outputs.src == 'true' }}
 
     name: Lint, Test, Build & Pack on Node ${{ matrix.node }}
 
@@ -40,6 +41,9 @@ jobs:
       - name: Install deps
         run: yarn install
 
+      - name: Build
+        run: yarn build
+
       - name: Pack
         run: yarn pack
 
@@ -79,6 +83,8 @@ jobs:
       - name: Install build artifact
         run: yarn  add ./package.tgz
 
+      - run: sed -i -e /@remap-prod-remove-line/d ./tsconfig.json ./vitest.config.ts ./test/tsconfig.json ./test/typescript/tsconfig.json
+
       - name: Run tests, against dist
         run: yarn test
 

diff --git a/docs/usage/MigratingToRedux.md b/docs/usage/MigratingToRedux.md
diff --git a/jest.config.cjs b/jest.config.cjs
diff --git a/package.json b/package.json
@@ -47,13 +47,13 @@
     "format": "prettier --write \"{src,test}/**/*.{js,ts}\" \"**/*.md\"",
     "format:check": "prettier --list-different \"{src,test}/**/*.{js,ts}\" \"**/*.md\"",
     "lint": "eslint --ext js,ts src test",
-    "check-types": "tsc --noEmit",
-    "test": "jest",
-    "test:types": "tsc -p test/typescript",
-    "test:watch": "jest --watch",
-    "test:cov": "jest --coverage",
+    "check-types": "tsc --noEmit && echo \"Types compiled\"",
+    "test": "vitest",
+    "test:types": "tsc -p test/typescript && echo \"Typetests passed\"",
+    "test:watch": "vitest --watch",
+    "test:cov": "vitest --coverage",
     "build": "rollup -c",
-    "prepublishOnly": "yarn clean && yan check-types && yarn format:check && yarn lint && yarn test",
+    "prepublishOnly": "yarn clean && yarn check-types && yarn format:check && yarn lint && yarn test",
     "examples:lint": "eslint --ext js,ts examples",
     "examples:test": "cross-env CI=true babel-node examples/testAll.js",
     "tsc": "tsc"
@@ -74,11 +74,9 @@
     "@rollup/plugin-node-resolve": "^15.0.1",
     "@rollup/plugin-replace": "^5.0.0",
     "@rollup/plugin-terser": "^0.4.0",
-    "@types/jest": "29.0.0",
     "@types/node": "^18.7.16",
     "@typescript-eslint/eslint-plugin": "^5.36.2",
     "@typescript-eslint/parser": "^5.36.2",
-    "babel-jest": "^29.0.3",
     "cross-env": "^7.0.3",
     "eslint": "^8.23.0",
     "eslint-config-react-app": "^7.0.1",
@@ -89,15 +87,14 @@
     "eslint-plugin-react": "^7.31.8",
     "eslint-plugin-react-hooks": "^4.6.0",
     "glob": "^8.0.3",
-    "jest": "^29.0.3",
     "netlify-plugin-cache": "^1.0.3",
     "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
     "rollup": "^3.12.0",
     "rollup-plugin-typescript2": "^0.34.1",
     "rxjs": "^7.5.6",
-    "ts-jest": "^29.0.0",
-    "typescript": "^4.8.3"
+    "typescript": "^4.8.3",
+    "vitest": "^0.27.2"
   },
   "npmName": "redux",
   "npmFileMap": [

diff --git a/test/applyMiddleware.spec.ts b/test/applyMiddleware.spec.ts
@@ -7,7 +7,8 @@ import {
   Action,
   Store,
   Dispatch
-} from '../src'
+} from 'redux'
+import { vi } from 'vitest'
 import * as reducers from './helpers/reducers'
 import { addTodo, addTodoAsync, addTodoIfEmpty } from './helpers/actionCreators'
 import { thunk } from './helpers/middleware'
@@ -34,7 +35,7 @@ describe('applyMiddleware', () => {
       }
     }
 
-    const spy = jest.fn()
+    const spy = vi.fn()
     const store = applyMiddleware(test(spy), thunk)(createStore)(reducers.todos)
 
     store.dispatch(addTodo('Use Redux'))
@@ -59,7 +60,7 @@ describe('applyMiddleware', () => {
       }
     }
 
-    const spy = jest.fn()
+    const spy = vi.fn()
     const store = applyMiddleware(test(spy), thunk)(createStore)(reducers.todos)
 
     // the typing for redux-thunk is super complex, so we will use an as unknown hack
@@ -71,7 +72,7 @@ describe('applyMiddleware', () => {
     })
   })
 
-  it('works with thunk middleware', done => {
+  it('works with thunk middleware', async () => {
     const store = applyMiddleware(thunk)(createStore)(reducers.todos)
 
     store.dispatch(addTodoIfEmpty('Hello') as any)
@@ -106,27 +107,25 @@ describe('applyMiddleware', () => {
     const dispatchedValue = store.dispatch(
       addTodoAsync('Maybe') as any
     ) as unknown as Promise<void>
-    dispatchedValue.then(() => {
-      expect(store.getState()).toEqual([
-        {
-          id: 1,
-          text: 'Hello'
-        },
-        {
-          id: 2,
-          text: 'World'
-        },
-        {
-          id: 3,
-          text: 'Maybe'
-        }
-      ])
-      done()
-    })
+    await dispatchedValue
+    expect(store.getState()).toEqual([
+      {
+        id: 1,
+        text: 'Hello'
+      },
+      {
+        id: 2,
+        text: 'World'
+      },
+      {
+        id: 3,
+        text: 'Maybe'
+      }
+    ])
   })
 
   it('passes through all arguments of dispatch calls from within middleware', () => {
-    const spy = jest.fn()
+    const spy = vi.fn()
     const testCallArgs = ['test']
 
     interface MultiDispatch<A extends Action = AnyAction> {

diff --git a/test/combineReducers.spec.ts b/test/combineReducers.spec.ts
@@ -5,7 +5,8 @@ import {
   Reducer,
   AnyAction,
   __DO_NOT_USE__ActionTypes as ActionTypes
-} from '../src'
+} from 'redux'
+import { vi } from 'vitest'
 
 describe('Utils', () => {
   describe('combineReducers', () => {
@@ -39,7 +40,7 @@ describe('Utils', () => {
 
     it('warns if a reducer prop is undefined', () => {
       const preSpy = console.error
-      const spy = jest.fn()
+      const spy = vi.fn()
       console.error = spy
 
       let isNotDefined: any
@@ -199,7 +200,7 @@ describe('Utils', () => {
 
     it('warns if no reducers are passed to combineReducers', () => {
       const preSpy = console.error
-      const spy = jest.fn()
+      const spy = vi.fn()
       console.error = spy
 
       const reducer = combineReducers({})
@@ -214,7 +215,7 @@ describe('Utils', () => {
 
     it('warns if input state does not match reducer shape', () => {
       const preSpy = console.error
-      const spy = jest.fn()
+      const spy = vi.fn()
       const nullAction = undefined as unknown as AnyAction
       console.error = spy
 
@@ -287,7 +288,7 @@ describe('Utils', () => {
 
     it('only warns for unexpected keys once', () => {
       const preSpy = console.error
-      const spy = jest.fn()
+      const spy = vi.fn()
       console.error = spy
       const nullAction = { type: '' }