Refactor existing modular unit tests as scenario tests

packages/typespec-ts/src/modular/buildClassicalClient.ts

@@ -108,9 +108,9 @@ export function buildClassicalClient(
     });
 
   constructor.addStatements([
-    `this._client = create${modularClientName}(${paramNames.join(",")})`
+    `this._client = create${modularClientName}(${paramNames.join(",")});`
   ]);
-  constructor.addStatements(`this.pipeline = this._client.pipeline`);
+  constructor.addStatements(`this.pipeline = this._client.pipeline;`);
 
   buildClientOperationGroups(clientFile, _client, dpgContext, clientClass);
   importAllApis(clientFile, srcPath, subfolder);

packages/typespec-ts/src/modular/helpers/clientHelpers.ts

@@ -228,7 +228,7 @@ export function buildGetClientOptionsParam(
     expr += `credentials: ${credentials},`;
   }
 
-  expr += `}`;
+  expr += `};`;
 
   context.addStatements(expr);
   return "updatedOptions";

packages/typespec-ts/test/modularUnit/apiOperations.spec.ts

@@ -775,6 +775,7 @@ describe("api operations in Modular", () => {
         clientContext?.getFullText()!,
         `
         import { logger } from "../logger.js";
+        import { KnownVersions } from "../models/models.js";
         import { Client, ClientOptions, getClient } from "@azure-rest/core-client";
 
         export interface TestingContext extends Client {}

packages/typespec-ts/test/modularUnit/scenarios.spec.ts

@@ -2,6 +2,8 @@ import { assert } from "chai";
 import { readdirSync, readFileSync, statSync, writeFileSync } from "fs";
 import path from "path";
 import {
+  emitModularClientContextFromTypeSpec,
+  emitModularClientFromTypeSpec,
   emitModularModelsFromTypeSpec,
   emitModularOperationsFromTypeSpec,
   emitSamplesFromTypeSpec
@@ -32,7 +34,21 @@ const OUTPUT_CODE_BLOCK_TYPES: Record<string, EmitterFunction> = {
   "(ts|typescript) models interface {name}": async (tsp, { name }, namedUnknownArgs) => {
     const configs = namedUnknownArgs ? (namedUnknownArgs["configs"] as Record<string, string>) : {};
     const result = await emitModularModelsFromTypeSpec(tsp, configs);
-    return result!.getInterfaceOrThrow(name ?? "No name specified!").getText();
+    return result!.getInterfaceOrThrow(name ?? "No name specified!").getFullText();
+  },
+
+  // Snapshot of a particular class named {name} in the models file
+  "(ts|typescript) models alias {name}": async (tsp, { name }, namedUnknownArgs) => {
+    const configs = namedUnknownArgs ? (namedUnknownArgs["configs"] as Record<string, string>) : {};
+    const result = await emitModularModelsFromTypeSpec(tsp, configs);
+    return result!.getTypeAlias(name ?? "No name specified!")!.getFullText();
+  },
+
+  // Snapshot of a particular enum named {name} in the models file
+  "(ts|typescript) models enum {name}": async (tsp, { name }, namedUnknownArgs) => {
+    const configs = namedUnknownArgs ? (namedUnknownArgs["configs"] as Record<string, string>) : {};
+    const result = await emitModularModelsFromTypeSpec(tsp, configs);
+    return result!.getEnum(name ?? "No name specified!")!.getFullText();
   },
 
   // Snapshot of a particular function named {name} in the models file
@@ -119,6 +135,20 @@ const OUTPUT_CODE_BLOCK_TYPES: Record<string, EmitterFunction> = {
       )
       .join("\n");
     return text;
+  },
+
+  //Snapshot of the clientContext file for a given typespec
+  "(ts|typescript) clientContext": async (tsp, { }, namedUnknownArgs) => {
+    const configs = namedUnknownArgs ? (namedUnknownArgs["configs"] as Record<string, string>) : {};
+    const result = await emitModularClientContextFromTypeSpec(tsp, configs);
+    return result!.getFullText()!;
+  },
+
+  //Snapshot of the classicClient file for a given typespec
+  "(ts|typescript) classicClient": async (tsp, { }, namedUnknownArgs) => {
+    const configs = namedUnknownArgs ? (namedUnknownArgs["configs"] as Record<string, string>) : {};
+    const result = await emitModularClientFromTypeSpec(tsp, configs);
+    return result!.getFullText()!;
   }
 };
 
@@ -222,7 +252,7 @@ function describeScenarioFile(scenarioFile: string): void {
               writeFileSync(scenarioFile, writeScenarios(scenarios));
             }
 
-            await assertEqualContent(result, testCase.block.content, true);
+            await assertEqualContent(result, testCase.block.content, configs["ignoreWeirdLine"] as any === false ? false : true);
           });
         }
       });