@workos/oagen-emitters 0.0.1 → 0.2.0

package/src/node/tests.ts

@@ -1,5 +1,6 @@
 import type { ApiSpec, Service, Operation, Model, TypeRef, EmitterContext, GeneratedFile } from '@workos/oagen';
 import { planOperation, toCamelCase } from '@workos/oagen';
+import { unwrapListModel, ID_PREFIXES } from './fixtures.js';
 import {
   fieldName,
   wireFieldName,
@@ -7,9 +8,19 @@ import {
   serviceDirName,
   servicePropertyName,
   resolveMethodName,
-  resolveServiceName,
+  resolveInterfaceName,
 } from './naming.js';
 import { generateFixtures } from './fixtures.js';
+import { resolveResourceClassName } from './resources.js';
+import {
+  assignModelsToServices,
+  createServiceDirResolver,
+  isServiceCoveredByExisting,
+  uncoveredOperations,
+  relativeImport,
+  isListMetadataModel,
+  isListWrapperModel,
+} from './utils.js';
 
 export function generateTests(spec: ApiSpec, ctx: EmitterContext): GeneratedFile[] {
   const files: GeneratedFile[] = [];
@@ -23,9 +34,21 @@ export function generateTests(spec: ApiSpec, ctx: EmitterContext): GeneratedFile
   // Build model lookup for response field assertions
   const modelMap = new Map(spec.models.map((m) => [m.name, m]));
 
-  // Generate test files per service
+  // Generate test files per service — skip services whose endpoints are fully
+  // covered by existing hand-written service classes. For partially covered
+  // services, generate tests only for uncovered operations.
   for (const service of spec.services) {
-    files.push(generateServiceTest(service, spec, ctx, modelMap));
+    if (isServiceCoveredByExisting(service, ctx)) continue;
+    const ops = uncoveredOperations(service, ctx);
+    if (ops.length === 0) continue;
+    const testService = ops.length < service.operations.length ? { ...service, operations: ops } : service;
+    files.push(generateServiceTest(testService, spec, ctx, modelMap));
+  }
+
+  // Generate serializer round-trip tests
+  const serializerTests = generateSerializerTests(spec, ctx);
+  for (const f of serializerTests) {
+    files.push(f);
   }
 
   return files;
@@ -37,40 +60,97 @@ function generateServiceTest(
   ctx: EmitterContext,
   modelMap: Map<string, Model>,
 ): GeneratedFile {
-  const resolvedName = resolveServiceName(service, ctx);
+  const resolvedName = resolveResourceClassName(service, ctx);
   const serviceDir = serviceDirName(resolvedName);
   const serviceClass = resolvedName;
   const serviceProp = servicePropertyName(resolvedName);
   const testPath = `src/${serviceDir}/${fileName(resolvedName)}.spec.ts`;
 
+  const plans = service.operations.map((op) => ({
+    op,
+    plan: planOperation(op),
+    method: resolveMethodName(op, service, ctx),
+  }));
+
+  // Sort plans to match the existing file's method order (same as resources.ts).
+  if (ctx.overlayLookup?.methodByOperation) {
+    const methodOrder = new Map<string, number>();
+    let pos = 0;
+    for (const [, info] of ctx.overlayLookup.methodByOperation) {
+      if (!methodOrder.has(info.methodName)) {
+        methodOrder.set(info.methodName, pos++);
+      }
+    }
+    if (methodOrder.size > 0) {
+      plans.sort((a, b) => {
+        const aPos = methodOrder.get(a.method) ?? Number.MAX_SAFE_INTEGER;
+        const bPos = methodOrder.get(b.method) ?? Number.MAX_SAFE_INTEGER;
+        return aPos - bPos;
+      });
+    }
+  }
+
+  // Compute model-to-service mapping so fixture imports use the correct cross-service path.
+  // A test for service A may reference a response model owned by service B — the fixture
+  // lives in service B's fixtures directory, not service A's.
+  const { modelToService, resolveDir } = createServiceDirResolver(spec.models, spec.services, ctx);
+
   const lines: string[] = [];
 
   lines.push("import fetch from 'jest-fetch-mock';");
+
+  // Conditionally import test utilities based on what test types exist
+  const hasPaginated = plans.some((p) => p.plan.isPaginated);
+  const hasBody = plans.some((p) => p.plan.hasBody);
+  const testUtils = ['fetchOnce', 'fetchURL', 'fetchMethod'];
+  if (hasPaginated) testUtils.push('fetchSearchParams');
+  if (hasBody) testUtils.push('fetchBody');
+  // Import shared test helpers for error and pagination tests
+  if (hasPaginated) testUtils.push('testEmptyResults', 'testPaginationParams');
+  // Only import testUnauthorized when at least one operation has a response model or is paginated
+  const hasErrorTests = plans.some((p) => p.plan.responseModelName || p.plan.isPaginated);
+  if (hasErrorTests) testUtils.push('testUnauthorized');
   lines.push('import {');
-  lines.push('  fetchOnce,');
-  lines.push('  fetchURL,');
-  lines.push('  fetchSearchParams,');
-  lines.push('  fetchBody,');
+  for (const util of testUtils) {
+    lines.push(`  ${util},`);
+  }
   lines.push("} from '../common/utils/test-utils';");
   lines.push("import { WorkOS } from '../workos';");
   lines.push('');
 
-  // Import fixtures
+  // Import fixtures — use correct cross-service paths when the response model
+  // is owned by a different service than the current test file.
   const fixtureImports = new Set<string>();
-  for (const op of service.operations) {
-    const plan = planOperation(op);
+  for (const { op, plan } of plans) {
     if (plan.isPaginated && op.pagination) {
-      const itemModelName = op.pagination.itemType.kind === 'model' ? op.pagination.itemType.name : null;
+      let itemModelName = op.pagination.itemType.kind === 'model' ? op.pagination.itemType.name : null;
       if (itemModelName) {
-        fixtureImports.add(
-          `import list${itemModelName}Fixture from './fixtures/list-${fileName(itemModelName)}.fixture.json';`,
-        );
+        // Unwrap list wrapper models to match the fixture file naming in fixtures.ts
+        const rawModel = modelMap.get(itemModelName);
+        if (rawModel) {
+          const unwrapped = unwrapListModel(rawModel, modelMap);
+          if (unwrapped) {
+            itemModelName = unwrapped.name;
+          }
+        }
+        // List fixtures are always generated in the current service's directory
+        // (the service owning the list operation), not in the model's home service.
+        // Always use a local import path.
+        const fixturePath = `./fixtures/list-${fileName(itemModelName)}.fixture.json`;
+        fixtureImports.add(`import list${itemModelName}Fixture from '${fixturePath}';`);
       }
     } else if (plan.responseModelName) {
-      fixtureImports.add(
-        `import ${toCamelCase(plan.responseModelName)}Fixture from './fixtures/${fileName(plan.responseModelName)}.fixture.json';`,
-      );
+      const respService = modelToService.get(plan.responseModelName);
+      const respDir = resolveDir(respService);
+      const fixturePath =
+        respDir === serviceDir
+          ? `./fixtures/${fileName(plan.responseModelName)}.fixture.json`
+          : `../${respDir}/fixtures/${fileName(plan.responseModelName)}.fixture.json`;
+      fixtureImports.add(`import ${toCamelCase(plan.responseModelName)}Fixture from '${fixturePath}';`);
     }
+    // NOTE: Request body fixtures are not imported for body tests because
+    // fixtures use wire format (snake_case) but methods expect domain types
+    // (camelCase).  Body tests use `{} as any` instead.
   }
   for (const imp of fixtureImports) {
     lines.push(imp);
@@ -79,31 +159,37 @@ function generateServiceTest(
   lines.push('');
   lines.push("const workos = new WorkOS('sk_test_Sz3IQjepeSWaI4cMS4ms4sMuU');");
   lines.push('');
+
+  // Generate per-entity assertion helpers for models used in 2+ tests.
+  // This deduplicates the field assertion blocks that would otherwise be
+  // copy-pasted across list/find/create/update test cases.
+  const { lines: helperLines, helpers: entityHelperNames } = generateEntityHelpers(plans, modelMap, ctx);
+  for (const line of helperLines) {
+    lines.push(line);
+  }
+
   lines.push(`describe('${serviceClass}', () => {`);
   lines.push('  beforeEach(() => fetch.resetMocks());');
 
-  for (const op of service.operations) {
-    const plan = planOperation(op);
-    const method = resolveMethodName(op, service, ctx);
-
+  for (const { op, plan, method } of plans) {
     lines.push('');
     lines.push(`  describe('${method}', () => {`);
 
     if (plan.isPaginated) {
-      renderPaginatedTest(lines, op, plan, method, serviceProp, modelMap);
+      renderPaginatedTest(lines, op, plan, method, serviceProp, modelMap, ctx, entityHelperNames);
     } else if (plan.isDelete) {
-      renderDeleteTest(lines, op, method, serviceProp);
+      renderDeleteTest(lines, op, plan, method, serviceProp, modelMap);
     } else if (plan.hasBody && plan.responseModelName) {
-      renderBodyTest(lines, op, plan, method, serviceProp, modelMap);
+      renderBodyTest(lines, op, plan, method, serviceProp, modelMap, ctx, entityHelperNames);
     } else if (plan.responseModelName) {
-      renderGetTest(lines, op, plan, method, serviceProp, modelMap);
+      renderGetTest(lines, op, plan, method, serviceProp, modelMap, ctx, entityHelperNames);
     } else {
-      renderVoidTest(lines, op, method, serviceProp);
+      renderVoidTest(lines, op, plan, method, serviceProp, modelMap);
     }
 
     // Error case test for all non-void operations
     if (plan.responseModelName || plan.isPaginated) {
-      renderErrorTest(lines, op, plan, method, serviceProp);
+      renderErrorTest(lines, op, plan, method, serviceProp, modelMap);
     }
 
     lines.push('  });');
@@ -111,7 +197,36 @@ function generateServiceTest(
 
   lines.push('});');
 
-  return { path: testPath, content: lines.join('\n'), skipIfExists: true, integrateTarget: false };
+  return { path: testPath, content: lines.join('\n'), skipIfExists: true };
+}
+
+/** Compute the test value for a single path parameter.
+ *  Uses distinct values per param name so multi-param paths don't all get 'test_id'.
+ */
+function pathParamTestValue(param: { type: TypeRef; name?: string } | undefined, paramName?: string): string {
+  if (param?.type.kind === 'enum' && param.type.values?.length) {
+    const first = param.type.values[0];
+    return typeof first === 'string' ? first : String(first);
+  }
+  // Use distinct values for different path params to detect ordering bugs
+  const name = paramName ?? (param as any)?.name;
+  if (name) return `test_${fieldName(name)}`;
+  return 'test_id';
+}
+
+/** Build test arguments for all path params (handles multiple path params). */
+function buildTestPathArgs(op: Operation): string {
+  // Detect path template variables (may be more than op.pathParams if spec is incomplete)
+  const templateVars = [...op.path.matchAll(/\{(\w+)\}/g)].map(([, name]) => fieldName(name));
+  const declaredNames = new Set(op.pathParams.map((p) => fieldName(p.name)));
+  const paramByName = new Map(op.pathParams.map((p) => [fieldName(p.name), p]));
+  // Merge declared + template vars, deduplicate, preserve order
+  const allVars: string[] = [];
+  for (const p of op.pathParams) allVars.push(fieldName(p.name));
+  for (const v of templateVars) {
+    if (!declaredNames.has(v)) allVars.push(v);
+  }
+  return allVars.map((varName) => `'${pathParamTestValue(paramByName.get(varName), varName)}'`).join(', ');
 }
 
 function renderPaginatedTest(
@@ -121,46 +236,94 @@ function renderPaginatedTest(
   method: string,
   serviceProp: string,
   modelMap: Map<string, Model>,
+  ctx?: EmitterContext,
+  entityHelpers?: Set<string>,
 ): void {
-  const itemModelName = op.pagination?.itemType.kind === 'model' ? op.pagination.itemType.name : 'Item';
+  let itemModelName = op.pagination?.itemType.kind === 'model' ? op.pagination.itemType.name : 'Item';
+  // Unwrap list wrapper models to match the fixture file naming in fixtures.ts
+  const rawModel = itemModelName !== 'Item' ? modelMap.get(itemModelName) : null;
+  if (rawModel) {
+    const unwrapped = unwrapListModel(rawModel, modelMap);
+    if (unwrapped) {
+      itemModelName = unwrapped.name;
+    }
+  }
+  const pathArgs = buildTestPathArgs(op);
 
   lines.push("    it('returns paginated results', async () => {");
   lines.push(`      fetchOnce(list${itemModelName}Fixture);`);
   lines.push('');
-  lines.push(`      const { data, listMetadata } = await workos.${serviceProp}.${method}();`);
+  lines.push(`      const { data, listMetadata } = await workos.${serviceProp}.${method}(${pathArgs});`);
   lines.push('');
-  lines.push(`      expect(fetchURL()).toContain('${op.path.split('{')[0]}');`);
+  lines.push("      expect(fetchMethod()).toBe('GET');");
+  // Fix #12: Full URL path assertion instead of toContain()
+  const expectedPath = buildExpectedPath(op);
+  lines.push(`      expect(new URL(String(fetchURL())).pathname).toBe('${expectedPath}');`);
   lines.push("      expect(fetchSearchParams()).toHaveProperty('order');");
   lines.push('      expect(Array.isArray(data)).toBe(true);');
   lines.push('      expect(listMetadata).toBeDefined();');
 
-  // Assert on first item fields when item model is available
-  const itemModel = modelMap.get(itemModelName);
-  if (itemModel) {
-    const assertions = buildFieldAssertions(itemModel, 'data[0]');
-    if (assertions.length > 0) {
-      lines.push('      expect(data.length).toBeGreaterThan(0);');
-      for (const assertion of assertions) {
-        lines.push(`      ${assertion}`);
+  // Assert on first item fields — use entity helper if available
+  const paginatedHelperName = ctx ? `expect${resolveInterfaceName(itemModelName, ctx)}` : null;
+  if (paginatedHelperName && entityHelpers?.has(paginatedHelperName)) {
+    lines.push('      expect(data.length).toBeGreaterThan(0);');
+    lines.push(`      ${paginatedHelperName}(data[0]);`);
+  } else {
+    const itemModel = modelMap.get(itemModelName);
+    if (itemModel) {
+      const assertions = buildFieldAssertions(itemModel, 'data[0]', modelMap);
+      if (assertions.length > 0) {
+        lines.push('      expect(data.length).toBeGreaterThan(0);');
+        for (const assertion of assertions) {
+          lines.push(`      ${assertion}`);
+        }
       }
     }
   }
 
   lines.push('    });');
+
+  // Edge case: handles empty results — use shared helper
+  lines.push('');
+  lines.push(`    testEmptyResults(() => workos.${serviceProp}.${method}(${pathArgs}));`);
+
+  // Edge case: forwards pagination params — use shared helper
+  lines.push('');
+  lines.push(`    testPaginationParams(`);
+  lines.push(`      (opts) => workos.${serviceProp}.${method}(${pathArgs ? pathArgs + ', ' : ''}opts),`);
+  lines.push(`      list${itemModelName}Fixture,`);
+  lines.push('    );');
 }
 
-function renderDeleteTest(lines: string[], op: Operation, method: string, serviceProp: string): void {
-  const hasPathParam = op.pathParams.length > 0;
-  const args = hasPathParam ? "'test_id'" : '';
+function renderDeleteTest(
+  lines: string[],
+  op: Operation,
+  plan: any,
+  method: string,
+  serviceProp: string,
+  modelMap: Map<string, Model>,
+): void {
+  const pathArgs = buildTestPathArgs(op);
+  // Build realistic payload for body-bearing delete operations
+  const payload = plan.hasBody ? buildTestPayload(op, modelMap) : null;
+  const bodyArg = plan.hasBody ? (payload ? payload.camelCaseObj : fallbackBodyArg(op, modelMap)) : '';
+  const args = plan.hasBody ? (pathArgs ? `${pathArgs}, ${bodyArg}` : bodyArg) : pathArgs;
 
   lines.push("    it('sends a DELETE request', async () => {");
   lines.push('      fetchOnce({}, { status: 204 });');
   lines.push('');
   lines.push(`      await workos.${serviceProp}.${method}(${args});`);
   lines.push('');
-  lines.push(`      expect(fetchURL()).toContain('${op.path.split('{')[0]}');`);
-  if (hasPathParam) {
-    lines.push("      expect(fetchURL()).toContain('test_id');");
+  lines.push("      expect(fetchMethod()).toBe('DELETE');");
+  // Fix #12: Full URL path assertion instead of toContain()
+  const expectedPathDel = buildExpectedPath(op);
+  lines.push(`      expect(new URL(String(fetchURL())).pathname).toBe('${expectedPathDel}');`);
+  if (plan.hasBody) {
+    if (payload) {
+      lines.push(`      expect(fetchBody()).toEqual(expect.objectContaining(${payload.snakeCaseObj}));`);
+    } else {
+      lines.push('      expect(fetchBody()).toBeDefined();');
+    }
   }
   lines.push('    });');
 }
@@ -172,30 +335,53 @@ function renderBodyTest(
   method: string,
   serviceProp: string,
   modelMap: Map<string, Model>,
+  ctx?: EmitterContext,
+  entityHelpers?: Set<string>,
 ): void {
   const responseModelName = plan.responseModelName!;
   const fixture = `${toCamelCase(responseModelName)}Fixture`;
-  const hasPathParam = op.pathParams.length > 0;
-  const pathArg = hasPathParam ? "'test_id', " : '';
+  const pathArgs = buildTestPathArgs(op);
+
+  // Build realistic payload from request body model fields
+  const payload = buildTestPayload(op, modelMap);
+  const payloadArg = payload ? payload.camelCaseObj : fallbackBodyArg(op, modelMap);
+  const allArgs = pathArgs ? `${pathArgs}, ${payloadArg}` : payloadArg;
 
   lines.push("    it('sends the correct request and returns result', async () => {");
   lines.push(`      fetchOnce(${fixture});`);
   lines.push('');
-  lines.push(`      const result = await workos.${serviceProp}.${method}(${pathArg}{});`);
+  lines.push(`      const result = await workos.${serviceProp}.${method}(${allArgs});`);
   lines.push('');
-  lines.push(`      expect(fetchURL()).toContain('${op.path.split('{')[0]}');`);
-  if (hasPathParam) {
-    lines.push("      expect(fetchURL()).toContain('test_id');");
+  lines.push(`      expect(fetchMethod()).toBe('${op.httpMethod.toUpperCase()}');`);
+
+  // Fix #12: Full URL path assertion instead of toContain()
+  const expectedPath = buildExpectedPath(op);
+  lines.push(`      expect(new URL(String(fetchURL())).pathname).toBe('${expectedPath}');`);
+
+  // Fix #10: Assert serialized wire format of request body
+  if (payload) {
+    lines.push(`      expect(fetchBody()).toEqual(expect.objectContaining(${payload.snakeCaseObj}));`);
+  } else {
+    lines.push('      expect(fetchBody()).toBeDefined();');
   }
-  lines.push('      expect(fetchBody()).toBeDefined();');
-  lines.push('      expect(result).toBeDefined();');
 
-  // Response field assertions
-  const responseModel = modelMap.get(responseModelName);
-  if (responseModel) {
-    const assertions = buildFieldAssertions(responseModel, 'result');
-    for (const assertion of assertions) {
-      lines.push(`      ${assertion}`);
+  // Use entity helper if available, otherwise inline assertions
+  const bodyHelperName = ctx ? `expect${resolveInterfaceName(responseModelName, ctx)}` : null;
+  if (bodyHelperName && entityHelpers?.has(bodyHelperName)) {
+    lines.push(`      ${bodyHelperName}(result);`);
+  } else {
+    const responseModel = modelMap.get(responseModelName);
+    if (responseModel) {
+      const assertions = buildFieldAssertions(responseModel, 'result', modelMap);
+      if (assertions.length > 0) {
+        for (const assertion of assertions) {
+          lines.push(`      ${assertion}`);
+        }
+      } else {
+        lines.push('      expect(result).toBeDefined();');
+      }
+    } else {
+      lines.push('      expect(result).toBeDefined();');
     }
   }
 
@@ -209,92 +395,233 @@ function renderGetTest(
   method: string,
   serviceProp: string,
   modelMap: Map<string, Model>,
+  ctx?: EmitterContext,
+  entityHelpers?: Set<string>,
 ): void {
   const responseModelName = plan.responseModelName!;
   const fixture = `${toCamelCase(responseModelName)}Fixture`;
-  const hasPathParam = op.pathParams.length > 0;
-  const args = hasPathParam ? "'test_id'" : '';
+  const pathArgs = buildTestPathArgs(op);
 
   lines.push("    it('returns the expected result', async () => {");
   lines.push(`      fetchOnce(${fixture});`);
   lines.push('');
-  lines.push(`      const result = await workos.${serviceProp}.${method}(${args});`);
+  lines.push(`      const result = await workos.${serviceProp}.${method}(${pathArgs});`);
   lines.push('');
-  lines.push(`      expect(fetchURL()).toContain('${op.path.split('{')[0]}');`);
-  if (hasPathParam) {
-    lines.push("      expect(fetchURL()).toContain('test_id');");
-  }
-  lines.push('      expect(result).toBeDefined();');
-
-  // Response field assertions
-  const responseModel = modelMap.get(responseModelName);
-  if (responseModel) {
-    const assertions = buildFieldAssertions(responseModel, 'result');
-    for (const assertion of assertions) {
-      lines.push(`      ${assertion}`);
+  lines.push(`      expect(fetchMethod()).toBe('${op.httpMethod.toUpperCase()}');`);
+  // Fix #12: Full URL path assertion instead of toContain()
+  const expectedPathGet = buildExpectedPath(op);
+  lines.push(`      expect(new URL(String(fetchURL())).pathname).toBe('${expectedPathGet}');`);
+
+  // Use entity helper if available, otherwise inline assertions
+  const helperName = ctx ? `expect${resolveInterfaceName(responseModelName, ctx)}` : null;
+  if (helperName && entityHelpers?.has(helperName)) {
+    lines.push(`      ${helperName}(result);`);
+  } else {
+    const responseModel = modelMap.get(responseModelName);
+    if (responseModel) {
+      const assertions = buildFieldAssertions(responseModel, 'result', modelMap);
+      if (assertions.length > 0) {
+        for (const assertion of assertions) {
+          lines.push(`      ${assertion}`);
+        }
+      } else {
+        lines.push('      expect(result).toBeDefined();');
+      }
+    } else {
+      lines.push('      expect(result).toBeDefined();');
     }
   }
 
   lines.push('    });');
 }
 
-function renderVoidTest(lines: string[], op: Operation, method: string, serviceProp: string): void {
-  const hasPathParam = op.pathParams.length > 0;
-  const args = hasPathParam ? "'test_id'" : '';
+function renderVoidTest(
+  lines: string[],
+  op: Operation,
+  plan: any,
+  method: string,
+  serviceProp: string,
+  modelMap: Map<string, Model>,
+): void {
+  const pathArgs = buildTestPathArgs(op);
+  // Build realistic payload for body-bearing void operations
+  const payload = plan.hasBody ? buildTestPayload(op, modelMap) : null;
+  const bodyArg = plan.hasBody ? (payload ? payload.camelCaseObj : fallbackBodyArg(op, modelMap)) : '';
+  const args = plan.hasBody ? (pathArgs ? `${pathArgs}, ${bodyArg}` : bodyArg) : pathArgs;
 
   lines.push("    it('sends the request', async () => {");
   lines.push('      fetchOnce({});');
   lines.push('');
   lines.push(`      await workos.${serviceProp}.${method}(${args});`);
   lines.push('');
-  lines.push(`      expect(fetchURL()).toContain('${op.path.split('{')[0]}');`);
-  if (hasPathParam) {
-    lines.push("      expect(fetchURL()).toContain('test_id');");
+  lines.push(`      expect(fetchMethod()).toBe('${op.httpMethod.toUpperCase()}');`);
+  // Fix #12: Full URL path assertion instead of toContain()
+  const expectedPathVoid = buildExpectedPath(op);
+  lines.push(`      expect(new URL(String(fetchURL())).pathname).toBe('${expectedPathVoid}');`);
+  if (plan.hasBody && payload) {
+    lines.push(`      expect(fetchBody()).toEqual(expect.objectContaining(${payload.snakeCaseObj}));`);
   }
   lines.push('    });');
 }
 
-function renderErrorTest(lines: string[], op: Operation, plan: any, method: string, serviceProp: string): void {
-  const hasPathParam = op.pathParams.length > 0;
+function renderErrorTest(
+  lines: string[],
+  op: Operation,
+  plan: any,
+  method: string,
+  serviceProp: string,
+  modelMap: Map<string, Model>,
+): void {
+  const args = buildCallArgs(op, plan, modelMap);
+
+  lines.push('');
+  lines.push(`    testUnauthorized(() => workos.${serviceProp}.${method}(${args}));`);
+
+  // Add error-status tests based on the operation's error responses
+  const errorStatuses = new Set(op.errors.map((e) => e.statusCode));
+
+  // 404 test for find/get methods
+  if (errorStatuses.has(404) && (method.startsWith('get') || method.startsWith('find'))) {
+    lines.push('');
+    lines.push("    it('throws NotFoundException on 404', async () => {");
+    lines.push("      fetchOnce('', { status: 404 });");
+    lines.push(`      await expect(workos.${serviceProp}.${method}(${args})).rejects.toThrow();`);
+    lines.push('    });');
+  }
+
+  // 422 test for create/update methods
+  if (errorStatuses.has(422) && (method.startsWith('create') || method.startsWith('update'))) {
+    lines.push('');
+    lines.push("    it('throws UnprocessableEntityException on 422', async () => {");
+    lines.push("      fetchOnce('', { status: 422 });");
+    lines.push(`      await expect(workos.${serviceProp}.${method}(${args})).rejects.toThrow();`);
+    lines.push('    });');
+  }
+}
+
+/**
+ * Build the argument string for a method call in tests.
+ * Shared by renderErrorTest and other test renderers.
+ */
+function buildCallArgs(op: Operation, plan: any, modelMap: Map<string, Model>): string {
+  const pathArgs = buildTestPathArgs(op);
   const isPaginated = plan.isPaginated;
   const hasBody = plan.hasBody;
 
-  let args: string;
-  if (isPaginated) {
-    args = '';
-  } else if (hasBody && hasPathParam) {
-    args = "'test_id', {}";
-  } else if (hasBody) {
-    args = '{}';
-  } else if (hasPathParam) {
-    args = "'test_id'";
-  } else {
-    args = '';
+  if (isPaginated) return pathArgs || '';
+  if (hasBody) {
+    const fb = fallbackBodyArg(op, modelMap);
+    return pathArgs ? `${pathArgs}, ${fb}` : fb;
+  }
+  return pathArgs || '';
+}
+
+/**
+ * Generate per-entity assertion helper functions for models used in 2+ tests.
+ * Returns lines like: function expectConnection(result: any) { expect(...) }
+ */
+/**
+ * Generate per-entity assertion helper functions for models used in 2+ tests.
+ * Returns { lines, helpers } where helpers is a Set of helper function names.
+ */
+function generateEntityHelpers(
+  plans: { op: Operation; plan: any; method: string }[],
+  modelMap: Map<string, Model>,
+  ctx: EmitterContext,
+): { lines: string[]; helpers: Set<string> } {
+  // Count how many tests reference each response model
+  const modelUsage = new Map<string, number>();
+  for (const { op, plan } of plans) {
+    let modelName: string | null = null;
+    if (plan.isPaginated && op.pagination?.itemType.kind === 'model') {
+      modelName = op.pagination.itemType.name;
+      const rawModel = modelMap.get(modelName);
+      if (rawModel) {
+        const unwrapped = unwrapListModel(rawModel, modelMap);
+        if (unwrapped) modelName = unwrapped.name;
+      }
+    } else if (plan.responseModelName) {
+      modelName = plan.responseModelName;
+    }
+    if (modelName) {
+      modelUsage.set(modelName, (modelUsage.get(modelName) ?? 0) + 1);
+    }
   }
 
-  lines.push('');
-  lines.push("    it('throws on unauthorized', async () => {");
-  lines.push("      fetchOnce({ message: 'Unauthorized' }, { status: 401 });");
-  lines.push('');
-  lines.push(`      await expect(workos.${serviceProp}.${method}(${args})).rejects.toThrow();`);
-  lines.push('    });');
+  const lines: string[] = [];
+  const helpers = new Set<string>();
+  for (const [modelName, count] of modelUsage) {
+    if (count < 2) continue;
+    const model = modelMap.get(modelName);
+    if (!model) continue;
+    const assertions = buildFieldAssertions(model, 'result', modelMap);
+    if (assertions.length === 0) continue;
+
+    const domainName = resolveInterfaceName(modelName, ctx);
+    const helperName = `expect${domainName}`;
+    if (helpers.has(helperName)) continue;
+    helpers.add(helperName);
+
+    lines.push(`function ${helperName}(result: any) {`);
+    for (const assertion of assertions) {
+      lines.push(`  ${assertion}`);
+    }
+    lines.push('}');
+    lines.push('');
+  }
+  return { lines, helpers };
 }
 
 /**
  * Build field-level assertions for top-level primitive fields of a response model.
  * Returns lines like: expect(result.fieldName).toBe(fixtureValue);
+ *
+ * When the top level has no assertable primitive fields (e.g. wrapper types
+ * whose only required fields are nested models), recurse one level into those
+ * nested models so we still get meaningful assertions instead of a bare
+ * `toBeDefined()`.
  */
-function buildFieldAssertions(model: Model, accessor: string): string[] {
+function buildFieldAssertions(model: Model, accessor: string, modelMap?: Map<string, Model>): string[] {
   const assertions: string[] = [];
 
   for (const field of model.fields) {
     if (!field.required) continue;
-    const value = fixtureValueForType(field.type, field.name);
+    // When a field has an example value, use it as the expected assertion value
+    if (field.example !== undefined) {
+      const domainField = fieldName(field.name);
+      if (typeof field.example === 'object' && field.example !== null) {
+        // Objects and arrays need toEqual with JSON serialization
+        assertions.push(`expect(${accessor}.${domainField}).toEqual(${JSON.stringify(field.example)});`);
+      } else {
+        const exampleLiteral = typeof field.example === 'string' ? `'${field.example}'` : String(field.example);
+        assertions.push(`expect(${accessor}.${domainField}).toBe(${exampleLiteral});`);
+      }
+      continue;
+    }
+    const value = fixtureValueForType(field.type, field.name, model.name);
     if (value === null) continue;
     const domainField = fieldName(field.name);
     assertions.push(`expect(${accessor}.${domainField}).toBe(${value});`);
   }
 
+  // When no primitive assertions were found (e.g. wrapper types like
+  // ResetPasswordResponse { user: User }), recurse one level into nested
+  // model-type fields to generate assertions on their primitive fields.
+  if (assertions.length === 0 && modelMap) {
+    for (const field of model.fields) {
+      if (!field.required) continue;
+      if (field.type.kind === 'model') {
+        const nestedModel = modelMap.get(field.type.name);
+        if (nestedModel) {
+          const nestedAccessor = `${accessor}.${fieldName(field.name)}`;
+          // Recurse without modelMap to limit depth to one level
+          const nested = buildFieldAssertions(nestedModel, nestedAccessor);
+          assertions.push(...nested);
+        }
+      }
+    }
+  }
+
   return assertions;
 }
 
@@ -302,23 +629,47 @@ function buildFieldAssertions(model: Model, accessor: string): string[] {
  * Return a JS literal string for the expected fixture value of a primitive field.
  * Returns null for non-primitive or complex types (arrays, models, etc.).
  */
-function fixtureValueForType(ref: TypeRef, name: string): string | null {
+function fixtureValueForType(ref: TypeRef, name: string, modelName: string): string | null {
   switch (ref.kind) {
     case 'primitive':
-      return fixtureValueForPrimitive(ref.type, ref.format, name);
+      return fixtureValueForPrimitive(ref.type, ref.format, name, modelName);
     case 'literal':
       return typeof ref.value === 'string' ? `'${ref.value}'` : String(ref.value);
+    case 'enum':
+      // Use the first enum value as a realistic fixture value
+      if (ref.values?.length) {
+        const first = ref.values[0];
+        return typeof first === 'string' ? `'${first}'` : String(first);
+      }
+      return null;
+    case 'array': {
+      // For arrays of primitives/enums, generate a single-element array assertion.
+      // For arrays of models/complex types, return null to skip the assertion —
+      // the fixture will have populated items that we can't predict here.
+      const itemValue = fixtureValueForType(ref.items, name, modelName);
+      if (itemValue !== null) return `[${itemValue}]`;
+      return null;
+    }
     default:
       return null;
   }
 }
 
-function fixtureValueForPrimitive(type: string, format: string | undefined, name: string): string | null {
+function fixtureValueForPrimitive(
+  type: string,
+  format: string | undefined,
+  name: string,
+  modelName: string,
+): string | null {
   switch (type) {
     case 'string':
       if (format === 'date-time') return "'2023-01-01T00:00:00.000Z'";
       if (format === 'date') return "'2023-01-01'";
       if (format === 'uuid') return "'00000000-0000-0000-0000-000000000000'";
+      if (name === 'id') {
+        const prefix = ID_PREFIXES[modelName] ?? '';
+        return `'${prefix}01234'`;
+      }
       if (name.includes('id')) return `'${wireFieldName(name)}_01234'`;
       if (name.includes('email')) return "'test@example.com'";
       if (name.includes('url') || name.includes('uri')) return "'https://example.com'";
@@ -334,3 +685,168 @@ function fixtureValueForPrimitive(type: string, format: string | undefined, name
       return null;
   }
 }
+
+/**
+ * Build the expected full URL path for an operation, substituting path params
+ * with their test values. Returns a string like '/organizations/test_id'.
+ */
+function buildExpectedPath(op: Operation): string {
+  let path = op.path;
+  for (const param of op.pathParams) {
+    path = path.replace(`{${param.name}}`, pathParamTestValue(param, fieldName(param.name)));
+  }
+  return path;
+}
+
+/**
+ * Build a realistic test payload for a request body model.
+ * Returns { camelCaseObj, snakeCaseObj } as inline JS object literal strings,
+ * or null if the request body is not a named model.
+ *
+ * camelCaseObj is what the SDK consumer passes (e.g. { organizationName: 'Test' })
+ * snakeCaseObj is the expected wire format (e.g. { organization_name: 'Test' })
+ */
+function buildTestPayload(
+  op: Operation,
+  modelMap: Map<string, Model>,
+): { camelCaseObj: string; snakeCaseObj: string } | null {
+  if (!op.requestBody || op.requestBody.kind !== 'model') return null;
+
+  const model = modelMap.get(op.requestBody.name);
+  if (!model) return null;
+
+  const fields = model.fields.filter((f) => f.required);
+  // Only use primitive/literal/enum/array fields that we can generate deterministic values for
+  const usableFields = fields.filter((f) => fixtureValueForType(f.type, f.name, model.name) !== null);
+
+  // Only generate a typed payload when ALL required fields have fixture values.
+  // A partial payload missing required fields would fail TypeScript type checking.
+  if (usableFields.length === 0 || usableFields.length < fields.length) return null;
+
+  const camelEntries: string[] = [];
+  const snakeEntries: string[] = [];
+
+  for (const field of usableFields) {
+    const value = fixtureValueForType(field.type, field.name, model.name)!;
+    const camelKey = fieldName(field.name);
+    const snakeKey = wireFieldName(field.name);
+    camelEntries.push(`${camelKey}: ${value}`);
+    snakeEntries.push(`${snakeKey}: ${value}`);
+  }
+
+  return {
+    camelCaseObj: `{ ${camelEntries.join(', ')} }`,
+    snakeCaseObj: `{ ${snakeEntries.join(', ')} }`,
+  };
+}
+
+/**
+ * Compute a fallback body argument when buildTestPayload returns null.
+ * If the request body model has no required fields (all optional), an empty
+ * object `{}` is a valid value and doesn't need a type assertion. Otherwise,
+ * fall back to `{} as any` to bypass type checking for complex required fields.
+ */
+function fallbackBodyArg(op: Operation, modelMap: Map<string, Model>): string {
+  if (!op.requestBody || op.requestBody.kind !== 'model') return '{} as any';
+  const model = modelMap.get(op.requestBody.name);
+  if (!model) return '{} as any';
+  const hasRequiredFields = model.fields.some((f) => f.required);
+  return hasRequiredFields ? '{} as any' : '{}';
+}
+
+/**
+ * Determine whether a model should get a round-trip serializer test.
+ * Includes all models with at least one field — every model gets both
+ * serialize and deserialize functions, so all benefit from round-trip testing.
+ */
+function modelNeedsRoundTripTest(model: Model): boolean {
+  return model.fields.length > 0;
+}
+
+/**
+ * Generate serializer round-trip tests for models that have both serialize and
+ * deserialize functions and have nested types requiring non-trivial serialization.
+ */
+function generateSerializerTests(spec: ApiSpec, ctx: EmitterContext): GeneratedFile[] {
+  const files: GeneratedFile[] = [];
+  const modelToService = assignModelsToServices(spec.models, spec.services);
+  const serviceNameMap = new Map<string, string>();
+  for (const service of spec.services) {
+    serviceNameMap.set(service.name, resolveResourceClassName(service, ctx));
+  }
+  const resolveDir = (irService: string | undefined) =>
+    irService ? serviceDirName(serviceNameMap.get(irService) ?? irService) : 'common';
+
+  // Only generate round-trip tests for models with fields that have serializers generated.
+  // Skip list metadata and list wrapper models since their serializers are not emitted.
+  const eligibleModels = spec.models.filter(
+    (m) => modelNeedsRoundTripTest(m) && !isListMetadataModel(m) && !isListWrapperModel(m),
+  );
+
+  if (eligibleModels.length === 0) return files;
+
+  // Group eligible models by service directory for one test file per service
+  const modelsByDir = new Map<string, Model[]>();
+  for (const model of eligibleModels) {
+    const service = modelToService.get(model.name);
+    const dirName = resolveDir(service);
+    if (!modelsByDir.has(dirName)) {
+      modelsByDir.set(dirName, []);
+    }
+    modelsByDir.get(dirName)!.push(model);
+  }
+
+  for (const [dirName, models] of modelsByDir) {
+    const testPath = `src/${dirName}/serializers.spec.ts`;
+    const lines: string[] = [];
+
+    // Collect imports
+    const serializerImports: string[] = [];
+    const fixtureImports: string[] = [];
+
+    for (const model of models) {
+      const domainName = resolveInterfaceName(model.name, ctx);
+      const service = modelToService.get(model.name);
+      const modelDir = resolveDir(service);
+      const serializerPath = `src/${modelDir}/serializers/${fileName(model.name)}.serializer.ts`;
+      const fixturePath = `src/${modelDir}/fixtures/${fileName(model.name)}.fixture.json`;
+
+      serializerImports.push(
+        `import { deserialize${domainName}, serialize${domainName} } from '${relativeImport(testPath, serializerPath)}';`,
+      );
+      fixtureImports.push(`import ${toCamelCase(model.name)}Fixture from '${relativeImport(testPath, fixturePath)}';`);
+    }
+
+    for (const imp of serializerImports) {
+      lines.push(imp);
+    }
+    for (const imp of fixtureImports) {
+      lines.push(imp);
+    }
+    lines.push('');
+
+    for (const model of models) {
+      const domainName = resolveInterfaceName(model.name, ctx);
+      const fixtureName = `${toCamelCase(model.name)}Fixture`;
+
+      lines.push(`describe('${domainName}Serializer', () => {`);
+      lines.push("  it('round-trips through serialize/deserialize', () => {");
+      lines.push(`    const fixture = ${fixtureName};`);
+      lines.push(`    const deserialized = deserialize${domainName}(fixture);`);
+      lines.push(`    const reserialized = serialize${domainName}(deserialized);`);
+      lines.push('    expect(reserialized).toEqual(expect.objectContaining(fixture));');
+      lines.push('  });');
+      lines.push('});');
+      lines.push('');
+    }
+
+    files.push({
+      path: testPath,
+      content: lines.join('\n'),
+      skipIfExists: true,
+      integrateTarget: false,
+    });
+  }
+
+  return files;
+}