chore: update tests from test-suite (#9)

TristanSpeakEasy · web-flow · commit b0ecb8292691 · 2022-10-03T11:13:18.000+01:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@speakeasy-api/speakeasy-typescript-sdk",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/speakeasy-api/speakeasy-typescript-sdk"
diff --git a/src/speakeasy.ts b/src/speakeasy.ts
@@ -4,7 +4,7 @@ import type { RequestHandler } from "express";
 import { expressMiddleware as eMiddleware } from "./middleware/express/middleware";
 import { nestJSMiddleware as nMiddleware } from "./middleware/nestjs/middleware";
 
-export const speakeasyVersion = "1.2.0";
+export const speakeasyVersion = "1.3.2";
 export const sdkName = "speakeasy-typescript-sdk";
 
 let speakeasyInstance: SpeakeasySDK | null = null;
diff --git a/test/testsuite/testdata/captures_basic_request_and_no_response_body_output.json b/test/testsuite/testdata/captures_basic_request_and_no_response_body_output.json
@@ -3,7 +3,7 @@
     "version": "1.2",
     "creator": {
       "name": "speakeasy-typescript-sdk",
-      "version": "1.2.0"
+      "version": "1.3.2"
     },
     "entries": [
       {
diff --git a/test/testsuite/testdata/captures_basic_request_and_response_output.json b/test/testsuite/testdata/captures_basic_request_and_response_output.json
@@ -3,7 +3,7 @@
     "version": "1.2",
     "creator": {
       "name": "speakeasy-typescript-sdk",
-      "version": "1.2.0"
+      "version": "1.3.2"
     },
     "entries": [
       {
diff --git a/test/testsuite/testdata/captures_basic_request_and_response_with_different_content_types_output.json b/test/testsuite/testdata/captures_basic_request_and_response_with_different_content_types_output.json
@@ -3,7 +3,7 @@
     "version": "1.2",
     "creator": {
       "name": "speakeasy-typescript-sdk",
-      "version": "1.2.0"
+      "version": "1.3.2"
     },
     "entries": [
       {
diff --git a/test/testsuite/testdata/captures_basic_request_and_response_with_no_response_header_set_output.json b/test/testsuite/testdata/captures_basic_request_and_response_with_no_response_header_set_output.json
@@ -3,7 +3,7 @@
     "version": "1.2",
     "creator": {
       "name": "speakeasy-typescript-sdk",
-      "version": "1.2.0"
+      "version": "1.3.2"
     },
     "entries": [
       {
diff --git a/test/testsuite/testdata/captures_basic_request_with_nano_precision_output.json b/test/testsuite/testdata/captures_basic_request_with_nano_precision_output.json
@@ -3,7 +3,7 @@
     "version": "1.2",
     "creator": {
       "name": "speakeasy-typescript-sdk",
-      "version": "1.2.0"
+      "version": "1.3.2"
     },
     "entries": [
       {
diff --git a/test/testsuite/testdata/captures_cookies_output.json b/test/testsuite/testdata/captures_cookies_output.json
@@ -3,7 +3,7 @@
     "version": "1.2",
     "creator": {
       "name": "speakeasy-typescript-sdk",
-      "version": "1.2.0"
+      "version": "1.3.2"
     },
     "entries": [
       {
diff --git a/test/testsuite/testdata/captures_masked_request_response_input.json b/test/testsuite/testdata/captures_masked_request_response_input.json
@@ -12,15 +12,15 @@
         "values": ["cookie1=value1; cookie2=value2; cookie3=value3"]
       },
       { "key": "Content-Type", "values": ["application/json"] },
-      { "key": "Content-Length", "values": ["103"] },
+      { "key": "Content-Length", "values": ["93"] },
       { "key": "Host", "values": ["test.com"] },
       { "key": "Accept-Encoding", "values": ["gzip, deflate"] },
       { "key": "Connection", "values": ["close"] },
       { "key": "Authorization", "values": ["Basic dXNlcjpwYXNzd29yZA=="] }
     ],
-    "body": "{\"test\": \"test\", \"test1\": 123.456, \"address\": {\"line1\": \"line1\", \"line2\": \"line2\", \"street\": \"street\"}}",
+    "body": "{\"test\":\"test\",\"test1\":123.456,\"address\":{\"line1\":\"line1\",\"line2\":\"line2\",\"street\":\"street\"}}",
     "response_status": -1,
-    "response_body": "{\r\n  \"test\":\"test\",\r\n  \"test1\":123.456,\r\n  \"address\":{\r\n    \"line1\":\"line1\",\r\n    \"line2\":\"line2\",\r\n    \"street\":\"street\"\r\n  }\r\n}",
+    "response_body": "{\"test\":\"test\",\"test1\":123.456,\"address\":{\"line1\":\"line1\",\"line2\":\"line2\",\"street\":\"street\"}}",
     "response_headers": [
       {
         "key": "Set-Cookie",
@@ -30,8 +30,8 @@
           "cookie3=value3"
         ]
       },
-      { "key": "Content-Type", "values": ["application/json"] },
-      { "key": "Content-Length", "values": ["129"] },
+      { "key": "Content-Type", "values": ["application/json; charset=utf-8"] },
+      { "key": "Content-Length", "values": ["93"] },
       { "key": "Session", "values": ["session_data"] },
       { "key": "X-Custom-Header", "values": ["1", "2", "3"] }
     ],
diff --git a/test/testsuite/testdata/captures_masked_request_response_output.json b/test/testsuite/testdata/captures_masked_request_response_output.json
@@ -3,7 +3,7 @@
     "version": "1.2",
     "creator": {
       "name": "speakeasy-typescript-sdk",
-      "version": "1.2.0"
+      "version": "1.3.2"
     },
     "entries": [
       {
@@ -42,7 +42,7 @@
             },
             {
               "name": "content-length",
-              "value": "103"
+              "value": "93"
             },
             {
               "name": "content-type",
@@ -72,10 +72,10 @@
             }
           ],
           "postData": {
-            "mimeType": "application/json","text": "{\"test\": \"test\", \"test1\": -12321, \"address\": {\"line1\": \"__masked__\", \"line2\": \"line2\", \"street\": \"_____\"}}"
+            "mimeType": "application/json","text": "{\"test\":\"test\",\"test1\":-12321,\"address\":{\"line1\":\"__masked__\",\"line2\":\"line2\",\"street\":\"_____\"}}"
           },
-          "headersSize": 219,
-          "bodySize": 103
+          "headersSize": 218,
+          "bodySize": 93
         },
         "response": {
           "status": 200,
@@ -99,7 +99,7 @@
           "headers": [
             {
               "name": "content-length",
-              "value": "129"
+              "value": "93"
             },
             {
               "name": "content-type",
@@ -135,13 +135,13 @@
             }
           ],
           "content": {
-            "size": 129,
+            "size": 93,
             "mimeType": "application/json; charset=utf-8",
-            "text": "{\r\n  \"test\":\"test\",\r\n  \"test1\":-12321,\r\n  \"address\":{\r\n    \"line1\":\"__masked__\",\r\n    \"line2\":\"line2\",\r\n    \"street\":\"_____\"\r\n  }\r\n}"
+            "text": "{\"test\":\"test\",\"test1\":-12321,\"address\":{\"line1\":\"__masked__\",\"line2\":\"line2\",\"street\":\"_____\"}}"
           },
           "redirectURL": "",
-          "headersSize": 249,
-          "bodySize": 129
+          "headersSize": 248,
+          "bodySize": 93
         },
         "cache": {},
         "timings": { "send": -1, "wait": -1, "receive": -1 },
diff --git a/test/testsuite/testdata/captures_no_response_body_when_not_modified_output.json b/test/testsuite/testdata/captures_no_response_body_when_not_modified_output.json
@@ -3,7 +3,7 @@
     "version": "1.2",
     "creator": {
       "name": "speakeasy-typescript-sdk",
-      "version": "1.2.0"
+      "version": "1.3.2"
     },
     "entries": [
       {
diff --git a/test/testsuite/testdata/captures_post_request_with_body_input.json b/test/testsuite/testdata/captures_post_request_with_body_input.json
@@ -8,12 +8,12 @@
     "url": "/test",
     "headers": [
       { "key": "Content-Type", "values": ["application/json"] },
-      { "key": "Content-Length", "values": ["16"] },
+      { "key": "Content-Length", "values": ["15"] },
       { "key": "Host", "values": ["test.com"] },
       { "key": "Accept-Encoding", "values": ["gzip, deflate"] },
       { "key": "Connection", "values": ["close"] }
     ],
-    "body": "{\"test\": \"test\"}",
+    "body": "{\"test\":\"test\"}",
     "response_status": -1,
     "response_body": "test",
     "response_headers": [
diff --git a/test/testsuite/testdata/captures_post_request_with_body_output.json b/test/testsuite/testdata/captures_post_request_with_body_output.json
@@ -3,7 +3,7 @@
     "version": "1.2",
     "creator": {
       "name": "speakeasy-typescript-sdk",
-      "version": "1.2.0"
+      "version": "1.3.2"
     },
     "entries": [
       {
@@ -25,7 +25,7 @@
             },
             {
               "name": "content-length",
-              "value": "16"
+              "value": "15"
             },
             {
               "name": "content-type",
@@ -38,10 +38,10 @@
           ],
           "queryString": [],
           "postData": {
-            "mimeType": "application/json","text": "{\"test\": \"test\"}"
+            "mimeType": "application/json","text": "{\"test\":\"test\"}"
           },
           "headersSize": 119,
-          "bodySize": 16
+          "bodySize": 15
         },
         "response": {
           "status": 200,
diff --git a/test/testsuite/testdata/captures_query_params_output.json b/test/testsuite/testdata/captures_query_params_output.json
@@ -3,7 +3,7 @@
     "version": "1.2",
     "creator": {
       "name": "speakeasy-typescript-sdk",
-      "version": "1.2.0"
+      "version": "1.3.2"
     },
     "entries": [
       {
diff --git a/test/testsuite/testdata/captures_redirect_output.json b/test/testsuite/testdata/captures_redirect_output.json
@@ -3,7 +3,7 @@
     "version": "1.2",
     "creator": {
       "name": "speakeasy-typescript-sdk",
-      "version": "1.2.0"
+      "version": "1.3.2"
     },
     "entries": [
       {
diff --git a/test/testsuite/testdata/drops_request_and_response_bodies_when_request_body_too_large_input.json b/test/testsuite/testdata/drops_request_and_response_bodies_when_request_body_too_large_input.json
@@ -8,12 +8,12 @@
     "url": "/test",
     "headers": [
       { "key": "Content-Type", "values": ["application/json"] },
-      { "key": "Content-Length", "values": ["25"] },
+      { "key": "Content-Length", "values": ["24"] },
       { "key": "Host", "values": ["test.com"] },
       { "key": "Accept-Encoding", "values": ["gzip, deflate"] },
       { "key": "Connection", "values": ["close"] }
     ],
-    "body": "{\"tooLarge\": \"veryLarge\"}",
+    "body": "{\"tooLarge\":\"veryLarge\"}",
     "response_status": 200,
     "response_body": "no room left for response to be captured",
     "response_headers": [
diff --git a/test/testsuite/testdata/drops_request_and_response_bodies_when_request_body_too_large_output.json b/test/testsuite/testdata/drops_request_and_response_bodies_when_request_body_too_large_output.json
@@ -3,7 +3,7 @@
     "version": "1.2",
     "creator": {
       "name": "speakeasy-typescript-sdk",
-      "version": "1.2.0"
+      "version": "1.3.2"
     },
     "entries": [
       {
@@ -25,7 +25,7 @@
             },
             {
               "name": "content-length",
-              "value": "25"
+              "value": "24"
             },
             {
               "name": "content-type",
@@ -41,7 +41,7 @@
             "mimeType": "application/json","text": "--dropped--"
           },
           "headersSize": 119,
-          "bodySize": 25
+          "bodySize": 24
         },
         "response": {
           "status": 200,
diff --git a/test/testsuite/testdata/drops_response_body_when_too_large_input.json b/test/testsuite/testdata/drops_response_body_when_too_large_input.json
@@ -8,12 +8,12 @@
     "url": "/test",
     "headers": [
       { "key": "Content-Type", "values": ["application/json"] },
-      { "key": "Content-Length", "values": ["10"] },
+      { "key": "Content-Length", "values": ["9"] },
       { "key": "Host", "values": ["test.com"] },
       { "key": "Accept-Encoding", "values": ["gzip, deflate"] },
       { "key": "Connection", "values": ["close"] }
     ],
-    "body": "{\"a\": \"b\"}",
+    "body": "{\"a\":\"b\"}",
     "response_status": 200,
     "response_body": "response is way too large to be captured",
     "response_headers": [
diff --git a/test/testsuite/testdata/drops_response_body_when_too_large_output.json b/test/testsuite/testdata/drops_response_body_when_too_large_output.json
@@ -3,7 +3,7 @@
     "version": "1.2",
     "creator": {
       "name": "speakeasy-typescript-sdk",
-      "version": "1.2.0"
+      "version": "1.3.2"
     },
     "entries": [
       {
@@ -25,7 +25,7 @@
             },
             {
               "name": "content-length",
-              "value": "10"
+              "value": "9"
             },
             {
               "name": "content-type",
@@ -38,10 +38,10 @@
           ],
           "queryString": [],
           "postData": {
-            "mimeType": "application/json","text": "{\"a\": \"b\"}"
+            "mimeType": "application/json","text": "{\"a\":\"b\"}"
           },
-          "headersSize": 119,
-          "bodySize": 10
+          "headersSize": 118,
+          "bodySize": 9
         },
         "response": {
           "status": 200,
diff --git a/test/testsuite/testsuite.test.ts b/test/testsuite/testsuite.test.ts
@@ -116,7 +116,8 @@ describe("Test Suite", () => {
 
     for (const header of args.headers) {
       for (const value of header.values) {
-        r = r.set(header.key, value);
+        // Currently this will overwrite any existing headers and doesn't support multiple headers with the same name
+        r.set(header.key, value);
       }
     }
 
@@ -253,7 +254,7 @@ function createSimpleExpressApp(speakeasy: SpeakeasySDK, args: Args): Express {
 
       if (args.response_headers) {
         for (const header of args.response_headers) {
-          res.set(
+          res.append(
             header.key,
             header.values.length == 1 ? header.values[0] : header.values
           );

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@speakeasy-api/speakeasy-typescript-sdk",`
`3`		`- "version": "1.3.1",`
	`3`	`+ "version": "1.3.2",`
`4`	`4`	`"repository": {`
`5`	`5`	`"type": "git",`
`6`	`6`	`"url": "https://github.com/speakeasy-api/speakeasy-typescript-sdk"`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"version": "1.2",`
`4`	`4`	`"creator": {`
`5`	`5`	`"name": "speakeasy-typescript-sdk",`
`6`		`- "version": "1.2.0"`
	`6`	`+ "version": "1.3.2"`
`7`	`7`	`},`
`8`	`8`	`"entries": [`
`9`	`9`	`{`