From cbdbee807ddc202901fd61f1af4ca2988d2268b5 Mon Sep 17 00:00:00 2001 From: Florent Date: Thu, 11 Aug 2022 17:24:23 +0200 Subject: Tests: Add response error along with unexpected status in report --- shared/server-commands/requests/requests.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/shared/server-commands/requests/requests.ts b/shared/server-commands/requests/requests.ts index a08a6e0b9..85cbc9be9 100644 --- a/shared/server-commands/requests/requests.ts +++ b/shared/server-commands/requests/requests.ts @@ -172,7 +172,6 @@ function buildRequest (req: request.Test, options: CommonRequestParams) { if (options.accept) req.set('Accept', options.accept) if (options.host) req.set('Host', options.host) if (options.redirects) req.redirects(options.redirects) - if (options.expectedStatus) req.expect(options.expectedStatus) if (options.xForwardedFor) req.set('X-Forwarded-For', options.xForwardedFor) if (options.type) req.type(options.type) @@ -180,7 +179,15 @@ function buildRequest (req: request.Test, options: CommonRequestParams) { req.set(name, options.headers[name]) }) - return req + return req.expect((res) => { + if (options.expectedStatus && res.status !== options.expectedStatus) { + throw new Error(`Expected status ${options.expectedStatus}, got ${res.status}. ` + + `\nThe server responded this error: "${res.body?.error ?? res.text}".\n` + + 'You may take a closer look at the logs. To see how to do so, check out this page: ' + + 'https://github.com/Chocobozzz/PeerTube/blob/develop/support/doc/development/tests.md#debug-server-logs') + } + return res + }) } function buildFields (req: request.Test, fields: { [ fieldName: string ]: any }, namespace?: string) { -- cgit v1.2.3