chore: refactor request method tests (#1233)

graffle-js · Oct 28, 2024 · c5adaf6 · c5adaf6
1 parent 76c8994
commit c5adaf6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 19 deletions.
diff --git a/src/layers/6_client/requestMethods/client.batch.test.ts b/src/layers/6_client/requestMethods/client.batch.test.ts
diff --git a/...questMethods/client.rootMethods.test-d.ts → ...t/requestMethods/requestMethods.test-d.ts b/...questMethods/client.rootMethods.test-d.ts → ...t/requestMethods/requestMethods.test-d.ts
diff --git a/...requestMethods/client.rootMethods.test.ts → ...ent/requestMethods/requestMethods.test.ts b/...requestMethods/client.rootMethods.test.ts → ...ent/requestMethods/requestMethods.test.ts
@@ -2,14 +2,22 @@ import { describe, expect, expectTypeOf } from 'vitest'
 import { DateScalar } from '../../../../tests/_/fixtures/scalars.js'
 import { kitchenSink, test } from '../../../../tests/_/helpers.js'
 
-describe(`query`, () => {
+describe(`query batch`, () => {
+  test(`success`, async ({ kitchenSinkData: db }) => {
+    expect(await kitchenSink.query.$batch({ id: true })).toMatchObject({ id: db.id })
+  })
+  test(`error`, async ({ kitchenSinkData: db }) => {
+    await expect(kitchenSink.query.$batch({ error: true })).rejects.toMatchObject(db.errorAggregate)
+  })
+})
+
+describe(`query root field`, () => {
   test(`scalar`, async ({ kitchenSink, kitchenSinkData: db }) => {
     await expect(kitchenSink.query.id()).resolves.toEqual(db.id1)
   })
   test(`argument`, async ({ kitchenSink }) => {
     await expect(kitchenSink.query.stringWithArgs({ $: { id: `x` } })).resolves.toEqual(`{"id":"x"}`)
   })
-
   test(`object`, async ({ kitchenSink, kitchenSinkData: db }) => {
     await expect(kitchenSink.query.object({ id: true })).resolves.toEqual({ id: db.id })
   })
@@ -43,6 +51,10 @@ describe(`query`, () => {
       const result = await kitchenSink.scalar(DateScalar).query.dateArg()
       expect(result).toEqual(db.date0)
       expectTypeOf(result).toEqualTypeOf<Date | null>()
+
+      const result2 = await kitchenSink.scalar(DateScalar).query.dateObject1({ date1: true })
+      expect(result2).toEqual({ date1: db.date1 })
+      expectTypeOf(result2).toEqualTypeOf<{ date1: Date | null } | null>()
     })
     test(`argument without codec`, async ({ kitchenSinkData: db }) => {
       await kitchenSink.query.dateArg({ $: { date: db.date0Encoded } })

diff --git a/tests/_/schemas/kitchen-sink/schema.ts b/tests/_/schemas/kitchen-sink/schema.ts
@@ -230,7 +230,7 @@ builder.queryType({
       type: t.listRef(t.listRef(`Date`)),
       resolve: () => [[db.date0, db.date1], [db.date0, db.date1]],
     }),
-    dateObject1: t.field({ type: DateObject1, resolve: () => ({ date1: db.date0 }) }),
+    dateObject1: t.field({ type: DateObject1, resolve: () => ({ date1: db.date1 }) }),
     dateUnion: t.field({ type: DateUnion, resolve: () => ({ date1: db.date0 }) }),
     dateInterface1: t.field({
       type: DateInterface1,