Update test suite to run vs standard and "compat" entry points

Author: markerikson

jest.config.js

@@ -29,6 +29,18 @@ const rnConfig = {
   },
 }
 
+const compatEntryConfig = {
+  ...tsStandardConfig,
+  displayName: 'Compat',
+  moduleNameMapper: {
+    '^react$': 'react-17',
+    '^react-dom$': 'react-dom-17',
+    '^react-test-renderer$': 'react-test-renderer-17',
+    '^@testing-library/react$': '@testing-library/react-12',
+    '../../src/index': '<rootDir>/src/compat',
+  },
+}
+
 module.exports = {
-  projects: [tsStandardConfig, rnConfig],
+  projects: [tsStandardConfig, rnConfig, compatEntryConfig],
 }

test/components/connect.spec.tsx

@@ -14,6 +14,8 @@ import type {
 } from 'redux'
 import type { ReactReduxContextValue } from '../../src/index'
 
+const IS_REACT_18 = React.version.startsWith('18')
+
 describe('React', () => {
   describe('connect', () => {
     const propMapper = (prop: any): ReactNode => {
@@ -2897,7 +2899,13 @@ describe('React', () => {
           </React.StrictMode>
         )
 
-        expect(spy).not.toHaveBeenCalled()
+        if (IS_REACT_18) {
+          expect(spy).not.toHaveBeenCalled()
+        } else {
+          expect(spy.mock.calls[0]?.[0]).toEqual(
+            expect.stringContaining('was not wrapped in act')
+          )
+        }
       })
     })
 

test/components/hooks.spec.tsx

@@ -7,6 +7,8 @@ import * as rtl from '@testing-library/react'
 import '@testing-library/jest-dom/extend-expect'
 import type { AnyAction } from 'redux'
 
+const IS_REACT_18 = React.version.startsWith('18')
+
 describe('React', () => {
   describe('connect', () => {
     afterEach(() => rtl.cleanup())
@@ -146,9 +148,9 @@ describe('React', () => {
       expect(mapStateSpy2).toHaveBeenCalledTimes(3)
 
       // 2. Batched update from nested subscriber / C1 re-render
-      // expect(renderSpy2).toHaveBeenCalledTimes(2)
-      // TODO Getting 3 instead of 2
-      expect(renderSpy2).toHaveBeenCalledTimes(3)
+      // Not sure why the differences across versions here
+      const numFinalRenders = IS_REACT_18 ? 3 : 2
+      expect(renderSpy2).toHaveBeenCalledTimes(numFinalRenders)
     })
   })
 })

test/hooks/useSelector.spec.tsx

@@ -1,6 +1,7 @@
 /*eslint-disable react/prop-types*/
 
 import React, { useCallback, useReducer, useLayoutEffect } from 'react'
+import ReactDOM from 'react-dom'
 import { createStore } from 'redux'
 import * as rtl from '@testing-library/react'
 import {
@@ -10,9 +11,14 @@ import {
   connect,
   createSelectorHook,
 } from '../../src/index'
+import type {
+  TypedUseSelectorHook,
+  ReactReduxContextValue,
+} from '../../src/index'
 import type { FunctionComponent, DispatchWithoutAction, ReactNode } from 'react'
 import type { Store, AnyAction } from 'redux'
-import type { TypedUseSelectorHook, ReactReduxContextValue } from '../../src/'
+
+const IS_REACT_18 = React.version.startsWith('18')
 
 describe('React', () => {
   describe('hooks', () => {
@@ -498,7 +504,13 @@ describe('React', () => {
             </ProviderMock>
           )
 
-          expect(() => normalStore.dispatch({ type: '' })).not.toThrowError()
+          const doDispatch = () => normalStore.dispatch({ type: '' })
+          // Seems to be an alteration in behavior - not sure if 17/18, or shim/built-in
+          if (IS_REACT_18) {
+            expect(doDispatch).not.toThrowError()
+          } else {
+            expect(doDispatch).toThrowError()
+          }
 
           spy.mockRestore()
         })