Hack in a way to expose polling update counters in tests

# Conflicts:
#	packages/toolkit/src/query/core/buildMiddleware/index.ts
#	packages/toolkit/src/query/core/buildMiddleware/types.ts

Author: markerikson

packages/toolkit/src/query/core/buildMiddleware/batchActions.ts

@@ -155,6 +155,15 @@ export const buildBatchedActionsHandler: InternalHandlerBuilder<
 
     let actionShouldContinue = true
 
+    // HACK Sneak the test-only polling state back out
+    if (
+      process.env.NODE_ENV === 'test' &&
+      typeof action.type === 'string' &&
+      action.type === `${api.reducerPath}/getPolling`
+    ) {
+      return [false, internalState.currentPolls] as any
+    }
+
     if (didMutate) {
       if (!updateSyncTimer) {
         // We only use the subscription state for the Redux DevTools at this point,

packages/toolkit/src/query/core/buildMiddleware/polling.ts

@@ -21,11 +21,7 @@ export const buildPollingHandler: InternalHandlerBuilder = ({
   refetchQuery,
   internalState,
 }) => {
-  const currentPolls: QueryStateMeta<{
-    nextPollTimestamp: number
-    timeout?: TimeoutId
-    pollingInterval: number
-  }> = {}
+  const { currentPolls } = internalState
 
   const { currentSubscriptions } = internalState
 
@@ -120,6 +116,13 @@ export const buildPollingHandler: InternalHandlerBuilder = ({
 
     const { lowestPollingInterval } = findLowestPollingInterval(subscriptions)
 
+    // HACK add extra data to track how many times this has been called in tests
+    if (process.env.NODE_ENV === 'test') {
+      const updateCounters = ((currentPolls as any).pollUpdateCounters ??= {})
+      updateCounters[queryCacheKey] ??= 0
+      updateCounters[queryCacheKey]++
+    }
+
     if (!Number.isFinite(lowestPollingInterval)) {
       cleanupPollForKey(queryCacheKey)
       return

packages/toolkit/src/query/core/buildMiddleware/types.ts

@@ -39,6 +39,11 @@ export type TimeoutId = ReturnType<typeof setTimeout>
 
 export interface InternalMiddlewareState {
   currentSubscriptions: SubscriptionInternalState
+  currentPolls: QueryStateMeta<{
+    nextPollTimestamp: number
+    timeout?: TimeoutId
+    pollingInterval: number
+  }>
   runningQueries: Map<
     Dispatch,
     Record<

packages/toolkit/src/query/core/module.ts

@@ -621,6 +621,7 @@ export const coreModule = ({
 
     const internalState: InternalMiddlewareState = {
       currentSubscriptions: new Map(),
+      currentPolls: {},
       runningQueries: new Map(),
       runningMutations: new Map(),
     }