diff options
author | Chocobozzz <me@florianbigard.com> | 2017-12-28 14:29:57 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2017-12-28 14:29:57 +0100 |
commit | eec63bbc0f4fdb39e56f37127b35c449f90a135f (patch) | |
tree | 2403f5efea3e281698ae4a6b550fea9dfc52e390 /server/tests/api/videos | |
parent | c5d31dba56d669c0df0209761c43c5a6ac7cec4a (diff) | |
download | PeerTube-eec63bbc0f4fdb39e56f37127b35c449f90a135f.tar.gz PeerTube-eec63bbc0f4fdb39e56f37127b35c449f90a135f.tar.zst PeerTube-eec63bbc0f4fdb39e56f37127b35c449f90a135f.zip |
Improve check follow params tests
Diffstat (limited to 'server/tests/api/videos')
-rw-r--r-- | server/tests/api/videos/multiple-servers.ts | 4 | ||||
-rw-r--r-- | server/tests/api/videos/video-privacy.ts | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts index 84f730a8e..0c6508e71 100644 --- a/server/tests/api/videos/multiple-servers.ts +++ b/server/tests/api/videos/multiple-servers.ts | |||
@@ -7,7 +7,7 @@ import * as request from 'supertest' | |||
7 | import { VideoComment, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model' | 7 | import { VideoComment, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model' |
8 | 8 | ||
9 | import { | 9 | import { |
10 | addVideoChannel, dateIsValid, doubleFollow, flushAndRunMultipleServers, flushTests, getUserAccessToken, getVideo, | 10 | addVideoChannel, dateIsValid, doubleFollow, flushAndRunMultipleServers, flushTests, userLogin, getVideo, |
11 | getVideoChannelsList, getVideosList, killallServers, rateVideo, removeVideo, ServerInfo, setAccessTokensToServers, testVideoImage, | 11 | getVideoChannelsList, getVideosList, killallServers, rateVideo, removeVideo, ServerInfo, setAccessTokensToServers, testVideoImage, |
12 | updateVideo, uploadVideo, wait, webtorrentAdd | 12 | updateVideo, uploadVideo, wait, webtorrentAdd |
13 | } from '../../utils/index' | 13 | } from '../../utils/index' |
@@ -152,7 +152,7 @@ describe('Test multiple servers', function () { | |||
152 | password: 'super_password' | 152 | password: 'super_password' |
153 | } | 153 | } |
154 | await createUser(servers[1].url, servers[1].accessToken, user.username, user.password) | 154 | await createUser(servers[1].url, servers[1].accessToken, user.username, user.password) |
155 | const userAccessToken = await getUserAccessToken(servers[1], user) | 155 | const userAccessToken = await userLogin(servers[1], user) |
156 | 156 | ||
157 | const videoAttributes = { | 157 | const videoAttributes = { |
158 | name: 'my super name for server 2', | 158 | name: 'my super name for server 2', |
diff --git a/server/tests/api/videos/video-privacy.ts b/server/tests/api/videos/video-privacy.ts index de709f8f1..469274921 100644 --- a/server/tests/api/videos/video-privacy.ts +++ b/server/tests/api/videos/video-privacy.ts | |||
@@ -14,7 +14,7 @@ import { | |||
14 | wait | 14 | wait |
15 | } from '../../utils/index' | 15 | } from '../../utils/index' |
16 | import { doubleFollow } from '../../utils/server/follows' | 16 | import { doubleFollow } from '../../utils/server/follows' |
17 | import { getUserAccessToken } from '../../utils/users/login' | 17 | import { userLogin } from '../../utils/users/login' |
18 | import { createUser } from '../../utils/users/users' | 18 | import { createUser } from '../../utils/users/users' |
19 | import { getMyVideos, getVideo, getVideoWithToken, updateVideo } from '../../utils/videos/videos' | 19 | import { getMyVideos, getVideo, getVideoWithToken, updateVideo } from '../../utils/videos/videos' |
20 | 20 | ||
@@ -78,7 +78,7 @@ describe('Test video privacy', function () { | |||
78 | } | 78 | } |
79 | await createUser(servers[0].url, servers[0].accessToken, user.username, user.password) | 79 | await createUser(servers[0].url, servers[0].accessToken, user.username, user.password) |
80 | 80 | ||
81 | const token = await getUserAccessToken(servers[0], user) | 81 | const token = await userLogin(servers[0], user) |
82 | await getVideoWithToken(servers[0].url, token, privateVideoUUID, 403) | 82 | await getVideoWithToken(servers[0].url, token, privateVideoUUID, 403) |
83 | }) | 83 | }) |
84 | 84 | ||