Implement wasp/client/test API (#1704)

wasp-lang · Jan 31, 2024 · 1ded74f · 1ded74f
1 parent d1f544e
commit 1ded74f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/...ata/Generator/templates/sdk/test/index.ts → ...erator/templates/sdk/client/test/index.ts b/...ata/Generator/templates/sdk/test/index.ts → ...erator/templates/sdk/client/test/index.ts
diff --git a/...tor/templates/sdk/test/vitest/helpers.tsx → ...plates/sdk/client/test/vitest/helpers.tsx b/...tor/templates/sdk/test/vitest/helpers.tsx → ...plates/sdk/client/test/vitest/helpers.tsx
@@ -10,15 +10,19 @@ import { Query } from 'wasp/rpc'
 import config from 'wasp/core/config'
 import { HttpMethod, Route } from 'wasp/types'
 
+// PRIVATE API
 export type { Route } from 'wasp/types'
 
+// PRIVATE API
 export type MockQuery = <Input, Output, MockOutput extends Output>(
   query: Query<Input, Output>,
   resJson: MockOutput
 ) => void
 
+// PRIVATE API
 export type MockApi = (route: Route, resJson: unknown) => void
 
+// PUBLIC API
 // Inspired by the Tanstack React Query helper:
 // https://github.com/TanStack/query/blob/4ae99561ca3383d6de3f4aad656a49ba4a17b57a/packages/react-query/src/__tests__/utils.tsx#L7-L26
 export function renderInContext(ui: ReactElement): RenderResult {
@@ -39,6 +43,7 @@ export function renderInContext(ui: ReactElement): RenderResult {
   }
 }
 
+// PUBLIC API
 export function mockServer(): {
   server: SetupServer
   mockQuery: MockQuery

diff --git a/waspc/data/Generator/templates/sdk/package.json b/waspc/data/Generator/templates/sdk/package.json
@@ -74,10 +74,8 @@
       "./server/queries": "./dist/server/queries/index.js",
       {=!  Used by our code, uncodumented (but accessible) for users. =}
       "./server/auth/email": "./dist/server/auth/email/index.js",
-      {=!  Used by users, documented. =}
-      "./test": "./dist/test/index.js",
       {=!  Used by our code, uncodumented (but accessible) for users. =}
-      "./test/*": "./dist/test/*.js",
+      "./client/test/*": "./dist/client/test/*.js",
       {=!  Used by our code, uncodumented (but accessible) for users. =}
       "./server/crud/*": "./dist/server/crud/*",
       {=!  Used by our code, uncodumented (but accessible) for users. =}
@@ -118,7 +116,8 @@
       "./client/crud": "./dist/client/crud/index.js",
       "./server/email": "./dist/server/email/index.js",
       "./server/jobs": "./dist/server/jobs/index.js",
-      "./client/router": "./dist/client/router/index.js"
+      "./client/router": "./dist/client/router/index.js",
+      "./client/test": "./dist/client/test/index.js"
    },
    {=!
      TypeScript doesn't care about the redirects we define above in "exports" field; those

diff --git a/waspc/examples/todo-typescript/src/Todo.test.tsx b/waspc/examples/todo-typescript/src/Todo.test.tsx
@@ -1,7 +1,7 @@
 import { test, expect } from 'vitest'
 import { screen } from '@testing-library/react'
 
-import { mockServer, renderInContext } from 'wasp/test'
+import { mockServer, renderInContext } from 'wasp/client/test'
 import { getTasks } from 'wasp/rpc/queries'
 import { Todo, areThereAnyTasks } from './Todo'
 import { MainPage } from './MainPage'

diff --git a/waspc/src/Wasp/Generator/SdkGenerator.hs b/waspc/src/Wasp/Generator/SdkGenerator.hs
@@ -93,9 +93,9 @@ genSdkReal spec =
       genFileCopy [relfile|server/HttpError.ts|],
       genFileCopy [relfile|server/AuthError.ts|],
       genFileCopy [relfile|types/index.ts|],
-      genFileCopy [relfile|test/vitest/helpers.tsx|],
-      genFileCopy [relfile|test/index.ts|],
       genFileCopy [relfile|server/jobs/pgBoss/types.ts|],
+      genFileCopy [relfile|client/test/vitest/helpers.tsx|],
+      genFileCopy [relfile|client/test/index.ts|],
       genServerConfigFile spec,
       genTsConfigJson,
       genServerUtils spec,