diff options
author | Josh Morel <morel.josh@hotmail.com> | 2019-04-02 05:26:47 -0400 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2019-04-02 11:26:47 +0200 |
commit | 7ccddd7b5250bd25a917a6e77e58b87b9484a2a4 (patch) | |
tree | e75dc991369c1768804fefa114eb2a832881087f /shared/utils/videos/video-change-ownership.ts | |
parent | 12fed49ebab0c414713d57ea316b6488ae6bef99 (diff) | |
download | PeerTube-7ccddd7b5250bd25a917a6e77e58b87b9484a2a4.tar.gz PeerTube-7ccddd7b5250bd25a917a6e77e58b87b9484a2a4.tar.zst PeerTube-7ccddd7b5250bd25a917a6e77e58b87b9484a2a4.zip |
add quarantine videos feature (#1637)
* add quarantine videos feature
* increase Notification settings test timeout
to 20000ms. was completing 7000 locally but timing out
after 10000 on travis
* fix quarantine video test issues
-propagate misspelling
-remove skip from server/tests/client.ts
* WIP use blacklist for moderator video approval
instead of video.quarantine boolean
* finish auto-blacklist feature
Diffstat (limited to 'shared/utils/videos/video-change-ownership.ts')
-rw-r--r-- | shared/utils/videos/video-change-ownership.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shared/utils/videos/video-change-ownership.ts b/shared/utils/videos/video-change-ownership.ts index f288692ea..371d02000 100644 --- a/shared/utils/videos/video-change-ownership.ts +++ b/shared/utils/videos/video-change-ownership.ts | |||
@@ -1,6 +1,6 @@ | |||
1 | import * as request from 'supertest' | 1 | import * as request from 'supertest' |
2 | 2 | ||
3 | function changeVideoOwnership (url: string, token: string, videoId: number | string, username) { | 3 | function changeVideoOwnership (url: string, token: string, videoId: number | string, username, expectedStatus = 204) { |
4 | const path = '/api/v1/videos/' + videoId + '/give-ownership' | 4 | const path = '/api/v1/videos/' + videoId + '/give-ownership' |
5 | 5 | ||
6 | return request(url) | 6 | return request(url) |
@@ -8,7 +8,7 @@ function changeVideoOwnership (url: string, token: string, videoId: number | str | |||
8 | .set('Accept', 'application/json') | 8 | .set('Accept', 'application/json') |
9 | .set('Authorization', 'Bearer ' + token) | 9 | .set('Authorization', 'Bearer ' + token) |
10 | .send({ username }) | 10 | .send({ username }) |
11 | .expect(204) | 11 | .expect(expectedStatus) |
12 | } | 12 | } |
13 | 13 | ||
14 | function getVideoChangeOwnershipList (url: string, token: string) { | 14 | function getVideoChangeOwnershipList (url: string, token: string) { |