[pull] main from TanStack:main

eslint.config.js

@@ -52,10 +52,14 @@ export default [
     plugins: { vitest },
     rules: {
       ...vitest.configs.recommended.rules,
+      'vitest/consistent-test-it': [
+        'error',
+        { fn: 'it', withinDescribe: 'it' },
+      ],
       'vitest/no-standalone-expect': [
         'error',
         {
-          additionalTestBlockFunctions: ['testIf'],
+          additionalTestBlockFunctions: ['itIf'],
         },
       ],
     },

packages/angular-query-experimental/src/__tests__/infinite-query-options.test-d.ts

@@ -1,4 +1,4 @@
-import { assertType, describe, expectTypeOf, it, test } from 'vitest'
+import { assertType, describe, expectTypeOf, it } from 'vitest'
 import { queryKey } from '@tanstack/query-test-utils'
 import { QueryClient, dataTagSymbol } from '@tanstack/query-core'
 import { infiniteQueryOptions } from '../infinite-query-options'
@@ -139,7 +139,7 @@ describe('infiniteQueryOptions', () => {
     >()
   })
 
-  test('should not be allowed to be passed to non-infinite query functions', () => {
+  it('should not be allowed to be passed to non-infinite query functions', () => {
     const key = queryKey()
     const queryClient = new QueryClient()
     const options = infiniteQueryOptions({
@@ -166,7 +166,7 @@ describe('infiniteQueryOptions', () => {
     )
   })
 
-  test('allow optional initialData function', () => {
+  it('allow optional initialData function', () => {
     const key = queryKey()
     const initialData: { example: boolean } | undefined = { example: true }
     const queryOptions = infiniteQueryOptions({
@@ -185,7 +185,7 @@ describe('infiniteQueryOptions', () => {
     >()
   })
 
-  test('allow optional initialData object', () => {
+  it('allow optional initialData object', () => {
     const key = queryKey()
     const initialData: { example: boolean } | undefined = { example: true }
     const queryOptions = infiniteQueryOptions({

packages/angular-query-experimental/src/__tests__/inject-infinite-query.test-d.ts

@@ -1,5 +1,5 @@
 import { TestBed } from '@angular/core/testing'
-import { afterEach, beforeEach, describe, expectTypeOf, test, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expectTypeOf, it, vi } from 'vitest'
 import { provideZonelessChangeDetection } from '@angular/core'
 import { queryKey, sleep } from '@tanstack/query-test-utils'
 import { QueryClient, injectInfiniteQuery, provideTanStackQuery } from '..'
@@ -23,7 +23,7 @@ describe('injectInfiniteQuery', () => {
     vi.useRealTimers()
   })
 
-  test('should narrow type after isSuccess', () => {
+  it('should narrow type after isSuccess', () => {
     const key = queryKey()
     const query = TestBed.runInInjectionContext(() => {
       return injectInfiniteQuery(() => ({

packages/angular-query-experimental/src/__tests__/inject-infinite-query.test.ts

@@ -1,5 +1,5 @@
 import { TestBed } from '@angular/core/testing'
-import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { Injector, provideZonelessChangeDetection } from '@angular/core'
 import { queryKey, sleep } from '@tanstack/query-test-utils'
 import { QueryClient, injectInfiniteQuery, provideTanStackQuery } from '..'
@@ -23,7 +23,7 @@ describe('injectInfiniteQuery', () => {
     vi.useRealTimers()
   })
 
-  test('should properly execute infinite query', async () => {
+  it('should properly execute infinite query', async () => {
     const key = queryKey()
     const query = TestBed.runInInjectionContext(() => {
       return injectInfiniteQuery(() => ({
@@ -64,7 +64,7 @@ describe('injectInfiniteQuery', () => {
   })
 
   describe('injection context', () => {
-    test('throws NG0203 with descriptive error outside injection context', () => {
+    it('throws NG0203 with descriptive error outside injection context', () => {
       const key = queryKey()
       expect(() => {
         injectInfiniteQuery(() => ({
@@ -77,7 +77,7 @@ describe('injectInfiniteQuery', () => {
       }).toThrow(/NG0203(.*?)injectInfiniteQuery/)
     })
 
-    test('can be used outside injection context when passing an injector', () => {
+    it('can be used outside injection context when passing an injector', () => {
       const key = queryKey()
       const query = injectInfiniteQuery(
         () => ({

packages/angular-query-experimental/src/__tests__/inject-is-fetching.test.ts

@@ -1,5 +1,5 @@
 import { TestBed } from '@angular/core/testing'
-import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { Injector, provideZonelessChangeDetection } from '@angular/core'
 import { queryKey, sleep } from '@tanstack/query-test-utils'
 import {
@@ -28,7 +28,7 @@ describe('injectIsFetching', () => {
     vi.useRealTimers()
   })
 
-  test('Returns number of fetching queries', async () => {
+  it('Returns number of fetching queries', async () => {
     const key = queryKey()
     const isFetching = TestBed.runInInjectionContext(() => {
       injectQuery(() => ({
@@ -46,13 +46,13 @@ describe('injectIsFetching', () => {
   })
 
   describe('injection context', () => {
-    test('throws NG0203 with descriptive error outside injection context', () => {
+    it('throws NG0203 with descriptive error outside injection context', () => {
       expect(() => {
         injectIsFetching()
       }).toThrow(/NG0203(.*?)injectIsFetching/)
     })
 
-    test('can be used outside injection context when passing an injector', () => {
+    it('can be used outside injection context when passing an injector', () => {
       expect(
         injectIsFetching(undefined, {
           injector: TestBed.inject(Injector),

packages/angular-query-experimental/src/__tests__/inject-is-mutating.test.ts

@@ -1,4 +1,4 @@
-import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { TestBed } from '@angular/core/testing'
 import { Injector, provideZonelessChangeDetection } from '@angular/core'
 import { queryKey, sleep } from '@tanstack/query-test-utils'
@@ -28,7 +28,7 @@ describe('injectIsMutating', () => {
     vi.useRealTimers()
   })
 
-  test('should properly return isMutating state', async () => {
+  it('should properly return isMutating state', async () => {
     const key = queryKey()
     const [mutation, isMutating] = TestBed.runInInjectionContext(() => [
       injectMutation(() => ({
@@ -52,13 +52,13 @@ describe('injectIsMutating', () => {
   })
 
   describe('injection context', () => {
-    test('throws NG0203 with descriptive error outside injection context', () => {
+    it('throws NG0203 with descriptive error outside injection context', () => {
       expect(() => {
         injectIsMutating()
       }).toThrow(/NG0203(.*?)injectIsMutating/)
     })
 
-    test('can be used outside injection context when passing an injector', () => {
+    it('can be used outside injection context when passing an injector', () => {
       expect(
         injectIsMutating(undefined, {
           injector: TestBed.inject(Injector),

packages/angular-query-experimental/src/__tests__/inject-is-restoring.test.ts

@@ -1,5 +1,5 @@
 import { TestBed } from '@angular/core/testing'
-import { describe, expect, test } from 'vitest'
+import { describe, expect, it } from 'vitest'
 import { Injector, provideZonelessChangeDetection, signal } from '@angular/core'
 import {
   QueryClient,
@@ -11,7 +11,7 @@ import {
 describe('injectIsRestoring', () => {
   let queryClient: QueryClient
 
-  test('returns false by default when provideIsRestoring is not used', () => {
+  it('returns false by default when provideIsRestoring is not used', () => {
     queryClient = new QueryClient()
 
     TestBed.configureTestingModule({
@@ -28,7 +28,7 @@ describe('injectIsRestoring', () => {
     expect(isRestoring()).toBe(false)
   })
 
-  test('returns provided signal value when provideIsRestoring is used', () => {
+  it('returns provided signal value when provideIsRestoring is used', () => {
     queryClient = new QueryClient()
     const restoringSignal = signal(true)
 
@@ -47,7 +47,7 @@ describe('injectIsRestoring', () => {
     expect(isRestoring()).toBe(true)
   })
 
-  test('can be used outside injection context when passing an injector', () => {
+  it('can be used outside injection context when passing an injector', () => {
     queryClient = new QueryClient()
 
     TestBed.configureTestingModule({
@@ -64,7 +64,7 @@ describe('injectIsRestoring', () => {
     expect(isRestoring()).toBe(false)
   })
 
-  test('throws NG0203 with descriptive error outside injection context', () => {
+  it('throws NG0203 with descriptive error outside injection context', () => {
     expect(() => {
       injectIsRestoring()
     }).toThrow(/NG0203(.*?)injectIsRestoring/)

packages/angular-query-experimental/src/__tests__/inject-mutation-state.test.ts

@@ -6,7 +6,7 @@ import {
   signal,
 } from '@angular/core'
 import { TestBed } from '@angular/core/testing'
-import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { By } from '@angular/platform-browser'
 import { queryKey, sleep } from '@tanstack/query-test-utils'
 import {
@@ -36,7 +36,7 @@ describe('injectMutationState', () => {
   })
 
   describe('injectMutationState', () => {
-    test('should return variables after calling mutate 1', () => {
+    it('should return variables after calling mutate 1', () => {
       const mutationKey = queryKey()
       const variables = 'foo123'
 
@@ -59,7 +59,7 @@ describe('injectMutationState', () => {
       expect(mutationState()).toEqual([variables])
     })
 
-    test('reactive options should update injectMutationState', () => {
+    it('reactive options should update injectMutationState', () => {
       const mutationKey1 = queryKey()
       const mutationKey2 = queryKey()
       const variables1 = 'foo123'
@@ -96,7 +96,7 @@ describe('injectMutationState', () => {
       expect(mutationState()).toEqual([variables2])
     })
 
-    test('should return variables after calling mutate 2', () => {
+    it('should return variables after calling mutate 2', () => {
       queryClient.clear()
       const mutationKey = queryKey()
       const variables = 'bar234'
@@ -117,7 +117,7 @@ describe('injectMutationState', () => {
       expect(mutationState()[0]?.variables).toEqual(variables)
     })
 
-    test('should support required signal inputs', async () => {
+    it('should support required signal inputs', async () => {
       queryClient.clear()
       const fakeName = 'name1'
       const mutationKey1 = ['fake', fakeName]
@@ -179,13 +179,13 @@ describe('injectMutationState', () => {
     })
 
     describe('injection context', () => {
-      test('throws NG0203 with descriptive error outside injection context', () => {
+      it('throws NG0203 with descriptive error outside injection context', () => {
         expect(() => {
           injectMutationState()
         }).toThrow(/NG0203(.*?)injectMutationState/)
       })
 
-      test('can be used outside injection context when passing an injector', () => {
+      it('can be used outside injection context when passing an injector', () => {
         const injector = TestBed.inject(Injector)
         expect(
           injectMutationState(undefined, {

packages/angular-query-experimental/src/__tests__/inject-mutation.test-d.ts

@@ -1,19 +1,19 @@
-import { describe, expectTypeOf, test } from 'vitest'
+import { describe, expectTypeOf, it } from 'vitest'
 import { sleep } from '@tanstack/query-test-utils'
 import { injectMutation } from '..'
 import type { Signal } from '@angular/core'
 
 describe('injectMutation', () => {
   describe('Discriminated union return type', () => {
-    test('data should be possibly undefined by default', () => {
+    it('data should be possibly undefined by default', () => {
       const mutation = injectMutation(() => ({
         mutationFn: () => sleep(0).then(() => 'string'),
       }))
 
       expectTypeOf(mutation.data).toEqualTypeOf<Signal<string | undefined>>()
     })
 
-    test('data should be defined when mutation is success', () => {
+    it('data should be defined when mutation is success', () => {
       const mutation = injectMutation(() => ({
         mutationFn: () => sleep(0).then(() => 'string'),
       }))
@@ -23,7 +23,7 @@ describe('injectMutation', () => {
       }
     })
 
-    test('error should be null when mutation is success', () => {
+    it('error should be null when mutation is success', () => {
       const mutation = injectMutation(() => ({
         mutationFn: () => sleep(0).then(() => 'string'),
       }))
@@ -33,7 +33,7 @@ describe('injectMutation', () => {
       }
     })
 
-    test('data should be undefined when mutation is pending', () => {
+    it('data should be undefined when mutation is pending', () => {
       const mutation = injectMutation(() => ({
         mutationFn: () => sleep(0).then(() => 'string'),
       }))
@@ -43,7 +43,7 @@ describe('injectMutation', () => {
       }
     })
 
-    test('error should be defined when mutation is error', () => {
+    it('error should be defined when mutation is error', () => {
       const mutation = injectMutation(() => ({
         mutationFn: () => sleep(0).then(() => 'string'),
       }))
@@ -53,7 +53,7 @@ describe('injectMutation', () => {
       }
     })
 
-    test('should narrow variables', () => {
+    it('should narrow variables', () => {
       const mutation = injectMutation(() => ({
         mutationFn: (_variables: string) => sleep(0).then(() => 'string'),
       }))