From 9badc4394ee8f79248cd4b517f4101f620a63447 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Mon, 14 Oct 2024 13:15:32 +0800 Subject: [PATCH 1/5] specs, back port cadl-ranch 750 --- packages/http-specs/specs/routes/mockapi.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/http-specs/specs/routes/mockapi.ts b/packages/http-specs/specs/routes/mockapi.ts index ec8eb6a7af..fe80345354 100644 --- a/packages/http-specs/specs/routes/mockapi.ts +++ b/packages/http-specs/specs/routes/mockapi.ts @@ -155,7 +155,7 @@ Scenarios.Routes_QueryParameters_QueryExpansion_Explode_primitive = createTests( "/routes/query/query-expansion/explode/primitive?param=a", ); Scenarios.Routes_QueryParameters_QueryExpansion_Explode_array = createTests( - "/routes/query/query-expansion/explode/array?param=a,b", + "/routes/query/query-expansion/explode/array?param=a¶m=b", ); Scenarios.Routes_QueryParameters_QueryExpansion_Explode_record = createTests( "/routes/query/query-expansion/explode/record?a=1&b=2", @@ -173,7 +173,7 @@ Scenarios.Routes_QueryParameters_QueryContinuation_Explode_primitive = createTes "/routes/query/query-continuation/explode/primitive?fixed=true¶m=a", ); Scenarios.Routes_QueryParameters_QueryContinuation_Explode_array = createTests( - "/routes/query/query-continuation/explode/array?fixed=true¶m=a,b", + "/routes/query/query-continuation/explode/array?fixed=true¶m=a¶m=b", ); Scenarios.Routes_QueryParameters_QueryContinuation_Explode_record = createTests( "/routes/query/query-continuation/explode/record?fixed=true&a=1&b=2", From 96955dea6f4871a7d7a09ec6fe707130d6038ba7 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Mon, 14 Oct 2024 15:01:11 +0800 Subject: [PATCH 2/5] use queryMap in request --- packages/http-specs/specs/routes/mockapi.ts | 30 +++++++++------------ 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/packages/http-specs/specs/routes/mockapi.ts b/packages/http-specs/specs/routes/mockapi.ts index fe80345354..abbc8a81fb 100644 --- a/packages/http-specs/specs/routes/mockapi.ts +++ b/packages/http-specs/specs/routes/mockapi.ts @@ -5,33 +5,29 @@ export const Scenarios: Record = {}; function createTests(uri: string) { const url = new URL("http://example.com" + uri); const searchParams = url.searchParams; - const params: Record = {}; - for (const [key, value] of searchParams) { - params[key] = value; + const queryMap = new Map(); + for (const [key, value] of url.searchParams.entries()) { + if (queryMap.has(key)) { + const existing = queryMap.get(key)!; + if (Array.isArray(existing)) { + existing.push(value); + } else { + queryMap.set(key, [existing, value]); + } + } else { + queryMap.set(key, value); + } } return passOnSuccess({ uri: url.pathname, method: "get", request: { - params, + queryMap, }, response: { status: 204, }, handler: (req: MockRequest) => { - const queryMap = new Map(); - for (const [key, value] of url.searchParams.entries()) { - if (queryMap.has(key)) { - const existing = queryMap.get(key)!; - if (Array.isArray(existing)) { - existing.push(value); - } else { - queryMap.set(key, [existing, value]); - } - } else { - queryMap.set(key, value); - } - } for (const [key, value] of queryMap.entries()) { if (Array.isArray(value)) { req.expect.containsQueryParam(key, value, "multi"); From f975fc7f3a3b8858418741cddc8c9edb5eed846f Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Mon, 14 Oct 2024 15:04:56 +0800 Subject: [PATCH 3/5] lint --- packages/http-specs/specs/routes/mockapi.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/http-specs/specs/routes/mockapi.ts b/packages/http-specs/specs/routes/mockapi.ts index abbc8a81fb..454d6f6692 100644 --- a/packages/http-specs/specs/routes/mockapi.ts +++ b/packages/http-specs/specs/routes/mockapi.ts @@ -4,7 +4,6 @@ export const Scenarios: Record = {}; function createTests(uri: string) { const url = new URL("http://example.com" + uri); - const searchParams = url.searchParams; const queryMap = new Map(); for (const [key, value] of url.searchParams.entries()) { if (queryMap.has(key)) { From 580f8b99c87664140ea5f25642c943987b1a6bc1 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Mon, 14 Oct 2024 15:14:31 +0800 Subject: [PATCH 4/5] fix --- packages/http-specs/specs/routes/mockapi.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/http-specs/specs/routes/mockapi.ts b/packages/http-specs/specs/routes/mockapi.ts index 454d6f6692..ef52849a37 100644 --- a/packages/http-specs/specs/routes/mockapi.ts +++ b/packages/http-specs/specs/routes/mockapi.ts @@ -21,7 +21,7 @@ function createTests(uri: string) { uri: url.pathname, method: "get", request: { - queryMap, + params: queryMap, }, response: { status: 204, From 9a31a7428e26e3a0be362c26fe5fc0f6c54df8c5 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Mon, 14 Oct 2024 15:23:48 +0800 Subject: [PATCH 5/5] fix --- packages/http-specs/specs/routes/mockapi.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/http-specs/specs/routes/mockapi.ts b/packages/http-specs/specs/routes/mockapi.ts index ef52849a37..b1a8013c4e 100644 --- a/packages/http-specs/specs/routes/mockapi.ts +++ b/packages/http-specs/specs/routes/mockapi.ts @@ -21,7 +21,7 @@ function createTests(uri: string) { uri: url.pathname, method: "get", request: { - params: queryMap, + params: Object.fromEntries(queryMap), }, response: { status: 204,