diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 1e32fa9476..d9fb8e490e 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -216,8 +216,8 @@ packages: '@cadl-lang/rest': 0.18.0_@cadl-lang+compiler@0.36.0 dev: false - /@azure-tools/cadl-ranch-specs/0.4.1_255f93313ec8cb59c77a5703ca29e60e: - resolution: {integrity: sha512-9K4CtpHfe3ySdWbvpGv1UMNuYi3j89Gb6Jxbh74zDMwG3YaoXpwP0DVI/6WFvckDZ1OhAtiiIn1ikoK9EagbTA==} + /@azure-tools/cadl-ranch-specs/0.4.3_255f93313ec8cb59c77a5703ca29e60e: + resolution: {integrity: sha512-jRZ6Da/9B+PI+vf4l0avicPVMY7AGke7vXkQLx1buvdojiL8R5yUu7i+ZYXxB/NaW24zXo5W1gO0RULVOU0SVw==} engines: {node: '>=16.0.0'} peerDependencies: '@azure-tools/cadl-azure-core': ~0.8.0 @@ -227,7 +227,7 @@ packages: '@cadl-lang/versioning': ~0.9.0 dependencies: '@azure-tools/cadl-azure-core': 0.8.0_dbc7c933933f9aad7e8fe898f45a319f - '@azure-tools/cadl-ranch': 0.2.7 + '@azure-tools/cadl-ranch': 0.2.8 '@azure-tools/cadl-ranch-api': 0.1.9 '@azure-tools/cadl-ranch-expect': 0.1.11_dbc7c933933f9aad7e8fe898f45a319f '@cadl-lang/compiler': 0.36.0 @@ -272,6 +272,39 @@ packages: - supports-color dev: false + /@azure-tools/cadl-ranch/0.2.8: + resolution: {integrity: sha512-4o33/Lk3vGXmKSCtZJbNyqmmR8Qr0Hs6NO8bV9BblSBzyIUMQGF6lYcObVVL5d1MSwuBjEQI1WLJUZ4jS1nt0g==} + engines: {node: '>=16.0.0'} + hasBin: true + dependencies: + '@azure-tools/cadl-ranch-api': 0.1.9 + '@azure-tools/cadl-ranch-coverage-sdk': 0.1.2 + '@azure-tools/cadl-ranch-expect': 0.1.11_dbc7c933933f9aad7e8fe898f45a319f + '@azure/identity': 3.0.0 + '@cadl-lang/compiler': 0.36.0 + '@cadl-lang/rest': 0.18.0_@cadl-lang+compiler@0.36.0 + '@types/js-yaml': 4.0.5 + ajv: 8.11.0 + body-parser: 1.20.1 + deep-equal: 2.0.5 + express: 4.18.2 + express-promise-router: 4.1.1_express@4.18.2 + glob: 8.0.3 + js-yaml: 4.1.0 + morgan: 1.10.0 + node-fetch: 3.2.10 + picocolors: 1.0.0 + prettier: 2.7.1 + source-map-support: 0.5.21 + winston: 3.8.2 + xml2js: 0.4.23 + yargs: 17.6.0 + transitivePeerDependencies: + - '@types/express' + - encoding + - supports-color + dev: false + /@azure-tools/codegen/2.9.1: resolution: {integrity: sha512-qlQSMaSUtrhlnW/XqgOeOcAfDw5kLUWq16DcjbnvxRC/F4QepqtNth4PHgHM+1UXZeWuiGj5sAsLQnm/9CApDQ==} engines: {node: '>=12.0.0'} @@ -2896,7 +2929,7 @@ packages: dev: false /array-flatten/1.1.1: - resolution: {integrity: sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==} + resolution: {integrity: sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=} dev: false /array-includes/3.1.5: @@ -3261,7 +3294,7 @@ packages: dev: false /buffer-equal-constant-time/1.0.1: - resolution: {integrity: sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==} + resolution: {integrity: sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=} dev: false /buffer-from/1.1.2: @@ -3413,7 +3446,7 @@ packages: dev: false /charenc/0.0.2: - resolution: {integrity: sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==} + resolution: {integrity: sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=} dev: false /charset/1.0.1: @@ -3659,7 +3692,7 @@ packages: dev: false /concat-map/0.0.1: - resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} + resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=} dev: false /config-chain/1.1.13: @@ -3720,7 +3753,7 @@ packages: dev: false /cookie-signature/1.0.6: - resolution: {integrity: sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==} + resolution: {integrity: sha1-4wOogrNCzD7oylE6eZmXNNqzriw=} dev: false /cookie/0.4.2: @@ -3816,7 +3849,7 @@ packages: dev: false /crypt/0.0.2: - resolution: {integrity: sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==} + resolution: {integrity: sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=} dev: false /crypto-browserify/3.12.0: @@ -4168,7 +4201,7 @@ packages: dev: false /ee-first/1.1.1: - resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} + resolution: {integrity: sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=} dev: false /electron-to-chromium/1.4.279: @@ -4981,7 +5014,7 @@ packages: dev: false /fresh/0.5.2: - resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==} + resolution: {integrity: sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=} engines: {node: '>= 0.6'} dev: false @@ -6632,7 +6665,7 @@ packages: dev: false /media-typer/0.3.0: - resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==} + resolution: {integrity: sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=} engines: {node: '>= 0.6'} dev: false @@ -6642,7 +6675,7 @@ packages: dev: false /merge-descriptors/1.0.1: - resolution: {integrity: sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==} + resolution: {integrity: sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=} dev: false /merge-stream/2.0.0: @@ -9166,7 +9199,7 @@ packages: dev: false /utils-merge/1.0.1: - resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==} + resolution: {integrity: sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=} engines: {node: '>= 0.4.0'} dev: false @@ -9858,7 +9891,7 @@ packages: dev: false file:projects/cadl-typescript.tgz: - resolution: {integrity: sha512-bTVY0s5pPGkgE6N30YoE2hhUHbTvwNL/hmSEd8JhHpLz7TXQZxz0C8b9d2nkZjjNgCJ5rodVBOJCc2q/aoAYlA==, tarball: file:projects/cadl-typescript.tgz} + resolution: {integrity: sha512-9woLoQUlRqEfTcqqhJf3nOmO49XvLrA7L3aH7SFH7NSl8S5raZNPbTrSuXxKbhELevwe2kPOnE462KxMTIG1Rw==, tarball: file:projects/cadl-typescript.tgz} name: '@rush-temp/cadl-typescript' version: 0.0.0 dependencies: @@ -9867,7 +9900,7 @@ packages: '@azure-tools/cadl-dpg': 0.2.0_dbc7c933933f9aad7e8fe898f45a319f '@azure-tools/cadl-ranch': 0.2.7 '@azure-tools/cadl-ranch-expect': 0.1.11_dbc7c933933f9aad7e8fe898f45a319f - '@azure-tools/cadl-ranch-specs': 0.4.1_255f93313ec8cb59c77a5703ca29e60e + '@azure-tools/cadl-ranch-specs': 0.4.3_255f93313ec8cb59c77a5703ca29e60e '@azure/core-auth': 1.4.0 '@azure/core-lro': 2.4.0 '@azure/core-paging': 1.3.0 diff --git a/packages/autorest.typescript/test/rlcIntegration/generated/bodyStringRest/karma.conf.js b/packages/autorest.typescript/test/rlcIntegration/generated/bodyStringRest/karma.conf.js index 85ddb06133..09aa34b892 100644 --- a/packages/autorest.typescript/test/rlcIntegration/generated/bodyStringRest/karma.conf.js +++ b/packages/autorest.typescript/test/rlcIntegration/generated/bodyStringRest/karma.conf.js @@ -59,7 +59,8 @@ module.exports = function(config) { "AZURE_CLIENT_SECRET", "AZURE_CLIENT_ID", "AZURE_TENANT_ID", - "SUBSCRIPTION_ID" + "SUBSCRIPTION_ID", + "RECORDINGS_RELATIVE_PATH" ], // test results reporter to use diff --git a/packages/autorest.typescript/test/smoke/generated/agrifood-data-plane/karma.conf.js b/packages/autorest.typescript/test/smoke/generated/agrifood-data-plane/karma.conf.js index 85ddb06133..09aa34b892 100644 --- a/packages/autorest.typescript/test/smoke/generated/agrifood-data-plane/karma.conf.js +++ b/packages/autorest.typescript/test/smoke/generated/agrifood-data-plane/karma.conf.js @@ -59,7 +59,8 @@ module.exports = function(config) { "AZURE_CLIENT_SECRET", "AZURE_CLIENT_ID", "AZURE_TENANT_ID", - "SUBSCRIPTION_ID" + "SUBSCRIPTION_ID", + "RECORDINGS_RELATIVE_PATH" ], // test results reporter to use diff --git a/packages/autorest.typescript/test/smoke/generated/anomaly-detector-rest/karma.conf.js b/packages/autorest.typescript/test/smoke/generated/anomaly-detector-rest/karma.conf.js index 85ddb06133..09aa34b892 100644 --- a/packages/autorest.typescript/test/smoke/generated/anomaly-detector-rest/karma.conf.js +++ b/packages/autorest.typescript/test/smoke/generated/anomaly-detector-rest/karma.conf.js @@ -59,7 +59,8 @@ module.exports = function(config) { "AZURE_CLIENT_SECRET", "AZURE_CLIENT_ID", "AZURE_TENANT_ID", - "SUBSCRIPTION_ID" + "SUBSCRIPTION_ID", + "RECORDINGS_RELATIVE_PATH" ], // test results reporter to use diff --git a/packages/cadl-rlc-test/test/authoring/cadl-output/karma.conf.js b/packages/cadl-rlc-test/test/authoring/cadl-output/karma.conf.js index 49810149b8..81a1a163cd 100644 --- a/packages/cadl-rlc-test/test/authoring/cadl-output/karma.conf.js +++ b/packages/cadl-rlc-test/test/authoring/cadl-output/karma.conf.js @@ -57,6 +57,7 @@ module.exports = function (config) { "AZURE_CLIENT_ID", "AZURE_TENANT_ID", "SUBSCRIPTION_ID", + "RECORDINGS_RELATIVE_PATH", ], // test results reporter to use diff --git a/packages/cadl-rlc-test/test/confidentialLedger/cadl-output/karma.conf.js b/packages/cadl-rlc-test/test/confidentialLedger/cadl-output/karma.conf.js index 49810149b8..81a1a163cd 100644 --- a/packages/cadl-rlc-test/test/confidentialLedger/cadl-output/karma.conf.js +++ b/packages/cadl-rlc-test/test/confidentialLedger/cadl-output/karma.conf.js @@ -57,6 +57,7 @@ module.exports = function (config) { "AZURE_CLIENT_ID", "AZURE_TENANT_ID", "SUBSCRIPTION_ID", + "RECORDINGS_RELATIVE_PATH", ], // test results reporter to use diff --git a/packages/cadl-typescript/package.json b/packages/cadl-typescript/package.json index f649771c19..78133c5f5c 100644 --- a/packages/cadl-typescript/package.json +++ b/packages/cadl-typescript/package.json @@ -34,7 +34,7 @@ "ts-node": "^10.7.0", "typescript": "^4.6.3", "prettier": "~2.7.1", - "@azure-tools/cadl-ranch-specs": "~0.4.1", + "@azure-tools/cadl-ranch-specs": "~0.4.3", "@cadl-lang/versioning": "0.9.0", "@azure-tools/cadl-ranch-expect": "~0.1.11", "@azure-tools/cadl-ranch": "~0.2.7", diff --git a/packages/cadl-typescript/test/commands/cadl-ranch-list.ts b/packages/cadl-typescript/test/commands/cadl-ranch-list.ts index c7a8315e16..1c9d9ddc7b 100644 --- a/packages/cadl-typescript/test/commands/cadl-ranch-list.ts +++ b/packages/cadl-typescript/test/commands/cadl-ranch-list.ts @@ -5,8 +5,8 @@ export interface CadlRanchConfig { export const cadls: CadlRanchConfig[] = [ { - outputPath: "array/itemTypes", - inputPath: "array/item-types" + outputPath: "arrays/itemTypes", + inputPath: "arrays/item-types" }, { outputPath: "authentication/apiKey", diff --git a/packages/cadl-typescript/test/integration/arrayItemTypes.spec.ts b/packages/cadl-typescript/test/integration/arrayItemTypes.spec.ts index 5c79c67fd5..875eb01028 100644 --- a/packages/cadl-typescript/test/integration/arrayItemTypes.spec.ts +++ b/packages/cadl-typescript/test/integration/arrayItemTypes.spec.ts @@ -1,6 +1,6 @@ import ArrayItemTypesClientFactory, { ArrayItemTypesClient -} from "./generated/array/itemTypes/src/index.js"; +} from "./generated/arrays/itemTypes/src/index.js"; import { assert } from "chai"; import { matrix } from "../util/matrix.js"; @@ -61,7 +61,7 @@ describe("Array Item-Types Client", () => { it(`should get a ${params.type} value`, async () => { try { const result = await client - .path(`/array/item-types/${params.type}` as any) + .path(`/arrays/item-types/${params.type}` as any) .get(); assert.strictEqual(result.status, "200"); console.log("debug", result.body, params.defaultValue); @@ -80,7 +80,7 @@ describe("Array Item-Types Client", () => { property = params.defaultValue; } const result = await client - .path(`/array/item-types/${params.type}` as any) + .path(`/arrays/item-types/${params.type}` as any) .put({ body: property }); diff --git a/packages/cadl-typescript/test/integration/generated/array/itemTypes/cadl-project.yaml b/packages/cadl-typescript/test/integration/generated/arrays/itemTypes/cadl-project.yaml similarity index 100% rename from packages/cadl-typescript/test/integration/generated/array/itemTypes/cadl-project.yaml rename to packages/cadl-typescript/test/integration/generated/arrays/itemTypes/cadl-project.yaml diff --git a/packages/cadl-typescript/test/integration/generated/array/itemTypes/src/arrayItemTypesClient.ts b/packages/cadl-typescript/test/integration/generated/arrays/itemTypes/src/arrayItemTypesClient.ts similarity index 59% rename from packages/cadl-typescript/test/integration/generated/array/itemTypes/src/arrayItemTypesClient.ts rename to packages/cadl-typescript/test/integration/generated/arrays/itemTypes/src/arrayItemTypesClient.ts index 9b77527d66..0dcc68dec2 100644 --- a/packages/cadl-typescript/test/integration/generated/array/itemTypes/src/arrayItemTypesClient.ts +++ b/packages/cadl-typescript/test/integration/generated/arrays/itemTypes/src/arrayItemTypesClient.ts @@ -28,74 +28,74 @@ export default function createClient( ...client, int32Value: { get: (options) => { - return client.path("/array/item-types/int32").get(options); + return client.path("/arrays/item-types/int32").get(options); }, put: (options) => { - return client.path("/array/item-types/int32").put(options); + return client.path("/arrays/item-types/int32").put(options); }, }, int64Value: { get: (options) => { - return client.path("/array/item-types/int64").get(options); + return client.path("/arrays/item-types/int64").get(options); }, put: (options) => { - return client.path("/array/item-types/int64").put(options); + return client.path("/arrays/item-types/int64").put(options); }, }, booleanValue: { get: (options) => { - return client.path("/array/item-types/boolean").get(options); + return client.path("/arrays/item-types/boolean").get(options); }, put: (options) => { - return client.path("/array/item-types/boolean").put(options); + return client.path("/arrays/item-types/boolean").put(options); }, }, stringValue: { get: (options) => { - return client.path("/array/item-types/string").get(options); + return client.path("/arrays/item-types/string").get(options); }, put: (options) => { - return client.path("/array/item-types/string").put(options); + return client.path("/arrays/item-types/string").put(options); }, }, float32Value: { get: (options) => { - return client.path("/array/item-types/float32").get(options); + return client.path("/arrays/item-types/float32").get(options); }, put: (options) => { - return client.path("/array/item-types/float32").put(options); + return client.path("/arrays/item-types/float32").put(options); }, }, datetimeValue: { get: (options) => { - return client.path("/array/item-types/datetime").get(options); + return client.path("/arrays/item-types/datetime").get(options); }, put: (options) => { - return client.path("/array/item-types/datetime").put(options); + return client.path("/arrays/item-types/datetime").put(options); }, }, durationValue: { get: (options) => { - return client.path("/array/item-types/duration").get(options); + return client.path("/arrays/item-types/duration").get(options); }, put: (options) => { - return client.path("/array/item-types/duration").put(options); + return client.path("/arrays/item-types/duration").put(options); }, }, unknownValue: { get: (options) => { - return client.path("/array/item-types/unknown").get(options); + return client.path("/arrays/item-types/unknown").get(options); }, put: (options) => { - return client.path("/array/item-types/unknown").put(options); + return client.path("/arrays/item-types/unknown").put(options); }, }, modelValue: { get: (options) => { - return client.path("/array/item-types/model").get(options); + return client.path("/arrays/item-types/model").get(options); }, put: (options) => { - return client.path("/array/item-types/model").put(options); + return client.path("/arrays/item-types/model").put(options); }, }, }; diff --git a/packages/cadl-typescript/test/integration/generated/array/itemTypes/src/clientDefinitions.ts b/packages/cadl-typescript/test/integration/generated/arrays/itemTypes/src/clientDefinitions.ts similarity index 83% rename from packages/cadl-typescript/test/integration/generated/array/itemTypes/src/clientDefinitions.ts rename to packages/cadl-typescript/test/integration/generated/arrays/itemTypes/src/clientDefinitions.ts index a4c971a0d2..34b9e1c125 100644 --- a/packages/cadl-typescript/test/integration/generated/array/itemTypes/src/clientDefinitions.ts +++ b/packages/cadl-typescript/test/integration/generated/arrays/itemTypes/src/clientDefinitions.ts @@ -212,24 +212,24 @@ export interface ModelValueGet { } export interface Routes { - /** Resource for '/array/item-types/int32' has methods for the following verbs: get, put */ - (path: "/array/item-types/int32"): Int32ValueGet; - /** Resource for '/array/item-types/int64' has methods for the following verbs: get, put */ - (path: "/array/item-types/int64"): Int64ValueGet; - /** Resource for '/array/item-types/boolean' has methods for the following verbs: get, put */ - (path: "/array/item-types/boolean"): BooleanValueGet; - /** Resource for '/array/item-types/string' has methods for the following verbs: get, put */ - (path: "/array/item-types/string"): StringValueGet; - /** Resource for '/array/item-types/float32' has methods for the following verbs: get, put */ - (path: "/array/item-types/float32"): Float32ValueGet; - /** Resource for '/array/item-types/datetime' has methods for the following verbs: get, put */ - (path: "/array/item-types/datetime"): DatetimeValueGet; - /** Resource for '/array/item-types/duration' has methods for the following verbs: get, put */ - (path: "/array/item-types/duration"): DurationValueGet; - /** Resource for '/array/item-types/unknown' has methods for the following verbs: get, put */ - (path: "/array/item-types/unknown"): UnknownValueGet; - /** Resource for '/array/item-types/model' has methods for the following verbs: get, put */ - (path: "/array/item-types/model"): ModelValueGet; + /** Resource for '/arrays/item-types/int32' has methods for the following verbs: get, put */ + (path: "/arrays/item-types/int32"): Int32ValueGet; + /** Resource for '/arrays/item-types/int64' has methods for the following verbs: get, put */ + (path: "/arrays/item-types/int64"): Int64ValueGet; + /** Resource for '/arrays/item-types/boolean' has methods for the following verbs: get, put */ + (path: "/arrays/item-types/boolean"): BooleanValueGet; + /** Resource for '/arrays/item-types/string' has methods for the following verbs: get, put */ + (path: "/arrays/item-types/string"): StringValueGet; + /** Resource for '/arrays/item-types/float32' has methods for the following verbs: get, put */ + (path: "/arrays/item-types/float32"): Float32ValueGet; + /** Resource for '/arrays/item-types/datetime' has methods for the following verbs: get, put */ + (path: "/arrays/item-types/datetime"): DatetimeValueGet; + /** Resource for '/arrays/item-types/duration' has methods for the following verbs: get, put */ + (path: "/arrays/item-types/duration"): DurationValueGet; + /** Resource for '/arrays/item-types/unknown' has methods for the following verbs: get, put */ + (path: "/arrays/item-types/unknown"): UnknownValueGet; + /** Resource for '/arrays/item-types/model' has methods for the following verbs: get, put */ + (path: "/arrays/item-types/model"): ModelValueGet; } export type ArrayItemTypesClient = Client & { diff --git a/packages/cadl-typescript/test/integration/generated/array/itemTypes/src/index.ts b/packages/cadl-typescript/test/integration/generated/arrays/itemTypes/src/index.ts similarity index 100% rename from packages/cadl-typescript/test/integration/generated/array/itemTypes/src/index.ts rename to packages/cadl-typescript/test/integration/generated/arrays/itemTypes/src/index.ts diff --git a/packages/cadl-typescript/test/integration/generated/array/itemTypes/src/models.ts b/packages/cadl-typescript/test/integration/generated/arrays/itemTypes/src/models.ts similarity index 100% rename from packages/cadl-typescript/test/integration/generated/array/itemTypes/src/models.ts rename to packages/cadl-typescript/test/integration/generated/arrays/itemTypes/src/models.ts diff --git a/packages/cadl-typescript/test/integration/generated/array/itemTypes/src/outputModels.ts b/packages/cadl-typescript/test/integration/generated/arrays/itemTypes/src/outputModels.ts similarity index 100% rename from packages/cadl-typescript/test/integration/generated/array/itemTypes/src/outputModels.ts rename to packages/cadl-typescript/test/integration/generated/arrays/itemTypes/src/outputModels.ts diff --git a/packages/cadl-typescript/test/integration/generated/array/itemTypes/src/parameters.ts b/packages/cadl-typescript/test/integration/generated/arrays/itemTypes/src/parameters.ts similarity index 100% rename from packages/cadl-typescript/test/integration/generated/array/itemTypes/src/parameters.ts rename to packages/cadl-typescript/test/integration/generated/arrays/itemTypes/src/parameters.ts diff --git a/packages/cadl-typescript/test/integration/generated/array/itemTypes/src/responses.ts b/packages/cadl-typescript/test/integration/generated/arrays/itemTypes/src/responses.ts similarity index 100% rename from packages/cadl-typescript/test/integration/generated/array/itemTypes/src/responses.ts rename to packages/cadl-typescript/test/integration/generated/arrays/itemTypes/src/responses.ts diff --git a/packages/cadl-typescript/test/integration/generated/authentication/apiKey/karma.conf.js b/packages/cadl-typescript/test/integration/generated/authentication/apiKey/karma.conf.js index 49810149b8..81a1a163cd 100644 --- a/packages/cadl-typescript/test/integration/generated/authentication/apiKey/karma.conf.js +++ b/packages/cadl-typescript/test/integration/generated/authentication/apiKey/karma.conf.js @@ -57,6 +57,7 @@ module.exports = function (config) { "AZURE_CLIENT_ID", "AZURE_TENANT_ID", "SUBSCRIPTION_ID", + "RECORDINGS_RELATIVE_PATH", ], // test results reporter to use diff --git a/packages/cadl-typescript/test/integration/generated/authentication/oauth2/karma.conf.js b/packages/cadl-typescript/test/integration/generated/authentication/oauth2/karma.conf.js index 49810149b8..81a1a163cd 100644 --- a/packages/cadl-typescript/test/integration/generated/authentication/oauth2/karma.conf.js +++ b/packages/cadl-typescript/test/integration/generated/authentication/oauth2/karma.conf.js @@ -57,6 +57,7 @@ module.exports = function (config) { "AZURE_CLIENT_ID", "AZURE_TENANT_ID", "SUBSCRIPTION_ID", + "RECORDINGS_RELATIVE_PATH", ], // test results reporter to use diff --git a/packages/cadl-typescript/test/integration/generated/models/usage/src/clientDefinitions.ts b/packages/cadl-typescript/test/integration/generated/models/usage/src/clientDefinitions.ts index 6998952fb5..8ddafaaf81 100644 --- a/packages/cadl-typescript/test/integration/generated/models/usage/src/clientDefinitions.ts +++ b/packages/cadl-typescript/test/integration/generated/models/usage/src/clientDefinitions.ts @@ -27,12 +27,12 @@ export interface InputAndOutput { } export interface Routes { - /** Resource for '/models/usages/input' has methods for the following verbs: post */ - (path: "/models/usages/input"): Input; - /** Resource for '/models/usages/output' has methods for the following verbs: get */ - (path: "/models/usages/output"): Output; - /** Resource for '/models/usages/input-output' has methods for the following verbs: post */ - (path: "/models/usages/input-output"): InputAndOutput; + /** Resource for '/models/usage/input' has methods for the following verbs: post */ + (path: "/models/usage/input"): Input; + /** Resource for '/models/usage/output' has methods for the following verbs: get */ + (path: "/models/usage/output"): Output; + /** Resource for '/models/usage/input-output' has methods for the following verbs: post */ + (path: "/models/usage/input-output"): InputAndOutput; } export type ModelsUsageClient = Client & { diff --git a/packages/cadl-typescript/test/integration/modelUsage.spec.ts b/packages/cadl-typescript/test/integration/modelUsage.spec.ts index de97f516e3..f05c0a9a6e 100644 --- a/packages/cadl-typescript/test/integration/modelUsage.spec.ts +++ b/packages/cadl-typescript/test/integration/modelUsage.spec.ts @@ -14,7 +14,7 @@ describe.skip("ModelsUsageClient Rest Client", () => { it("should post input model correctly", async () => { try { - const result = await client.path("/models/usages/input").post({ + const result = await client.path("/models/usage/input").post({ body }); assert.strictEqual(result.status, "204"); @@ -25,7 +25,7 @@ describe.skip("ModelsUsageClient Rest Client", () => { it("should get output model correctly", async () => { try { - const result = await client.path("/models/usages/output").get(); + const result = await client.path("/models/usage/output").get(); assert.strictEqual(result.status, "200"); assert.strictEqual(result.body, body); } catch (err) { @@ -36,7 +36,7 @@ describe.skip("ModelsUsageClient Rest Client", () => { it("should get output model correctly", async () => { try { const result = await client - .path("/models/usages/input-output") + .path("/models/usage/input-output") .post({ body }); assert.strictEqual(result.status, "200"); assert.strictEqual(result.body, body); diff --git a/packages/rlc-common/src/test/template.ts b/packages/rlc-common/src/test/template.ts index 0c85c103a3..05b128d287 100644 --- a/packages/rlc-common/src/test/template.ts +++ b/packages/rlc-common/src/test/template.ts @@ -65,6 +65,7 @@ module.exports = function (config) { "AZURE_CLIENT_ID", "AZURE_TENANT_ID", "SUBSCRIPTION_ID", + "RECORDINGS_RELATIVE_PATH", ], // test results reporter to use