diff options
Diffstat (limited to 'shared/server-commands/requests')
-rw-r--r-- | shared/server-commands/requests/requests.ts | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/shared/server-commands/requests/requests.ts b/shared/server-commands/requests/requests.ts index 8cc1245e0..b247017fd 100644 --- a/shared/server-commands/requests/requests.ts +++ b/shared/server-commands/requests/requests.ts | |||
@@ -3,7 +3,7 @@ | |||
3 | import { decode } from 'querystring' | 3 | import { decode } from 'querystring' |
4 | import request from 'supertest' | 4 | import request from 'supertest' |
5 | import { URL } from 'url' | 5 | import { URL } from 'url' |
6 | import { buildAbsoluteFixturePath } from '@shared/core-utils' | 6 | import { buildAbsoluteFixturePath, pick } from '@shared/core-utils' |
7 | import { HttpStatusCode } from '@shared/models' | 7 | import { HttpStatusCode } from '@shared/models' |
8 | 8 | ||
9 | export type CommonRequestParams = { | 9 | export type CommonRequestParams = { |
@@ -21,10 +21,21 @@ export type CommonRequestParams = { | |||
21 | expectedStatus?: HttpStatusCode | 21 | expectedStatus?: HttpStatusCode |
22 | } | 22 | } |
23 | 23 | ||
24 | function makeRawRequest (url: string, expectedStatus?: HttpStatusCode, range?: string) { | 24 | function makeRawRequest (options: { |
25 | const { host, protocol, pathname } = new URL(url) | 25 | url: string |
26 | token?: string | ||
27 | expectedStatus?: HttpStatusCode | ||
28 | range?: string | ||
29 | query?: { [ id: string ]: string } | ||
30 | }) { | ||
31 | const { host, protocol, pathname } = new URL(options.url) | ||
32 | |||
33 | return makeGetRequest({ | ||
34 | url: `${protocol}//${host}`, | ||
35 | path: pathname, | ||
26 | 36 | ||
27 | return makeGetRequest({ url: `${protocol}//${host}`, path: pathname, expectedStatus, range }) | 37 | ...pick(options, [ 'expectedStatus', 'range', 'token', 'query' ]) |
38 | }) | ||
28 | } | 39 | } |
29 | 40 | ||
30 | function makeGetRequest (options: CommonRequestParams & { | 41 | function makeGetRequest (options: CommonRequestParams & { |