diff --git a/packages/insomnia-test/tests/cookie/cookie-path-mismatch-not-sent.spec.ts b/packages/insomnia-test/tests/cookie/cookie-path-mismatch-not-sent.spec.ts index d39532c8cc..6b7191a81a 100644 --- a/packages/insomnia-test/tests/cookie/cookie-path-mismatch-not-sent.spec.ts +++ b/packages/insomnia-test/tests/cookie/cookie-path-mismatch-not-sent.spec.ts @@ -44,7 +44,7 @@ test("Verify Cookie With Mismatched Path Is Not Sent With HTTP Request", async ( const responseView = await httpRequestFlow.send(request); - const { cookies } = responseView.body as { cookies: Record }; + const { cookies } = responseView.preview as { cookies: Record }; expect(cookies).not.toHaveProperty(mismatchedCookie.key); expect(cookies).toMatchObject({ [matchedCookie.key]: matchedCookie.value }); }); diff --git a/packages/insomnia-test/tests/cookie/cookie-same-key-overwrite.spec.ts b/packages/insomnia-test/tests/cookie/cookie-same-key-overwrite.spec.ts index 760b497d77..b6cdd95e62 100644 --- a/packages/insomnia-test/tests/cookie/cookie-same-key-overwrite.spec.ts +++ b/packages/insomnia-test/tests/cookie/cookie-same-key-overwrite.spec.ts @@ -40,7 +40,7 @@ test("Verify Re-Linking Same Cookie Key Overwrites Previous Value", async ({ const responseView = await httpRequestFlow.send(request); - const { cookies } = responseView.body as { cookies: Record }; + const { cookies } = responseView.preview as { cookies: Record }; expect(cookieList.filter((cookie) => cookie.key === key)).toHaveLength(1); expect(cookieList).toMatchObject([{ key, value: freshValue }]); expect(cookies).toMatchObject({ [key]: freshValue }); diff --git a/packages/insomnia-test/tests/cookie/expired-cookie-not-sent.spec.ts b/packages/insomnia-test/tests/cookie/expired-cookie-not-sent.spec.ts index 613b315afa..f345364ddf 100644 --- a/packages/insomnia-test/tests/cookie/expired-cookie-not-sent.spec.ts +++ b/packages/insomnia-test/tests/cookie/expired-cookie-not-sent.spec.ts @@ -45,7 +45,7 @@ test("Verify Expired Cookie Is Not Sent With HTTP Request", async ({ const responseView = await httpRequestFlow.send(request); - const { cookies } = responseView.body as { cookies: Record }; + const { cookies } = responseView.preview as { cookies: Record }; expect(cookies).not.toHaveProperty(expiredCookie.key); expect(cookies).toMatchObject({ [activeCookie.key]: activeCookie.value }); }); diff --git a/packages/insomnia-test/tests/cookie/happy-path.spec.ts b/packages/insomnia-test/tests/cookie/happy-path.spec.ts index 3aa5b2fa91..3aa523bbd9 100644 --- a/packages/insomnia-test/tests/cookie/happy-path.spec.ts +++ b/packages/insomnia-test/tests/cookie/happy-path.spec.ts @@ -48,9 +48,9 @@ test("Verify Linked Cookie Is Sent With HTTP Request", async ({ user }) => { ]); const responseView = await httpRequestFlow.send(request); - expect(responseView.statusCode).toBe(200); + expect(responseView.statusBar.code).toBe(200); - const { cookies } = responseView.body as { cookies: Record }; + const { cookies } = responseView.preview as { cookies: Record }; expect(Object.keys(cookies)).toHaveLength(2); const expectedCookies = Object.fromEntries( diff --git a/packages/insomnia-test/tests/cookie/host-prefix-cookie-requires-host-only.spec.ts b/packages/insomnia-test/tests/cookie/host-prefix-cookie-requires-host-only.spec.ts index 793d83e900..c48e52d631 100644 --- a/packages/insomnia-test/tests/cookie/host-prefix-cookie-requires-host-only.spec.ts +++ b/packages/insomnia-test/tests/cookie/host-prefix-cookie-requires-host-only.spec.ts @@ -47,7 +47,7 @@ test("Verify __Host- Prefixed Cookie Is Only Sent When Marked HostOnly", async ( const responseView = await httpRequestFlow.send(request); - const { cookies } = responseView.body as { cookies: Record }; + const { cookies } = responseView.preview as { cookies: Record }; expect(cookies).toMatchObject({ [hostOnlyCookie.key]: hostOnlyCookie.value, }); diff --git a/packages/insomnia-test/tests/cookie/http-only-cookie-always-sent.spec.ts b/packages/insomnia-test/tests/cookie/http-only-cookie-always-sent.spec.ts index f8f86e2929..d0a3a2729f 100644 --- a/packages/insomnia-test/tests/cookie/http-only-cookie-always-sent.spec.ts +++ b/packages/insomnia-test/tests/cookie/http-only-cookie-always-sent.spec.ts @@ -46,15 +46,15 @@ test("Verify HttpOnly Cookie Flag Persists And Cookie Is Always Sent Over HTTP A const httpResponse = await httpRequestFlow.send(httpRequest); const httpsResponse = await httpRequestFlow.send(httpsRequest); - expect(httpResponse.statusCode).toBe(200); - const { cookies: httpCookies } = httpResponse.body as { + expect(httpResponse.statusBar.code).toBe(200); + const { cookies: httpCookies } = httpResponse.preview as { cookies: Record; }; expect(httpCookies).toMatchObject({ [httpOnlyCookie.key]: httpOnlyCookie.value, }); - expect(httpsResponse.statusCode).toBe(200); - const { cookies: httpsCookies } = httpsResponse.body as { + expect(httpsResponse.statusBar.code).toBe(200); + const { cookies: httpsCookies } = httpsResponse.preview as { cookies: Record; }; expect(httpsCookies).toMatchObject({ diff --git a/packages/insomnia-test/tests/cookie/raw-cookie-string-editor.spec.ts b/packages/insomnia-test/tests/cookie/raw-cookie-string-editor.spec.ts index f4c22cc8e0..5ac8700f51 100644 --- a/packages/insomnia-test/tests/cookie/raw-cookie-string-editor.spec.ts +++ b/packages/insomnia-test/tests/cookie/raw-cookie-string-editor.spec.ts @@ -41,7 +41,7 @@ test("Verify Editing A Cookie Via The Raw Tab Updates Its Fields And Is Sent", a await cookiePage.close(); const responseView = await httpRequestFlow.send(request); - const { cookies: sentCookies } = responseView.body as { + const { cookies: sentCookies } = responseView.preview as { cookies: Record; }; diff --git a/packages/insomnia-test/tests/cookie/secure-cookie-not-sent-over-http.spec.ts b/packages/insomnia-test/tests/cookie/secure-cookie-not-sent-over-http.spec.ts index ff2a05e1b5..8bd48e52f2 100644 --- a/packages/insomnia-test/tests/cookie/secure-cookie-not-sent-over-http.spec.ts +++ b/packages/insomnia-test/tests/cookie/secure-cookie-not-sent-over-http.spec.ts @@ -46,8 +46,8 @@ test("Verify Secure Cookie Is Sent Over HTTPS But Not Over Plain HTTP", async ({ await cookieFlow.link(httpRequest, [secureCookie]); const httpsResponse = await httpRequestFlow.send(httpsRequest); - expect(httpsResponse.statusCode).toBe(200); - const { cookies: httpsCookies } = httpsResponse.body as { + expect(httpsResponse.statusBar.code).toBe(200); + const { cookies: httpsCookies } = httpsResponse.preview as { cookies: Record; }; expect(httpsCookies).toMatchObject({ @@ -55,7 +55,7 @@ test("Verify Secure Cookie Is Sent Over HTTPS But Not Over Plain HTTP", async ({ }); const httpResponse = await httpRequestFlow.send(httpRequest); - const { cookies: httpCookies } = httpResponse.body as { + const { cookies: httpCookies } = httpResponse.preview as { cookies: Record; }; expect(httpCookies).not.toHaveProperty(secureCookie.key); diff --git a/packages/insomnia-test/tests/environment/case-sensitive-variable-names.spec.ts b/packages/insomnia-test/tests/environment/case-sensitive-variable-names.spec.ts index c37a513ae4..9d2434e721 100644 --- a/packages/insomnia-test/tests/environment/case-sensitive-variable-names.spec.ts +++ b/packages/insomnia-test/tests/environment/case-sensitive-variable-names.spec.ts @@ -61,8 +61,8 @@ test("Verify Variable Names Are Case Sensitive Across Environment Levels", async } satisfies HttpRequest); const responseView = await httpRequestFlow.send(request); - expect(responseView.statusCode).toBe(200); - expect(responseView.body).toMatchObject({ + expect(responseView.statusBar.code).toBe(200); + expect(responseView.preview).toMatchObject({ args: { lower: baseValue, upper: subValue }, }); }); diff --git a/packages/insomnia-test/tests/environment/circular-variable-reference.spec.ts b/packages/insomnia-test/tests/environment/circular-variable-reference.spec.ts index bb8ff202ce..58ce5379f6 100644 --- a/packages/insomnia-test/tests/environment/circular-variable-reference.spec.ts +++ b/packages/insomnia-test/tests/environment/circular-variable-reference.spec.ts @@ -53,6 +53,6 @@ test("Verify Circular Variable Reference Resolves To Literal Unresolved Text", a } satisfies HttpRequest); const responseView = await httpRequestFlow.send(request); - expect(responseView.statusCode).toBe(200); - expect(responseView.body).toMatchObject({ args: { value: `{{${variableA}}}` } }); + expect(responseView.statusBar.code).toBe(200); + expect(responseView.preview).toMatchObject({ args: { value: `{{${variableA}}}` } }); }); diff --git a/packages/insomnia-test/tests/environment/create-and-duplicate-global-environment.spec.ts b/packages/insomnia-test/tests/environment/create-and-duplicate-global-environment.spec.ts index a389bf3a05..75b01aa4f9 100644 --- a/packages/insomnia-test/tests/environment/create-and-duplicate-global-environment.spec.ts +++ b/packages/insomnia-test/tests/environment/create-and-duplicate-global-environment.spec.ts @@ -55,6 +55,6 @@ test("Verify creating and duplicating a global environment", async ({ expect(duplicatedEnvironment.id).not.toBe(environment.id); expect(duplicatedEnvironment.name).toBe(duplicatedName); - expect(responseView.statusCode).toBe(200); - expect(responseView.body).toMatchObject({ args: { value: variableValue } }); + expect(responseView.statusBar.code).toBe(200); + expect(responseView.preview).toMatchObject({ args: { value: variableValue } }); }); diff --git a/packages/insomnia-test/tests/environment/disabled-sub-environment-variable-falls-back-to-base.spec.ts b/packages/insomnia-test/tests/environment/disabled-sub-environment-variable-falls-back-to-base.spec.ts index ea120b7685..343c4700ba 100644 --- a/packages/insomnia-test/tests/environment/disabled-sub-environment-variable-falls-back-to-base.spec.ts +++ b/packages/insomnia-test/tests/environment/disabled-sub-environment-variable-falls-back-to-base.spec.ts @@ -60,6 +60,6 @@ test("Verify a disabled sub-environment variable falls back to the base environm } satisfies HttpRequest); const responseView = await httpRequestFlow.send(request); - expect(responseView.statusCode).toBe(200); - expect(responseView.body).toMatchObject({ args: { value: baseValue } }); + expect(responseView.statusBar.code).toBe(200); + expect(responseView.preview).toMatchObject({ args: { value: baseValue } }); }); diff --git a/packages/insomnia-test/tests/environment/disabled-variable-mid-chain.spec.ts b/packages/insomnia-test/tests/environment/disabled-variable-mid-chain.spec.ts index fa409a4d97..46ee468924 100644 --- a/packages/insomnia-test/tests/environment/disabled-variable-mid-chain.spec.ts +++ b/packages/insomnia-test/tests/environment/disabled-variable-mid-chain.spec.ts @@ -63,8 +63,8 @@ test("Verify Disabled Mid-Chain Variable Leaves Reference Unresolved", async ({ } satisfies HttpRequest); const responseView = await httpRequestFlow.send(request); - expect(responseView.statusCode).toBe(200); - expect(responseView.body).toMatchObject({ + expect(responseView.statusBar.code).toBe(200); + expect(responseView.preview).toMatchObject({ args: { value: `{{${midVariable}}}` }, }); }); diff --git a/packages/insomnia-test/tests/environment/folder-environment-overrides-sub-and-base.spec.ts b/packages/insomnia-test/tests/environment/folder-environment-overrides-sub-and-base.spec.ts index 0dc992b9f5..83fa851c47 100644 --- a/packages/insomnia-test/tests/environment/folder-environment-overrides-sub-and-base.spec.ts +++ b/packages/insomnia-test/tests/environment/folder-environment-overrides-sub-and-base.spec.ts @@ -65,12 +65,12 @@ test("Verify a folder environment overrides sub and base environments for its re const responseInFolder = await httpRequestFlow.send(requestInFolder); const responseOutsideFolder = await httpRequestFlow.send(requestOutsideFolder); - expect(responseInFolder.statusCode).toBe(200); - expect(responseInFolder.body).toMatchObject({ + expect(responseInFolder.statusBar.code).toBe(200); + expect(responseInFolder.preview).toMatchObject({ args: { shared: folderShared, subOnly: subSubOnly }, }); - expect(responseOutsideFolder.statusCode).toBe(200); - expect(responseOutsideFolder.body).toMatchObject({ + expect(responseOutsideFolder.statusBar.code).toBe(200); + expect(responseOutsideFolder.preview).toMatchObject({ args: { shared: subShared, subOnly: subSubOnly }, }); }); diff --git a/packages/insomnia-test/tests/environment/mixed-variables-in-value.spec.ts b/packages/insomnia-test/tests/environment/mixed-variables-in-value.spec.ts index 6506e68759..88e62d2605 100644 --- a/packages/insomnia-test/tests/environment/mixed-variables-in-value.spec.ts +++ b/packages/insomnia-test/tests/environment/mixed-variables-in-value.spec.ts @@ -56,8 +56,8 @@ test("Verify Multiple Variables Mixed In A Single Value Resolve Together", async } satisfies HttpRequest); const responseView = await httpRequestFlow.send(request); - expect(responseView.statusCode).toBe(200); - expect(responseView.body).toMatchObject({ + expect(responseView.statusBar.code).toBe(200); + expect(responseView.preview).toMatchObject({ args: { value: `${firstValue}-${secondValue}` }, }); }); diff --git a/packages/insomnia-test/tests/environment/nested-variable-resolution.spec.ts b/packages/insomnia-test/tests/environment/nested-variable-resolution.spec.ts index 171781a5d4..f288c7eb80 100644 --- a/packages/insomnia-test/tests/environment/nested-variable-resolution.spec.ts +++ b/packages/insomnia-test/tests/environment/nested-variable-resolution.spec.ts @@ -62,6 +62,6 @@ test("Verify Multi-Level Nested Variable Resolution", async ({ user }) => { } satisfies HttpRequest); const responseView = await httpRequestFlow.send(request); - expect(responseView.statusCode).toBe(200); - expect(responseView.body).toMatchObject({ args: { value: finalValue } }); + expect(responseView.statusBar.code).toBe(200); + expect(responseView.preview).toMatchObject({ args: { value: finalValue } }); }); diff --git a/packages/insomnia-test/tests/environment/private-environment-secret-variable.spec.ts b/packages/insomnia-test/tests/environment/private-environment-secret-variable.spec.ts index 809df55a92..8a01f29dbb 100644 --- a/packages/insomnia-test/tests/environment/private-environment-secret-variable.spec.ts +++ b/packages/insomnia-test/tests/environment/private-environment-secret-variable.spec.ts @@ -83,8 +83,8 @@ testWithVaultKey( }); const responseView = await httpRequestFlow.send(request!); - expect(responseView.statusCode).toBe(200); - expect((responseView.body as { data: string }).data).toBe( + expect(responseView.statusBar.code).toBe(200); + expect((responseView.preview as { data: string }).data).toBe( `${secretValueFoo}\n${secretValueHello}`, ); }, diff --git a/packages/insomnia-test/tests/environment/self-referencing-variable.spec.ts b/packages/insomnia-test/tests/environment/self-referencing-variable.spec.ts index a39e78bf01..4901aa50bf 100644 --- a/packages/insomnia-test/tests/environment/self-referencing-variable.spec.ts +++ b/packages/insomnia-test/tests/environment/self-referencing-variable.spec.ts @@ -45,8 +45,8 @@ test("Verify Self-Referencing Variable Resolves To Literal Unresolved Text", asy } satisfies HttpRequest); const responseView = await httpRequestFlow.send(request); - expect(responseView.statusCode).toBe(200); - expect(responseView.body).toMatchObject({ + expect(responseView.statusBar.code).toBe(200); + expect(responseView.preview).toMatchObject({ args: { value: `{{${selfVariable}}}` }, }); }); diff --git a/packages/insomnia-test/tests/environment/sub-environment-empty-falls-back-to-base.spec.ts b/packages/insomnia-test/tests/environment/sub-environment-empty-falls-back-to-base.spec.ts index 600054e480..c13b14312c 100644 --- a/packages/insomnia-test/tests/environment/sub-environment-empty-falls-back-to-base.spec.ts +++ b/packages/insomnia-test/tests/environment/sub-environment-empty-falls-back-to-base.spec.ts @@ -66,8 +66,8 @@ test("Verify an empty sub-environment falls back to the base environment until i ]); const afterOwnValue = await httpRequestFlow.send(request); - expect(beforeOwnValue.statusCode).toBe(200); - expect(beforeOwnValue.body).toMatchObject({ args: { value: baseValue } }); - expect(afterOwnValue.statusCode).toBe(200); - expect(afterOwnValue.body).toMatchObject({ args: { value: subValue } }); + expect(beforeOwnValue.statusBar.code).toBe(200); + expect(beforeOwnValue.preview).toMatchObject({ args: { value: baseValue } }); + expect(afterOwnValue.statusBar.code).toBe(200); + expect(afterOwnValue.preview).toMatchObject({ args: { value: subValue } }); }); diff --git a/packages/insomnia-test/tests/environment/sub-environment-variable-priority.spec.ts b/packages/insomnia-test/tests/environment/sub-environment-variable-priority.spec.ts index d03f6f7ca6..ce0bd2e447 100644 --- a/packages/insomnia-test/tests/environment/sub-environment-variable-priority.spec.ts +++ b/packages/insomnia-test/tests/environment/sub-environment-variable-priority.spec.ts @@ -59,6 +59,6 @@ test("Verify Sub Environment Variable Overrides Base Environment", async ({ url: `${HTTP_SERVER}/post?value={{${sharedVariable}}}`, } satisfies HttpRequest); const responseView = await httpRequestFlow.send(request); - expect(responseView.statusCode).toBe(200); - expect(responseView.body).toMatchObject({ args: { value: subValue } }); + expect(responseView.statusBar.code).toBe(200); + expect(responseView.preview).toMatchObject({ args: { value: subValue } }); }); diff --git a/packages/insomnia-test/tests/environment/variable-source-live-preview/variable-source-levels.spec.ts b/packages/insomnia-test/tests/environment/variable-source-live-preview/variable-source-levels.spec.ts index 2200d72a36..e0b3f1a08c 100644 --- a/packages/insomnia-test/tests/environment/variable-source-live-preview/variable-source-levels.spec.ts +++ b/packages/insomnia-test/tests/environment/variable-source-live-preview/variable-source-levels.spec.ts @@ -146,9 +146,9 @@ for (const scenario of scenarios) { scenario.landingRow, ); - expect(response.statusCode).toBe(200); + expect(response.statusBar.code).toBe(200); expect( - JSON.parse((response.body as { data: string }).data)[scenario.field], + JSON.parse((response.preview as { data: string }).data)[scenario.field], ).toBe(scenario.value); expect(modal.source).toContain(scenario.source); expect(modal.preview).toBe(scenario.value); diff --git a/packages/insomnia-test/tests/environment/vault-legacy-format-environment-variables/vault-legacy-format-environment-variables.spec.ts b/packages/insomnia-test/tests/environment/vault-legacy-format-environment-variables/vault-legacy-format-environment-variables.spec.ts index cd9cbdf862..9f3d70122f 100644 --- a/packages/insomnia-test/tests/environment/vault-legacy-format-environment-variables/vault-legacy-format-environment-variables.spec.ts +++ b/packages/insomnia-test/tests/environment/vault-legacy-format-environment-variables/vault-legacy-format-environment-variables.spec.ts @@ -74,12 +74,12 @@ testWithVaultKey( await environmentFlow.activate(collection, "base with vault"); const invalidRequest = await httpRequestFlow.get("legacy-invalid-vault"); - expect(arrayResponse.statusCode).toBe(200); - expect((arrayResponse.body as { data: string }).data).toBe( + expect(arrayResponse.statusBar.code).toBe(200); + expect((arrayResponse.preview as { data: string }).data).toBe( "vault_array_a\nvault_array_b", ); - expect(objectResponse.statusCode).toBe(200); - expect((objectResponse.body as { data: string }).data).toBe("secv1\nsecv2"); + expect(objectResponse.statusBar.code).toBe(200); + expect((objectResponse.preview as { data: string }).data).toBe("secv1\nsecv2"); await expect(httpRequestFlow.send(invalidRequest!)).rejects.toThrow( /vault is a reserved key for insomnia vault/, ); diff --git a/packages/insomnia-test/tests/http-request/after-response-script-test-results.spec.ts b/packages/insomnia-test/tests/http-request/after-response-script-test-results.spec.ts index 202cd02eb2..5619e9bedd 100644 --- a/packages/insomnia-test/tests/http-request/after-response-script-test-results.spec.ts +++ b/packages/insomnia-test/tests/http-request/after-response-script-test-results.spec.ts @@ -54,7 +54,7 @@ test('Verify insomnia.test/insomnia.expect report PASS/FAIL results, including a }); const responseView = await httpRequestFlow.send(request); - expect(responseView.statusCode).toBe(200); + expect(responseView.statusBar.code).toBe(200); await expect .poll(() => responseView.tests?.(), { timeout: DEFAULT_TIMEOUT }) .toEqual( diff --git a/packages/insomnia-test/tests/http-request/body-types.spec.ts b/packages/insomnia-test/tests/http-request/body-types.spec.ts index e21bbc0f37..8e57a7b9ed 100644 --- a/packages/insomnia-test/tests/http-request/body-types.spec.ts +++ b/packages/insomnia-test/tests/http-request/body-types.spec.ts @@ -50,7 +50,7 @@ test("Send HTTP Request with x-www-form-urlencoded Body", async ({ user }) => { const persisted = await httpRequestFlow.create(collection, request); const responseView = await httpRequestFlow.send(request); - const raw = (responseView.body as { data: string }).data; + const raw = (responseView.preview as { data: string }).data; expect(persisted.body?.mimeType).toBe(ContentType.Form); expect(persisted.body?.params).toMatchObject([ @@ -58,12 +58,12 @@ test("Send HTTP Request with x-www-form-urlencoded Body", async ({ user }) => { { name: "userId", value: userId }, { name: "excluded", disabled: true }, ]); - expect(responseView.statusCode).toBe(200); + expect(responseView.statusBar.code).toBe(200); expect(Object.fromEntries(new URLSearchParams(raw))).toEqual({ title, userId, }); - expect(responseView.body).toMatchObject({ + expect(responseView.preview).toMatchObject({ headers: expect.objectContaining({ "content-type": expect.stringContaining(ContentType.Form), }), @@ -94,8 +94,8 @@ test("Send HTTP Request with JSON Body", async ({ user }) => { const responseView = await httpRequestFlow.send(request); expect(persisted).toMatchObject(request); - expect(responseView.statusCode).toBe(200); - expect(responseView.body).toMatchObject({ + expect(responseView.statusBar.code).toBe(200); + expect(responseView.preview).toMatchObject({ json: payload, headers: expect.objectContaining({ "content-type": expect.stringContaining(ContentType.JSON), @@ -128,8 +128,8 @@ test("Send HTTP Request with XML Body", async ({ user }) => { const responseView = await httpRequestFlow.send(request); expect(persisted).toMatchObject(request); - expect(responseView.statusCode).toBe(200); - expect(responseView.body).toMatchObject({ + expect(responseView.statusBar.code).toBe(200); + expect(responseView.preview).toMatchObject({ data: xml, headers: expect.objectContaining({ "content-type": expect.stringContaining(ContentType.XML), @@ -164,8 +164,8 @@ test("Send HTTP Request with No Body explicitly selected", async ({ user }) => { url: request.url, body: undefined, }); - expect(responseView.statusCode).toBe(200); - expect(responseView.body).toMatchObject({ + expect(responseView.statusBar.code).toBe(200); + expect(responseView.preview).toMatchObject({ data: "", json: null, }); @@ -204,7 +204,7 @@ test("Send HTTP Request with multipart/form-data Body including a file field", a await httpRequestFlow.create(collection, request); const persisted = await httpRequestFlow.get(request.name); const responseView = await httpRequestFlow.send(request); - const raw = (responseView.body as { data: string }).data; + const raw = (responseView.preview as { data: string }).data; expect(persisted?.body?.mimeType).toBe(ContentType.Multipart); expect(persisted?.body?.params?.[0]).toMatchObject({ @@ -213,12 +213,12 @@ test("Send HTTP Request with multipart/form-data Body including a file field", a }); expect(persisted?.body?.params?.[1]?.name).toBe("upload"); expect(persisted?.body?.params?.[1]?.fileName).toContain("upload-sample.txt"); - expect(responseView.statusCode).toBe(200); + expect(responseView.statusBar.code).toBe(200); expect(raw).toContain('name="title"'); expect(raw).toContain(title); expect(raw).toContain('name="upload"; filename="upload-sample.txt"'); expect(raw).toContain("insomnia-e2e-upload-fixture"); - expect(responseView.body).toMatchObject({ + expect(responseView.preview).toMatchObject({ headers: expect.objectContaining({ "content-type": expect.stringContaining(ContentType.Multipart), }), diff --git a/packages/insomnia-test/tests/http-request/cancel-in-flight-request.spec.ts b/packages/insomnia-test/tests/http-request/cancel-in-flight-request.spec.ts index a5cad22158..0af9a1395b 100644 --- a/packages/insomnia-test/tests/http-request/cancel-in-flight-request.spec.ts +++ b/packages/insomnia-test/tests/http-request/cancel-in-flight-request.spec.ts @@ -51,6 +51,6 @@ test("Verify Cancelling an In-Flight HTTP Request Shows a Cancellation Message a const laterResponse = await httpRequestFlow.send(laterRequest); expect(requestStateAfterCancel).toBe(RequestState.Idle); - expect(cancelledResponse.statusCode).toBeUndefined(); - expect(laterResponse.statusCode).toBe(200); + expect(cancelledResponse.statusBar.code).toBeUndefined(); + expect(laterResponse.statusBar.code).toBe(200); }); diff --git a/packages/insomnia-test/tests/http-request/chained-response-tag.spec.ts b/packages/insomnia-test/tests/http-request/chained-response-tag.spec.ts index c114aa83a9..4c567054f6 100644 --- a/packages/insomnia-test/tests/http-request/chained-response-tag.spec.ts +++ b/packages/insomnia-test/tests/http-request/chained-response-tag.spec.ts @@ -51,6 +51,6 @@ test("Verify A Response Tag Chain Resolves Through Multiple Requests", async ({ const responseView = await httpRequestFlow.send(third); - expect(responseView.statusCode).toBe(200); - expect(responseView.body).toMatchObject({ data: "first and second and third" }); + expect(responseView.statusBar.code).toBe(200); + expect(responseView.preview).toMatchObject({ data: "first and second and third" }); }); diff --git a/packages/insomnia-test/tests/http-request/custom-ca-root-certificate.spec.ts b/packages/insomnia-test/tests/http-request/custom-ca-root-certificate.spec.ts index a2fbf13ee4..113ac7c9a7 100644 --- a/packages/insomnia-test/tests/http-request/custom-ca-root-certificate.spec.ts +++ b/packages/insomnia-test/tests/http-request/custom-ca-root-certificate.spec.ts @@ -30,9 +30,9 @@ test("Verify Custom CA Root Certificate Establishes Trust For HTTPS Request", as url, }); const responseBeforeCa = await httpRequestFlow.send(requestBeforeCa); - expect(responseBeforeCa.statusCode).toBeUndefined(); + expect(responseBeforeCa.statusBar.code).toBeUndefined(); await expect - .poll(() => responseBeforeCa.console?.(), { timeout: DEFAULT_TIMEOUT }) + .poll(() => responseBeforeCa.console(), { timeout: DEFAULT_TIMEOUT }) .toMatch(/unable to get local issuer certificate/i); await certificatesFlow.setCaCertificate( @@ -46,8 +46,8 @@ test("Verify Custom CA Root Certificate Establishes Trust For HTTPS Request", as url, }); const responseAfterCa = await httpRequestFlow.send(requestAfterCa); - expect(responseAfterCa.statusCode).toBe(200); - expect(responseAfterCa.body).toMatchObject({ + expect(responseAfterCa.statusBar.code).toBe(200); + expect(responseAfterCa.preview).toMatchObject({ headers: expect.objectContaining({ host: "localhost:4062" }), }); }); diff --git a/packages/insomnia-test/tests/http-request/folder-level-replace-in-utility.spec.ts b/packages/insomnia-test/tests/http-request/folder-level-replace-in-utility.spec.ts index cc024ea2df..8b2e325e9f 100644 --- a/packages/insomnia-test/tests/http-request/folder-level-replace-in-utility.spec.ts +++ b/packages/insomnia-test/tests/http-request/folder-level-replace-in-utility.spec.ts @@ -45,9 +45,9 @@ test("Verify a folder-level script wrapping insomnia.variables.replaceIn resolve const responseView = await httpRequestFlow.send(request); await expect - .poll(() => responseView.console?.(), { timeout: DEFAULT_TIMEOUT }) + .poll(() => responseView.console(), { timeout: DEFAULT_TIMEOUT }) .toMatch(/log: string \S+/); - const consoleText = await responseView.console?.(); + const consoleText = await responseView.console(); expect(consoleText).not.toContain("Promise"); expect(consoleText).not.toContain("undefined"); }); diff --git a/packages/insomnia-test/tests/http-request/import-params-from-url-http.spec.ts b/packages/insomnia-test/tests/http-request/import-params-from-url-http.spec.ts index af3f759142..9ead34bd80 100644 --- a/packages/insomnia-test/tests/http-request/import-params-from-url-http.spec.ts +++ b/packages/insomnia-test/tests/http-request/import-params-from-url-http.spec.ts @@ -43,9 +43,9 @@ test("Verify Import from URL Moves Query String Into Params and Preserves It on expect.objectContaining({ name: paramName2, value: paramValue2 }), ]), ); - expect(responseView.statusCode).toBe(200); + expect(responseView.statusBar.code).toBe(200); await expect - .poll(() => responseView.console?.(), { timeout: DEFAULT_TIMEOUT }) + .poll(() => responseView.console(), { timeout: DEFAULT_TIMEOUT }) .toContain( `Preparing request to ${baseUrl}?${paramName1}=${paramValue1}&${paramName2}=${paramValue2}`, ); diff --git a/packages/insomnia-test/tests/http-request/ipv6-local-address.spec.ts b/packages/insomnia-test/tests/http-request/ipv6-local-address.spec.ts index c70e0d5a28..acc5a52df8 100644 --- a/packages/insomnia-test/tests/http-request/ipv6-local-address.spec.ts +++ b/packages/insomnia-test/tests/http-request/ipv6-local-address.spec.ts @@ -32,7 +32,7 @@ test("Verify HTTP request succeeds against a local IPv6 address", async ({ }); const responseView = await httpRequestFlow.send(request!); - expect(responseView.statusCode).toBe(200); - expect(responseView.statusMessage).toBe("OK"); - expect(responseView.body).toMatchObject({ data: bodyText }); + expect(responseView.statusBar.code).toBe(200); + expect(responseView.statusBar.message).toBe("OK"); + expect(responseView.preview).toMatchObject({ data: bodyText }); }); diff --git a/packages/insomnia-test/tests/http-request/liquid-template-isolation.spec.ts b/packages/insomnia-test/tests/http-request/liquid-template-isolation.spec.ts index 065db97a88..5acf7c602c 100644 --- a/packages/insomnia-test/tests/http-request/liquid-template-isolation.spec.ts +++ b/packages/insomnia-test/tests/http-request/liquid-template-isolation.spec.ts @@ -49,8 +49,8 @@ test("Verify LiquidJS control flow tags render correctly", async ({ user }) => { } satisfies HttpRequest); const responseView = await httpRequestFlow.send(request); - expect(responseView.statusCode).toBe(200); - expect(responseView.body).toMatchObject({ + expect(responseView.statusBar.code).toBe(200); + expect(responseView.preview).toMatchObject({ data: `${envValue}-big-123-yes`, }); }); diff --git a/packages/insomnia-test/tests/http-request/mtls-client-certificate.spec.ts b/packages/insomnia-test/tests/http-request/mtls-client-certificate.spec.ts index c5eb429ec6..195b21bca7 100644 --- a/packages/insomnia-test/tests/http-request/mtls-client-certificate.spec.ts +++ b/packages/insomnia-test/tests/http-request/mtls-client-certificate.spec.ts @@ -37,9 +37,9 @@ test("Verify Client Certificate Toggle Controls mTLS Enforcement For HTTP Reques url, }); const responseBeforeCert = await httpRequestFlow.send(requestBeforeCert); - expect(responseBeforeCert.statusCode).toBeUndefined(); + expect(responseBeforeCert.statusBar.code).toBeUndefined(); await expect - .poll(() => responseBeforeCert.console?.(), { timeout: DEFAULT_TIMEOUT }) + .poll(() => responseBeforeCert.console(), { timeout: DEFAULT_TIMEOUT }) .toMatch(/certificate required/i); await certificatesFlow.addClientCertificate(collection, { @@ -54,8 +54,8 @@ test("Verify Client Certificate Toggle Controls mTLS Enforcement For HTTP Reques url, }); const responseWithCert = await httpRequestFlow.send(requestWithCert); - expect(responseWithCert.statusCode).toBe(200); - expect(responseWithCert.body).toMatchObject({ + expect(responseWithCert.statusBar.code).toBe(200); + expect(responseWithCert.preview).toMatchObject({ headers: expect.objectContaining({ host: "localhost:4063" }), }); @@ -71,8 +71,8 @@ test("Verify Client Certificate Toggle Controls mTLS Enforcement For HTTP Reques url, }); const responseAfterDisable = await httpRequestFlow.send(requestAfterDisable); - expect(responseAfterDisable.statusCode).toBeUndefined(); + expect(responseAfterDisable.statusBar.code).toBeUndefined(); await expect - .poll(() => responseAfterDisable.console?.(), { timeout: DEFAULT_TIMEOUT }) + .poll(() => responseAfterDisable.console(), { timeout: DEFAULT_TIMEOUT }) .toMatch(/certificate required/i); }); diff --git a/packages/insomnia-test/tests/http-request/oauth1-authentication.spec.ts b/packages/insomnia-test/tests/http-request/oauth1-authentication.spec.ts index 656de48d18..5fa5eb908e 100644 --- a/packages/insomnia-test/tests/http-request/oauth1-authentication.spec.ts +++ b/packages/insomnia-test/tests/http-request/oauth1-authentication.spec.ts @@ -40,10 +40,10 @@ test("Verify OAuth 1.0 auth fields persist and sign the sent request", async ({ }); const responseView = await httpRequestFlow.send(request); - const authHeader = (responseView.body as { headers: Record }) + const authHeader = (responseView.preview as { headers: Record }) .headers.authorization; - expect(responseView.statusCode).toBe(200); + expect(responseView.statusBar.code).toBe(200); expect(authHeader).toContain("OAuth "); expect(authHeader).toContain( `oauth_consumer_key="${authentication.consumerKey}"`, diff --git a/packages/insomnia-test/tests/http-request/oauth2-authorization-code-pkce.spec.ts b/packages/insomnia-test/tests/http-request/oauth2-authorization-code-pkce.spec.ts index 087cb9ddbc..e6e220dcf3 100644 --- a/packages/insomnia-test/tests/http-request/oauth2-authorization-code-pkce.spec.ts +++ b/packages/insomnia-test/tests/http-request/oauth2-authorization-code-pkce.spec.ts @@ -49,14 +49,14 @@ for (const pkceMethod of ["S256", "plain"] as const) { ).json(); const responseView = await httpRequestFlow.send(request); - const body = responseView.body as { authorization?: string }; + const body = responseView.preview as { authorization?: string }; expect(tokens.accessToken).not.toBe(""); expect(lastTokenRequest.grantType).toBe("authorization_code"); expect(lastTokenRequest.pkceUsed).toBe(true); expect(lastTokenRequest.pkceMethod).toBe(pkceMethod); expect(lastTokenRequest.pkceVerified).toBe(true); - expect(responseView.statusCode).toBe(200); + expect(responseView.statusBar.code).toBe(200); expect(body.authorization).toBe(`Bearer ${tokens.accessToken}`); }); } diff --git a/packages/insomnia-test/tests/http-request/oauth2-authorization-code.spec.ts b/packages/insomnia-test/tests/http-request/oauth2-authorization-code.spec.ts index 8542357895..3488f654a9 100644 --- a/packages/insomnia-test/tests/http-request/oauth2-authorization-code.spec.ts +++ b/packages/insomnia-test/tests/http-request/oauth2-authorization-code.spec.ts @@ -46,13 +46,13 @@ test("Verify Authorization Code grant fetches tokens via a popup and authorizes ).json(); const responseView = await httpRequestFlow.send(request); - const body = responseView.body as { authorization?: string }; + const body = responseView.preview as { authorization?: string }; expect(tokens.accessToken).not.toBe(""); expect(tokens.refreshToken).not.toBe(""); expect(tokens.identityToken).not.toBe(""); expect(lastTokenRequest.grantType).toBe("authorization_code"); expect(lastTokenRequest.pkceUsed).toBe(false); - expect(responseView.statusCode).toBe(200); + expect(responseView.statusBar.code).toBe(200); expect(body.authorization).toBe(`Bearer ${tokens.accessToken}`); }); diff --git a/packages/insomnia-test/tests/http-request/oauth2-client-credentials.spec.ts b/packages/insomnia-test/tests/http-request/oauth2-client-credentials.spec.ts index 0dfd3b0555..f77416d127 100644 --- a/packages/insomnia-test/tests/http-request/oauth2-client-credentials.spec.ts +++ b/packages/insomnia-test/tests/http-request/oauth2-client-credentials.spec.ts @@ -47,11 +47,11 @@ test("Verify Client Credentials grant fetches tokens with no popup and authorize ).json(); const responseView = await httpRequestFlow.send(request); - const body = responseView.body as { authorization?: string }; + const body = responseView.preview as { authorization?: string }; expect(tokens.accessToken).not.toBe(""); expect(windowsAfterFetch).toBe(windowsBeforeFetch); expect(lastTokenRequest.grantType).toBe("client_credentials"); - expect(responseView.statusCode).toBe(200); + expect(responseView.statusBar.code).toBe(200); expect(body.authorization).toBe(`Bearer ${tokens.accessToken}`); }); diff --git a/packages/insomnia-test/tests/http-request/oauth2-folder-inherited-auth.spec.ts b/packages/insomnia-test/tests/http-request/oauth2-folder-inherited-auth.spec.ts index c7d41dea1b..9918303d1e 100644 --- a/packages/insomnia-test/tests/http-request/oauth2-folder-inherited-auth.spec.ts +++ b/packages/insomnia-test/tests/http-request/oauth2-folder-inherited-auth.spec.ts @@ -45,9 +45,9 @@ test("Verify a request set to Inherit from parent picks up its folder's OAuth 2. await httpRequestPage.auth.setAuthType(AuthType.Inherit); const responseView = await httpRequestFlow.send(request); - const body = responseView.body as { authorization?: string }; + const body = responseView.preview as { authorization?: string }; expect(folderTokens.accessToken).not.toBe(""); - expect(responseView.statusCode).toBe(200); + expect(responseView.statusBar.code).toBe(200); expect(body.authorization).toBe(`Bearer ${folderTokens.accessToken}`); }); diff --git a/packages/insomnia-test/tests/http-request/oauth2-implicit.spec.ts b/packages/insomnia-test/tests/http-request/oauth2-implicit.spec.ts index 8de3fac64e..afb7dd8df4 100644 --- a/packages/insomnia-test/tests/http-request/oauth2-implicit.spec.ts +++ b/packages/insomnia-test/tests/http-request/oauth2-implicit.spec.ts @@ -76,10 +76,10 @@ test("Verify Implicit grant with response type ID and Access Token authorizes th const tokens = await httpRequestFlow.fetchOAuth2Tokens(request); const responseView = await httpRequestFlow.send(request); - const body = responseView.body as { authorization?: string }; + const body = responseView.preview as { authorization?: string }; expect(tokens.identityToken).not.toBe(""); expect(tokens.accessToken).not.toBe(""); - expect(responseView.statusCode).toBe(200); + expect(responseView.statusBar.code).toBe(200); expect(body.authorization).toBe(`Bearer ${tokens.accessToken}`); }); diff --git a/packages/insomnia-test/tests/http-request/oauth2-password.spec.ts b/packages/insomnia-test/tests/http-request/oauth2-password.spec.ts index cd1d8021d6..795041297b 100644 --- a/packages/insomnia-test/tests/http-request/oauth2-password.spec.ts +++ b/packages/insomnia-test/tests/http-request/oauth2-password.spec.ts @@ -49,12 +49,12 @@ test("Verify Resource Owner Password Credentials grant fetches tokens with no po ).json(); const responseView = await httpRequestFlow.send(request); - const body = responseView.body as { authorization?: string }; + const body = responseView.preview as { authorization?: string }; expect(tokens.accessToken).not.toBe(""); expect(tokens.refreshToken).not.toBe(""); expect(windowsAfterFetch).toBe(windowsBeforeFetch); expect(lastTokenRequest.grantType).toBe("password"); - expect(responseView.statusCode).toBe(200); + expect(responseView.statusBar.code).toBe(200); expect(body.authorization).toBe(`Bearer ${tokens.accessToken}`); }); diff --git a/packages/insomnia-test/tests/http-request/pre-request-script-async-completion.spec.ts b/packages/insomnia-test/tests/http-request/pre-request-script-async-completion.spec.ts index 4412756d7d..f441f44d36 100644 --- a/packages/insomnia-test/tests/http-request/pre-request-script-async-completion.spec.ts +++ b/packages/insomnia-test/tests/http-request/pre-request-script-async-completion.spec.ts @@ -77,8 +77,8 @@ test("Verify pending async work in a pre-request script (Promise, setTimeout, se }); const responseView = await httpRequestFlow.send(request); - expect(responseView.statusCode).toBe(200); - expect(responseView.body).toMatchObject({ + expect(responseView.statusBar.code).toBe(200); + expect(responseView.preview).toMatchObject({ json: { asyncDoneViaPromise: true, asyncDoneViaTimeout: true, diff --git a/packages/insomnia-test/tests/http-request/pre-request-script-client-certificate-update.spec.ts b/packages/insomnia-test/tests/http-request/pre-request-script-client-certificate-update.spec.ts index 029ee3c3da..50aab07af4 100644 --- a/packages/insomnia-test/tests/http-request/pre-request-script-client-certificate-update.spec.ts +++ b/packages/insomnia-test/tests/http-request/pre-request-script-client-certificate-update.spec.ts @@ -54,14 +54,14 @@ test("Verify pre-request script reads and replaces the client certificate via in }); const responseView = await httpRequestFlow.send(request); - expect(responseView.statusCode).toBe(200); + expect(responseView.statusBar.code).toBe(200); await expect - .poll(() => responseView.console?.(), { timeout: DEFAULT_TIMEOUT }) + .poll(() => responseView.console(), { timeout: DEFAULT_TIMEOUT }) .toContain("Adding SSL PEM certificate"); await expect - .poll(() => responseView.console?.(), { timeout: DEFAULT_TIMEOUT }) + .poll(() => responseView.console(), { timeout: DEFAULT_TIMEOUT }) .toContain("Adding SSL KEY certificate"); await expect - .poll(() => responseView.console?.(), { timeout: DEFAULT_TIMEOUT }) + .poll(() => responseView.console(), { timeout: DEFAULT_TIMEOUT }) .toContain("original cert:"); }); diff --git a/packages/insomnia-test/tests/http-request/pre-request-script-cookies.spec.ts b/packages/insomnia-test/tests/http-request/pre-request-script-cookies.spec.ts index 21ca5962ba..1ee7d51300 100644 --- a/packages/insomnia-test/tests/http-request/pre-request-script-cookies.spec.ts +++ b/packages/insomnia-test/tests/http-request/pre-request-script-cookies.spec.ts @@ -35,8 +35,8 @@ test('Verify pre-request script manages cookies via insomnia.cookies.jar() and t }); const responseView = await httpRequestFlow.send(request); - expect(responseView.statusCode).toBe(200); - expect(responseView.body).toEqual({ + expect(responseView.statusBar.code).toBe(200); + expect(responseView.preview).toEqual({ cookies: { [keptName]: keptValue, [objectName]: objectValue }, }); }); diff --git a/packages/insomnia-test/tests/http-request/pre-request-script-custom-error.spec.ts b/packages/insomnia-test/tests/http-request/pre-request-script-custom-error.spec.ts index c52326cc35..8ff1d76aa2 100644 --- a/packages/insomnia-test/tests/http-request/pre-request-script-custom-error.spec.ts +++ b/packages/insomnia-test/tests/http-request/pre-request-script-custom-error.spec.ts @@ -32,7 +32,7 @@ test("Verify a thrown error in pre-request script surfaces in the response conso const responseView = await httpRequestFlow.send(request); await expect - .poll(() => responseView.console?.(), { timeout: DEFAULT_TIMEOUT }) + .poll(() => responseView.console(), { timeout: DEFAULT_TIMEOUT }) .toContain(errorMessage); }); @@ -58,6 +58,6 @@ test("Verify accessing an invalid field in pre-request script surfaces in the re const responseView = await httpRequestFlow.send(request); await expect - .poll(() => responseView.console?.(), { timeout: DEFAULT_TIMEOUT }) + .poll(() => responseView.console(), { timeout: DEFAULT_TIMEOUT }) .toContain("Cannot read properties of undefined (reading 'set')"); }); diff --git a/packages/insomnia-test/tests/http-request/pre-request-script-environment-variables.spec.ts b/packages/insomnia-test/tests/http-request/pre-request-script-environment-variables.spec.ts index 86ac2aca7e..877eebfda3 100644 --- a/packages/insomnia-test/tests/http-request/pre-request-script-environment-variables.spec.ts +++ b/packages/insomnia-test/tests/http-request/pre-request-script-environment-variables.spec.ts @@ -61,8 +61,8 @@ test("Verify pre-request script overrides base environment values through the en }); const responseView = await httpRequestFlow.send(request); - expect(responseView.statusCode).toBe(200); - expect(responseView.body).toMatchObject({ + expect(responseView.statusBar.code).toBe(200); + expect(responseView.preview).toMatchObject({ json: { fallbackToBase: fallbackValue, scriptValue: envScriptValue, diff --git a/packages/insomnia-test/tests/http-request/pre-request-script-eval-and-modules.spec.ts b/packages/insomnia-test/tests/http-request/pre-request-script-eval-and-modules.spec.ts index 1f017e857c..7421692452 100644 --- a/packages/insomnia-test/tests/http-request/pre-request-script-eval-and-modules.spec.ts +++ b/packages/insomnia-test/tests/http-request/pre-request-script-eval-and-modules.spec.ts @@ -100,8 +100,8 @@ test("Verify pre-request script can eval() and require Node built-in modules, ex }); const responseView = await httpRequestFlow.send(request); - expect(responseView.statusCode).toBe(200); - expect(responseView.body).toMatchObject({ + expect(responseView.statusBar.code).toBe(200); + expect(responseView.preview).toMatchObject({ json: { evalResult: 16, hash: parsedUrl.hash, diff --git a/packages/insomnia-test/tests/http-request/pre-request-script-proxy-update.spec.ts b/packages/insomnia-test/tests/http-request/pre-request-script-proxy-update.spec.ts index a4c3183321..ef593d20c2 100644 --- a/packages/insomnia-test/tests/http-request/pre-request-script-proxy-update.spec.ts +++ b/packages/insomnia-test/tests/http-request/pre-request-script-proxy-update.spec.ts @@ -49,11 +49,11 @@ test("Verify pre-request script reads the configured proxy and overrides it via }); const responseView = await httpRequestFlow.send(request); - expect(responseView.statusCode).toBeUndefined(); + expect(responseView.statusBar.code).toBeUndefined(); await expect - .poll(() => responseView.console?.(), { timeout: DEFAULT_TIMEOUT }) + .poll(() => responseView.console(), { timeout: DEFAULT_TIMEOUT }) .toContain("localhost:1111"); await expect - .poll(() => responseView.console?.(), { timeout: DEFAULT_TIMEOUT }) + .poll(() => responseView.console(), { timeout: DEFAULT_TIMEOUT }) .toContain("Trying 127.0.0.1:8888"); }); diff --git a/packages/insomnia-test/tests/http-request/pre-request-script-request-manipulation.spec.ts b/packages/insomnia-test/tests/http-request/pre-request-script-request-manipulation.spec.ts index 702708b600..9d51c749ba 100644 --- a/packages/insomnia-test/tests/http-request/pre-request-script-request-manipulation.spec.ts +++ b/packages/insomnia-test/tests/http-request/pre-request-script-request-manipulation.spec.ts @@ -41,8 +41,8 @@ test('Verify pre-request script manipulates request headers, query params and bo }); const responseView = await httpRequestFlow.send(request); - expect(responseView.statusCode).toBe(200); - expect(responseView.body).toMatchObject({ + expect(responseView.statusBar.code).toBe(200); + expect(responseView.preview).toMatchObject({ data: rawContent, args: { added: addedParam, keepMe: updatedParam }, headers: expect.objectContaining({ @@ -50,8 +50,8 @@ test('Verify pre-request script manipulates request headers, query params and bo 'x-upsert': upsertedValue, }), }); - expect((responseView.body as { args: Record; headers: object }).args).not.toHaveProperty('removeMe'); - expect((responseView.body as { args: Record; headers: object }).headers).not.toHaveProperty('x-remove'); + expect((responseView.preview as { args: Record; headers: object }).args).not.toHaveProperty('removeMe'); + expect((responseView.preview as { args: Record; headers: object }).headers).not.toHaveProperty('x-remove'); }); test('Verify pre-request script sets bearer auth via insomnia.request.auth', async ({ user }) => { @@ -78,8 +78,8 @@ test('Verify pre-request script sets bearer auth via insomnia.request.auth', asy }); const responseView = await httpRequestFlow.send(request); - expect(responseView.statusCode).toBe(200); - expect(responseView.body).toMatchObject({ + expect(responseView.statusBar.code).toBe(200); + expect(responseView.preview).toMatchObject({ headers: expect.objectContaining({ authorization: `${prefix} ${token}`, }), @@ -111,8 +111,8 @@ test('Verify pre-request script sets basic auth via insomnia.request.auth', asyn const responseView = await httpRequestFlow.send(request); const expectedEncodedCredentials = Buffer.from(`${username}:${password}`, 'utf8').toString('base64'); - expect(responseView.statusCode).toBe(200); - expect(responseView.body).toMatchObject({ + expect(responseView.statusBar.code).toBe(200); + expect(responseView.preview).toMatchObject({ headers: expect.objectContaining({ authorization: `Basic ${expectedEncodedCredentials}`, }), @@ -156,11 +156,11 @@ test('Verify pre-request script applies apikey, AWS v4, Hawk and OAuth 1.0 auth responses[authName] = await httpRequestFlow.send(request); } - const headersOf = (name: string) => (responses[name].body as { headers: Record }).headers; + const headersOf = (name: string) => (responses[name].preview as { headers: Record }).headers; expect(headersOf('apiKeyHeader')).toMatchObject({ [apiKeyName.toLowerCase()]: apiKeyValue, }); - expect(responses.apiKeyQuery.body).toMatchObject({ + expect(responses.apiKeyQuery.preview).toMatchObject({ args: { [apiKeyName]: apiKeyValue }, }); expect(headersOf('awsV4').authorization).toContain(`AWS4-HMAC-SHA256 Credential=${accessKey}/`); diff --git a/packages/insomnia-test/tests/http-request/pre-request-script-send-request-body-modes.spec.ts b/packages/insomnia-test/tests/http-request/pre-request-script-send-request-body-modes.spec.ts index b403d899f3..8a258d7e53 100644 --- a/packages/insomnia-test/tests/http-request/pre-request-script-send-request-body-modes.spec.ts +++ b/packages/insomnia-test/tests/http-request/pre-request-script-send-request-body-modes.spec.ts @@ -50,14 +50,14 @@ test("Verify pre-request script's sendRequest serializes raw, urlencoded, graphq const responseView = await httpRequestFlow.send(request); const results = ( - responseView.body as { json: { results: Record } } + responseView.preview as { json: { results: Record } } ).json.results; const raw = JSON.parse(results.raw); const urlencoded = JSON.parse(results.urlencoded); const graphql = JSON.parse(results.graphql); const formdata = JSON.parse(results.formdata); - expect(responseView.statusCode).toBe(200); + expect(responseView.statusBar.code).toBe(200); expect(raw.data).toBe(rawValue); expect(urlencoded.data).toBe("a=1&b=2"); expect(graphql.json).toMatchObject({ diff --git a/packages/insomnia-test/tests/http-request/query-method.spec.ts b/packages/insomnia-test/tests/http-request/query-method.spec.ts index 4584976f49..9e258f2ca9 100644 --- a/packages/insomnia-test/tests/http-request/query-method.spec.ts +++ b/packages/insomnia-test/tests/http-request/query-method.spec.ts @@ -37,6 +37,6 @@ test("Verify sending a QUERY request with a body", async ({ user }) => { method: HttpMethod.Query, body: { mimeType: ContentType.JSON, text: body }, } satisfies HttpRequest); - expect(responseView.statusCode).toBe(200); - expect(responseView.body).toMatchObject({ data: body }); + expect(responseView.statusBar.code).toBe(200); + expect(responseView.preview).toMatchObject({ data: body }); }); diff --git a/packages/insomnia-test/tests/http-request/query-params-transformed-correctly.spec.ts b/packages/insomnia-test/tests/http-request/query-params-transformed-correctly.spec.ts index d8214aa06e..29fc1dfc9a 100644 --- a/packages/insomnia-test/tests/http-request/query-params-transformed-correctly.spec.ts +++ b/packages/insomnia-test/tests/http-request/query-params-transformed-correctly.spec.ts @@ -66,8 +66,8 @@ test("Verify query params from the URL, template tags, and the Parameters tab ar ]); const responseView = await httpRequestFlow.send(request); - expect(responseView.statusCode).toBe(200); - expect(responseView.body).toMatchObject({ + expect(responseView.statusBar.code).toBe(200); + expect(responseView.preview).toMatchObject({ args: { key: ["fromUrl", fromUrlValue, fromEditorValue, "/"], space: spaceValue, diff --git a/packages/insomnia-test/tests/http-request/replace-in-synchronous-behavior.spec.ts b/packages/insomnia-test/tests/http-request/replace-in-synchronous-behavior.spec.ts index d1bec6f7a2..874e0d5ebc 100644 --- a/packages/insomnia-test/tests/http-request/replace-in-synchronous-behavior.spec.ts +++ b/packages/insomnia-test/tests/http-request/replace-in-synchronous-behavior.spec.ts @@ -37,9 +37,9 @@ test("Verify insomnia.environment.replaceIn resolves and returns a string synchr const responseView = await httpRequestFlow.send(request); await expect - .poll(() => responseView.console?.(), { timeout: DEFAULT_TIMEOUT }) + .poll(() => responseView.console(), { timeout: DEFAULT_TIMEOUT }) .toContain(`log: string ${variableValue}`); - const consoleText = await responseView.console?.(); + const consoleText = await responseView.console(); expect(consoleText).not.toContain("Promise"); }); @@ -71,6 +71,6 @@ test("Verify a script that awaits insomnia.environment.replaceIn as a workaround const responseView = await httpRequestFlow.send(request); await expect - .poll(() => responseView.console?.(), { timeout: DEFAULT_TIMEOUT }) + .poll(() => responseView.console(), { timeout: DEFAULT_TIMEOUT }) .toContain(`log: string ${variableValue}`); }); diff --git a/packages/insomnia-test/tests/template-tag/external-vault-credentials.spec.ts b/packages/insomnia-test/tests/template-tag/external-vault-credentials.spec.ts index 2a1860fb90..d3af79efed 100644 --- a/packages/insomnia-test/tests/template-tag/external-vault-credentials.spec.ts +++ b/packages/insomnia-test/tests/template-tag/external-vault-credentials.spec.ts @@ -95,12 +95,12 @@ test("Verify AWS/GCP/HashiCorp Cloud Credentials Resolve via the Vault Template expect(awsResult.preview).toBe("aws-secret-value"); expect(gcpResult.preview).toBe("gcp-secret-value"); expect(hashicorpResult.preview).toBe("hashicorp-secret-value"); - expect((responseView.body as { data: string }).data).toContain("aws-secret-value"); - expect((responseView.body as { data: string }).data).toContain("gcp-secret-value"); - expect((responseView.body as { data: string }).data).toContain( + expect((responseView.preview as { data: string }).data).toContain("aws-secret-value"); + expect((responseView.preview as { data: string }).data).toContain("gcp-secret-value"); + expect((responseView.preview as { data: string }).data).toContain( "hashicorp-secret-value", ); - expect((secondResponse.body as { data: string }).data).toContain( + expect((secondResponse.preview as { data: string }).data).toContain( "aws-secret-value", ); }); diff --git a/packages/insomnia-test/tests/template-tag/header-name-template-tag-resolves.spec.ts b/packages/insomnia-test/tests/template-tag/header-name-template-tag-resolves.spec.ts index 75fa323786..a8272678ac 100644 --- a/packages/insomnia-test/tests/template-tag/header-name-template-tag-resolves.spec.ts +++ b/packages/insomnia-test/tests/template-tag/header-name-template-tag-resolves.spec.ts @@ -33,8 +33,8 @@ test("Verify a Header With a Templated Name Resolves and Sends Correctly", async }); const responseView = await httpRequestFlow.send(request!); - expect(responseView.statusCode).toBe(200); - expect(responseView.body).toMatchObject({ + expect(responseView.statusBar.code).toBe(200); + expect(responseView.preview).toMatchObject({ headers: expect.objectContaining({ "x-7cd8e9f98e9104085ea06e39b87faf36": "plain-value", }), diff --git a/packages/insomnia-test/tests/template-tag/header-templates.spec.ts b/packages/insomnia-test/tests/template-tag/header-templates.spec.ts index 93b0b2b553..1fb5f2a729 100644 --- a/packages/insomnia-test/tests/template-tag/header-templates.spec.ts +++ b/packages/insomnia-test/tests/template-tag/header-templates.spec.ts @@ -33,7 +33,7 @@ test("Verify a Header With a Template Tag in Its Value", async ({ user }) => { }); const responseView = await httpRequestFlow.send(request!); - expect(responseView.body).toMatchObject({ + expect(responseView.preview).toMatchObject({ headers: expect.objectContaining({ "x-header-name": "aGVhZGVyLXZhbHVl", }), diff --git a/packages/insomnia-test/tests/template-tag/prompt-tag-caches-value-until-cleared.spec.ts b/packages/insomnia-test/tests/template-tag/prompt-tag-caches-value-until-cleared.spec.ts index b845c5215a..3cee4b4720 100644 --- a/packages/insomnia-test/tests/template-tag/prompt-tag-caches-value-until-cleared.spec.ts +++ b/packages/insomnia-test/tests/template-tag/prompt-tag-caches-value-until-cleared.spec.ts @@ -49,10 +49,10 @@ test("Verify a prompt Tag Caches its Value Under the Storage Key Until it is Cle expect(previewBeforeSend.functionName).toBe("prompt"); expect(first.promptInputType).toBe("password"); - expect(first.response.statusCode).toBe(200); - expect(first.response.body).toMatchObject({ data: firstValue }); - expect(cached.statusCode).toBe(200); - expect(cached.body).toMatchObject({ data: firstValue }); - expect(second.response.statusCode).toBe(200); - expect(second.response.body).toMatchObject({ data: secondValue }); + expect(first.response.statusBar.code).toBe(200); + expect(first.response.preview).toMatchObject({ data: firstValue }); + expect(cached.statusBar.code).toBe(200); + expect(cached.preview).toMatchObject({ data: firstValue }); + expect(second.response.statusBar.code).toBe(200); + expect(second.response.preview).toMatchObject({ data: secondValue }); }); diff --git a/packages/insomnia-test/tests/template-tag/response-tag-trigger-behaviors.spec.ts b/packages/insomnia-test/tests/template-tag/response-tag-trigger-behaviors.spec.ts index d37cb504ac..b8a4f41698 100644 --- a/packages/insomnia-test/tests/template-tag/response-tag-trigger-behaviors.spec.ts +++ b/packages/insomnia-test/tests/template-tag/response-tag-trigger-behaviors.spec.ts @@ -54,10 +54,10 @@ test("Verify the response Tag's Trigger Behavior Controls When its Dependency Re const always = await httpRequestFlow.send(alwaysRequest); await expect(neverFailure).rejects.toThrow(/No responses for request/); - expect(noHistory.statusCode).toBe(200); - expect(noHistory.body).toMatchObject({ data: marker }); - expect(whenExpired.statusCode).toBe(200); - expect(whenExpired.body).toMatchObject({ data: marker }); - expect(always.statusCode).toBe(200); - expect(always.body).toMatchObject({ data: marker }); + expect(noHistory.statusBar.code).toBe(200); + expect(noHistory.preview).toMatchObject({ data: marker }); + expect(whenExpired.statusBar.code).toBe(200); + expect(whenExpired.preview).toMatchObject({ data: marker }); + expect(always.statusBar.code).toBe(200); + expect(always.preview).toMatchObject({ data: marker }); });