diff options
Diffstat (limited to 'server/tests')
-rw-r--r-- | server/tests/api/check-params/video-imports.ts | 1 | ||||
-rw-r--r-- | server/tests/api/check-params/videos.ts | 2 | ||||
-rw-r--r-- | server/tests/api/server/follows.ts | 1 | ||||
-rw-r--r-- | server/tests/api/server/handle-down.ts | 1 | ||||
-rw-r--r-- | server/tests/api/videos/multiple-servers.ts | 6 | ||||
-rw-r--r-- | server/tests/api/videos/single-server.ts | 3 | ||||
-rw-r--r-- | server/tests/utils/videos/videos.ts | 6 |
7 files changed, 20 insertions, 0 deletions
diff --git a/server/tests/api/check-params/video-imports.ts b/server/tests/api/check-params/video-imports.ts index 44645b0e2..8dd87b8ae 100644 --- a/server/tests/api/check-params/video-imports.ts +++ b/server/tests/api/check-params/video-imports.ts | |||
@@ -84,6 +84,7 @@ describe('Test video imports API validator', function () { | |||
84 | language: 'pt', | 84 | language: 'pt', |
85 | nsfw: false, | 85 | nsfw: false, |
86 | commentsEnabled: true, | 86 | commentsEnabled: true, |
87 | downloadingEnabled: true, | ||
87 | waitTranscoding: true, | 88 | waitTranscoding: true, |
88 | description: 'my super description', | 89 | description: 'my super description', |
89 | support: 'my super support text', | 90 | support: 'my super support text', |
diff --git a/server/tests/api/check-params/videos.ts b/server/tests/api/check-params/videos.ts index 904d22870..c5740087c 100644 --- a/server/tests/api/check-params/videos.ts +++ b/server/tests/api/check-params/videos.ts | |||
@@ -175,6 +175,7 @@ describe('Test videos API validator', function () { | |||
175 | language: 'pt', | 175 | language: 'pt', |
176 | nsfw: false, | 176 | nsfw: false, |
177 | commentsEnabled: true, | 177 | commentsEnabled: true, |
178 | downloadingEnabled: true, | ||
178 | waitTranscoding: true, | 179 | waitTranscoding: true, |
179 | description: 'my super description', | 180 | description: 'my super description', |
180 | support: 'my super support text', | 181 | support: 'my super support text', |
@@ -419,6 +420,7 @@ describe('Test videos API validator', function () { | |||
419 | language: 'pt', | 420 | language: 'pt', |
420 | nsfw: false, | 421 | nsfw: false, |
421 | commentsEnabled: false, | 422 | commentsEnabled: false, |
423 | downloadingEnabled: false, | ||
422 | description: 'my super description', | 424 | description: 'my super description', |
423 | privacy: VideoPrivacy.PUBLIC, | 425 | privacy: VideoPrivacy.PUBLIC, |
424 | tags: [ 'tag1', 'tag2' ] | 426 | tags: [ 'tag1', 'tag2' ] |
diff --git a/server/tests/api/server/follows.ts b/server/tests/api/server/follows.ts index 310c291bf..5cad1d09d 100644 --- a/server/tests/api/server/follows.ts +++ b/server/tests/api/server/follows.ts | |||
@@ -305,6 +305,7 @@ describe('Test follows', function () { | |||
305 | }, | 305 | }, |
306 | isLocal, | 306 | isLocal, |
307 | commentsEnabled: true, | 307 | commentsEnabled: true, |
308 | downloadingEnabled: true, | ||
308 | duration: 5, | 309 | duration: 5, |
309 | tags: [ 'tag1', 'tag2', 'tag3' ], | 310 | tags: [ 'tag1', 'tag2', 'tag3' ], |
310 | privacy: VideoPrivacy.PUBLIC, | 311 | privacy: VideoPrivacy.PUBLIC, |
diff --git a/server/tests/api/server/handle-down.ts b/server/tests/api/server/handle-down.ts index ed15c8090..971de4607 100644 --- a/server/tests/api/server/handle-down.ts +++ b/server/tests/api/server/handle-down.ts | |||
@@ -70,6 +70,7 @@ describe('Test handle downs', function () { | |||
70 | tags: [ 'tag1p1', 'tag2p1' ], | 70 | tags: [ 'tag1p1', 'tag2p1' ], |
71 | privacy: VideoPrivacy.PUBLIC, | 71 | privacy: VideoPrivacy.PUBLIC, |
72 | commentsEnabled: true, | 72 | commentsEnabled: true, |
73 | downloadingEnabled: true, | ||
73 | channel: { | 74 | channel: { |
74 | name: 'root_channel', | 75 | name: 'root_channel', |
75 | displayName: 'Main root channel', | 76 | displayName: 'Main root channel', |
diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts index 4553ee855..83e391ccd 100644 --- a/server/tests/api/videos/multiple-servers.ts +++ b/server/tests/api/videos/multiple-servers.ts | |||
@@ -127,6 +127,7 @@ describe('Test multiple servers', function () { | |||
127 | tags: [ 'tag1p1', 'tag2p1' ], | 127 | tags: [ 'tag1p1', 'tag2p1' ], |
128 | privacy: VideoPrivacy.PUBLIC, | 128 | privacy: VideoPrivacy.PUBLIC, |
129 | commentsEnabled: true, | 129 | commentsEnabled: true, |
130 | downloadingEnabled: true, | ||
130 | channel: { | 131 | channel: { |
131 | displayName: 'my channel', | 132 | displayName: 'my channel', |
132 | name: 'super_channel_name', | 133 | name: 'super_channel_name', |
@@ -198,6 +199,7 @@ describe('Test multiple servers', function () { | |||
198 | }, | 199 | }, |
199 | isLocal, | 200 | isLocal, |
200 | commentsEnabled: true, | 201 | commentsEnabled: true, |
202 | downloadingEnabled: true, | ||
201 | duration: 5, | 203 | duration: 5, |
202 | tags: [ 'tag1p2', 'tag2p2', 'tag3p2' ], | 204 | tags: [ 'tag1p2', 'tag2p2', 'tag3p2' ], |
203 | privacy: VideoPrivacy.PUBLIC, | 205 | privacy: VideoPrivacy.PUBLIC, |
@@ -306,6 +308,7 @@ describe('Test multiple servers', function () { | |||
306 | isLocal, | 308 | isLocal, |
307 | duration: 5, | 309 | duration: 5, |
308 | commentsEnabled: true, | 310 | commentsEnabled: true, |
311 | downloadingEnabled: true, | ||
309 | tags: [ 'tag1p3' ], | 312 | tags: [ 'tag1p3' ], |
310 | privacy: VideoPrivacy.PUBLIC, | 313 | privacy: VideoPrivacy.PUBLIC, |
311 | channel: { | 314 | channel: { |
@@ -337,6 +340,7 @@ describe('Test multiple servers', function () { | |||
337 | host: 'localhost:9003' | 340 | host: 'localhost:9003' |
338 | }, | 341 | }, |
339 | commentsEnabled: true, | 342 | commentsEnabled: true, |
343 | downloadingEnabled: true, | ||
340 | isLocal, | 344 | isLocal, |
341 | duration: 5, | 345 | duration: 5, |
342 | tags: [ 'tag2p3', 'tag3p3', 'tag4p3' ], | 346 | tags: [ 'tag2p3', 'tag3p3', 'tag4p3' ], |
@@ -654,6 +658,7 @@ describe('Test multiple servers', function () { | |||
654 | isLocal, | 658 | isLocal, |
655 | duration: 5, | 659 | duration: 5, |
656 | commentsEnabled: true, | 660 | commentsEnabled: true, |
661 | downloadingEnabled: true, | ||
657 | tags: [ 'tag_up_1', 'tag_up_2' ], | 662 | tags: [ 'tag_up_1', 'tag_up_2' ], |
658 | privacy: VideoPrivacy.PUBLIC, | 663 | privacy: VideoPrivacy.PUBLIC, |
659 | channel: { | 664 | channel: { |
@@ -975,6 +980,7 @@ describe('Test multiple servers', function () { | |||
975 | isLocal, | 980 | isLocal, |
976 | duration: 5, | 981 | duration: 5, |
977 | commentsEnabled: false, | 982 | commentsEnabled: false, |
983 | downloadingEnabled: false, | ||
978 | tags: [ ], | 984 | tags: [ ], |
979 | privacy: VideoPrivacy.PUBLIC, | 985 | privacy: VideoPrivacy.PUBLIC, |
980 | channel: { | 986 | channel: { |
diff --git a/server/tests/api/videos/single-server.ts b/server/tests/api/videos/single-server.ts index e3d62b7a0..8995a8525 100644 --- a/server/tests/api/videos/single-server.ts +++ b/server/tests/api/videos/single-server.ts | |||
@@ -55,6 +55,7 @@ describe('Test a single server', function () { | |||
55 | tags: [ 'tag1', 'tag2', 'tag3' ], | 55 | tags: [ 'tag1', 'tag2', 'tag3' ], |
56 | privacy: VideoPrivacy.PUBLIC, | 56 | privacy: VideoPrivacy.PUBLIC, |
57 | commentsEnabled: true, | 57 | commentsEnabled: true, |
58 | downloadingEnabled: true, | ||
58 | channel: { | 59 | channel: { |
59 | displayName: 'Main root channel', | 60 | displayName: 'Main root channel', |
60 | name: 'root_channel', | 61 | name: 'root_channel', |
@@ -87,6 +88,7 @@ describe('Test a single server', function () { | |||
87 | privacy: VideoPrivacy.PUBLIC, | 88 | privacy: VideoPrivacy.PUBLIC, |
88 | duration: 5, | 89 | duration: 5, |
89 | commentsEnabled: false, | 90 | commentsEnabled: false, |
91 | downloadingEnabled: false, | ||
90 | channel: { | 92 | channel: { |
91 | name: 'root_channel', | 93 | name: 'root_channel', |
92 | displayName: 'Main root channel', | 94 | displayName: 'Main root channel', |
@@ -356,6 +358,7 @@ describe('Test a single server', function () { | |||
356 | nsfw: false, | 358 | nsfw: false, |
357 | description: 'my super description updated', | 359 | description: 'my super description updated', |
358 | commentsEnabled: false, | 360 | commentsEnabled: false, |
361 | downloadingEnabled: false, | ||
359 | tags: [ 'tagup1', 'tagup2' ] | 362 | tags: [ 'tagup1', 'tagup2' ] |
360 | } | 363 | } |
361 | await updateVideo(server.url, server.accessToken, videoId, attributes) | 364 | await updateVideo(server.url, server.accessToken, videoId, attributes) |
diff --git a/server/tests/utils/videos/videos.ts b/server/tests/utils/videos/videos.ts index 87c385f38..a7fd4c8a6 100644 --- a/server/tests/utils/videos/videos.ts +++ b/server/tests/utils/videos/videos.ts | |||
@@ -27,6 +27,7 @@ type VideoAttributes = { | |||
27 | language?: string | 27 | language?: string |
28 | nsfw?: boolean | 28 | nsfw?: boolean |
29 | commentsEnabled?: boolean | 29 | commentsEnabled?: boolean |
30 | downloadingEnabled?: boolean | ||
30 | waitTranscoding?: boolean | 31 | waitTranscoding?: boolean |
31 | description?: string | 32 | description?: string |
32 | tags?: string[] | 33 | tags?: string[] |
@@ -310,6 +311,7 @@ async function uploadVideo (url: string, accessToken: string, videoAttributesArg | |||
310 | tags: [ 'tag' ], | 311 | tags: [ 'tag' ], |
311 | privacy: VideoPrivacy.PUBLIC, | 312 | privacy: VideoPrivacy.PUBLIC, |
312 | commentsEnabled: true, | 313 | commentsEnabled: true, |
314 | downloadingEnabled: true, | ||
313 | fixture: 'video_short.webm' | 315 | fixture: 'video_short.webm' |
314 | }, videoAttributesArg) | 316 | }, videoAttributesArg) |
315 | 317 | ||
@@ -320,6 +322,7 @@ async function uploadVideo (url: string, accessToken: string, videoAttributesArg | |||
320 | .field('name', attributes.name) | 322 | .field('name', attributes.name) |
321 | .field('nsfw', JSON.stringify(attributes.nsfw)) | 323 | .field('nsfw', JSON.stringify(attributes.nsfw)) |
322 | .field('commentsEnabled', JSON.stringify(attributes.commentsEnabled)) | 324 | .field('commentsEnabled', JSON.stringify(attributes.commentsEnabled)) |
325 | .field('downloadingEnabled', JSON.stringify(attributes.downloadingEnabled)) | ||
323 | .field('waitTranscoding', JSON.stringify(attributes.waitTranscoding)) | 326 | .field('waitTranscoding', JSON.stringify(attributes.waitTranscoding)) |
324 | .field('privacy', attributes.privacy.toString()) | 327 | .field('privacy', attributes.privacy.toString()) |
325 | .field('channelId', attributes.channelId) | 328 | .field('channelId', attributes.channelId) |
@@ -370,6 +373,7 @@ function updateVideo (url: string, accessToken: string, id: number | string, att | |||
370 | if (attributes.language) body['language'] = attributes.language | 373 | if (attributes.language) body['language'] = attributes.language |
371 | if (attributes.nsfw !== undefined) body['nsfw'] = JSON.stringify(attributes.nsfw) | 374 | if (attributes.nsfw !== undefined) body['nsfw'] = JSON.stringify(attributes.nsfw) |
372 | if (attributes.commentsEnabled !== undefined) body['commentsEnabled'] = JSON.stringify(attributes.commentsEnabled) | 375 | if (attributes.commentsEnabled !== undefined) body['commentsEnabled'] = JSON.stringify(attributes.commentsEnabled) |
376 | if (attributes.downloadingEnabled !== undefined) body['downloadingEnabled'] = JSON.stringify(attributes.downloadingEnabled) | ||
373 | if (attributes.description) body['description'] = attributes.description | 377 | if (attributes.description) body['description'] = attributes.description |
374 | if (attributes.tags) body['tags'] = attributes.tags | 378 | if (attributes.tags) body['tags'] = attributes.tags |
375 | if (attributes.privacy) body['privacy'] = attributes.privacy | 379 | if (attributes.privacy) body['privacy'] = attributes.privacy |
@@ -435,6 +439,7 @@ async function completeVideoCheck ( | |||
435 | language: string | 439 | language: string |
436 | nsfw: boolean | 440 | nsfw: boolean |
437 | commentsEnabled: boolean | 441 | commentsEnabled: boolean |
442 | downloadingEnabled: boolean | ||
438 | description: string | 443 | description: string |
439 | publishedAt?: string | 444 | publishedAt?: string |
440 | support: string | 445 | support: string |
@@ -509,6 +514,7 @@ async function completeVideoCheck ( | |||
509 | expect(dateIsValid(videoDetails.channel.createdAt.toString())).to.be.true | 514 | expect(dateIsValid(videoDetails.channel.createdAt.toString())).to.be.true |
510 | expect(dateIsValid(videoDetails.channel.updatedAt.toString())).to.be.true | 515 | expect(dateIsValid(videoDetails.channel.updatedAt.toString())).to.be.true |
511 | expect(videoDetails.commentsEnabled).to.equal(attributes.commentsEnabled) | 516 | expect(videoDetails.commentsEnabled).to.equal(attributes.commentsEnabled) |
517 | expect(videoDetails.downloadingEnabled).to.equal(attributes.downloadingEnabled) | ||
512 | 518 | ||
513 | for (const attributeFile of attributes.files) { | 519 | for (const attributeFile of attributes.files) { |
514 | const file = videoDetails.files.find(f => f.resolution.id === attributeFile.resolution) | 520 | const file = videoDetails.files.find(f => f.resolution.id === attributeFile.resolution) |