move hooks spec to tests folder

mattfysh · mattfysh · commit ba7a772b4572 · 2025-09-10T11:10:14.000+10:00
diff --git a/test/helpers.ts b/test/helpers.ts
@@ -11,6 +11,7 @@ type ExecuteOptions = Partial<{
   fetch: Fetch
   modifier: ModifierHook
   willThrow: boolean
+  hooks: Hooks
 }>
 
 export type Fetch = (url: string, opts: RequestInit) => MaybePromise<Response>
@@ -54,6 +55,7 @@ export async function execute(
         body: await res.text(),
       }
     },
+    ...options.hooks,
   }
 
   return executeModule('Home', inputs, hooks)
diff --git a/test/hooks.spec.ts b/test/hooks.spec.ts
@@ -8,7 +8,7 @@ import type {
   SliceHook,
 } from '@getlang/lib'
 import { invariant } from '@getlang/lib'
-import { execute } from './index.js'
+import { execute } from './helpers.js'
 
 describe('hook', () => {
   test('on request', async () => {
@@ -19,29 +19,27 @@ describe('hook', () => {
       extract -> h1
     `
 
-    const requestHook = mock<RequestHook>(async () => ({
+    const request = mock<RequestHook>(async () => ({
       status: 200,
       headers: new Headers({ 'content-type': 'text/html' }),
       body: '<!doctype html><h1>test</h1>',
     }))
 
-    const result = await execute(src, {}, { request: requestHook })
+    const result = await execute(src, {}, { hooks: { request } })
 
-    expect(requestHook).toHaveBeenCalledWith('http://get.com/', {
+    expect(request).toHaveServed('http://get.com/', {
       method: 'GET',
-      headers: expect.headers(
-        new globalThis.Headers({
-          Accept: 'text/html',
-        }),
-      ),
+      headers: new Headers({
+        Accept: 'text/html',
+      }),
     })
     expect(result).toEqual('test')
   })
 
   test('on slice', async () => {
-    const sliceHook = mock<SliceHook>(() => 3)
-    const result = await execute('extract `1 + 2`', {}, { slice: sliceHook })
-    expect(sliceHook).toHaveBeenCalledWith('return 1 + 2;;', undefined)
+    const slice = mock<SliceHook>(() => 3)
+    const result = await execute('extract `1 + 2`', {}, { hooks: { slice } })
+    expect(slice).toHaveBeenCalledWith('return 1 + 2;;', undefined)
     expect(result).toEqual(3)
   })
 
@@ -60,17 +58,16 @@ describe('hook', () => {
           }
         }
       `,
-    }
-
-    const src = `
-      set inputA = |"foo"|
+      Home: `
+        set inputA = |"foo"|
 
-      extract {
-        topValue: @Top({ $inputA }) -> value
-        midValue: @Mid -> value
-        botValue: |"bot"|
-      }
-    `
+        extract {
+          topValue: @Top({ $inputA }) -> value
+          midValue: @Mid -> value
+          botValue: |"bot"|
+        }
+      `,
+    }
 
     const hooks: Hooks = {
       import: mock<ImportHook>(async (module: string) => {
@@ -81,7 +78,7 @@ describe('hook', () => {
       call: mock<CallHook>(() => {}),
       extract: mock<ExtractHook>(() => {}),
     }
-    const result = await execute(src, {}, hooks)
+    const result = await execute(modules, {}, { hooks })
 
     expect(result).toEqual({
       topValue: 'top::foo',
@@ -92,9 +89,10 @@ describe('hook', () => {
       botValue: 'bot',
     })
 
-    expect(hooks.import).toHaveBeenCalledTimes(2)
-    expect(hooks.import).toHaveBeenNthCalledWith(1, 'Top')
-    expect(hooks.import).toHaveBeenNthCalledWith(2, 'Mid')
+    expect(hooks.import).toHaveBeenCalledTimes(3)
+    expect(hooks.import).toHaveBeenNthCalledWith(1, 'Home')
+    expect(hooks.import).toHaveBeenNthCalledWith(2, 'Top')
+    expect(hooks.import).toHaveBeenNthCalledWith(3, 'Mid')
 
     expect(hooks.call).toHaveBeenCalledTimes(3)
     expect(hooks.call).toHaveBeenNthCalledWith(1, 'Top', { inputA: 'foo' })
@@ -127,22 +125,3 @@ describe('hook', () => {
     )
   })
 })
-
-expect.extend({
-  headers(received: unknown, expected: Headers) {
-    if (!(received instanceof Headers)) {
-      return {
-        message: () => 'expected headers object',
-        pass: false,
-      }
-    }
-
-    const pass = this.equals(
-      Object.fromEntries(received as any),
-      Object.fromEntries(expected as any),
-    )
-
-    const message = () => 'todo'
-    return { pass, message }
-  },
-})

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ type ExecuteOptions = Partial<{`
`11`	`11`	`fetch: Fetch`
`12`	`12`	`modifier: ModifierHook`
`13`	`13`	`willThrow: boolean`
	`14`	`+ hooks: Hooks`
`14`	`15`	`}>`
`15`	`16`
`16`	`17`	`export type Fetch = (url: string, opts: RequestInit) => MaybePromise<Response>`
`@@ -54,6 +55,7 @@ export async function execute(`
`54`	`55`	`body: await res.text(),`
`55`	`56`	`}`
`56`	`57`	`},`
	`58`	`+ ...options.hooks,`
`57`	`59`	`}`
`58`	`60`
`59`	`61`	`return executeModule('Home', inputs, hooks)`