diff options
author | Chocobozzz <me@florianbigard.com> | 2018-08-06 12:11:08 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-08-06 12:11:08 +0200 |
commit | 3d52b300ea79bec21f090e2447c4808307078618 (patch) | |
tree | 5a68db9d557eb9449533162cf01f974e60b16885 /server/tests/utils/requests | |
parent | 60979b076de00a7c7f6dde26617cd39357d9fc6d (diff) | |
parent | 2769e297ca6703f761f9b57792585eb1fc5aac49 (diff) | |
download | PeerTube-3d52b300ea79bec21f090e2447c4808307078618.tar.gz PeerTube-3d52b300ea79bec21f090e2447c4808307078618.tar.zst PeerTube-3d52b300ea79bec21f090e2447c4808307078618.zip |
Merge branch 'release/beta-10' into develop
Diffstat (limited to 'server/tests/utils/requests')
-rw-r--r-- | server/tests/utils/requests/requests.ts | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/server/tests/utils/requests/requests.ts b/server/tests/utils/requests/requests.ts index b88b3ce5b..fc7b38b8c 100644 --- a/server/tests/utils/requests/requests.ts +++ b/server/tests/utils/requests/requests.ts | |||
@@ -48,7 +48,7 @@ function makeUploadRequest (options: { | |||
48 | path: string, | 48 | path: string, |
49 | token?: string, | 49 | token?: string, |
50 | fields: { [ fieldName: string ]: any }, | 50 | fields: { [ fieldName: string ]: any }, |
51 | attaches: { [ attachName: string ]: any }, | 51 | attaches: { [ attachName: string ]: any | any[] }, |
52 | statusCodeExpected?: number | 52 | statusCodeExpected?: number |
53 | }) { | 53 | }) { |
54 | if (!options.statusCodeExpected) options.statusCodeExpected = 400 | 54 | if (!options.statusCodeExpected) options.statusCodeExpected = 400 |
@@ -78,7 +78,11 @@ function makeUploadRequest (options: { | |||
78 | 78 | ||
79 | Object.keys(options.attaches).forEach(attach => { | 79 | Object.keys(options.attaches).forEach(attach => { |
80 | const value = options.attaches[attach] | 80 | const value = options.attaches[attach] |
81 | req.attach(attach, buildAbsoluteFixturePath(value)) | 81 | if (Array.isArray(value)) { |
82 | req.attach(attach, buildAbsoluteFixturePath(value[0]), value[1]) | ||
83 | } else { | ||
84 | req.attach(attach, buildAbsoluteFixturePath(value)) | ||
85 | } | ||
82 | }) | 86 | }) |
83 | 87 | ||
84 | return req.expect(options.statusCodeExpected) | 88 | return req.expect(options.statusCodeExpected) |