From 20f29fe3726a4ddd104f557456dbd5275685e879 Mon Sep 17 00:00:00 2001 From: Ricardo Barbosa <3788982+nextlevelbeard@users.noreply.github.com> Date: Wed, 6 Apr 2022 16:16:42 +0200 Subject: [PATCH] Backport #1543: Initialize globalResponse in case of ignored HTTPError (#2017) --- source/as-promise/index.ts | 4 ++-- test/promise.ts | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/source/as-promise/index.ts b/source/as-promise/index.ts index efd94703c..4d8d5e041 100644 --- a/source/as-promise/index.ts +++ b/source/as-promise/index.ts @@ -124,13 +124,13 @@ export default function asPromise(normalizedOptions: NormalizedOptions): Canc return; } + globalResponse = response; + if (!isResponseOk(response)) { request._beforeError(new HTTPError(response)); return; } - globalResponse = response; - resolve(request.options.resolveBodyOnly ? response.body as T : response as unknown as T); }); diff --git a/test/promise.ts b/test/promise.ts index 70dcb937e..3e01601c6 100644 --- a/test/promise.ts +++ b/test/promise.ts @@ -85,3 +85,13 @@ test('promise.json() can be called before a file stream body is open', withServe await Promise.all(checks); }); + +test('promise.json() does not fail when server returns an error and throwHttpErrors is disabled', withServer, async (t, server, got) => { + server.get('/', (_request, response) => { + response.statusCode = 400; + response.end('{}'); + }); + + const promise = got('', {throwHttpErrors: false}); + await t.notThrowsAsync(promise.json()); +});