import 'mocha'
import * as chai from 'chai'
-import {
- cleanupTests,
- CommentsCommand,
- createUser,
- dateIsValid,
- flushAndRunServer,
- getAccessToken,
- ServerInfo,
- setAccessTokensToServers,
- testImage,
- updateMyAvatar,
- uploadVideo
-} from '@shared/extra-utils'
+import { dateIsValid, testImage } from '@server/tests/shared'
+import { cleanupTests, CommentsCommand, createSingleServer, PeerTubeServer, setAccessTokensToServers } from '@shared/server-commands'
const expect = chai.expect
describe('Test video comments', function () {
- let server: ServerInfo
+ let server: PeerTubeServer
let videoId: number
let videoUUID: string
let threadId: number
before(async function () {
this.timeout(30000)
- server = await flushAndRunServer(1)
+ server = await createSingleServer(1)
await setAccessTokensToServers([ server ])
- const res = await uploadVideo(server.url, server.accessToken, {})
- videoUUID = res.body.video.uuid
- videoId = res.body.video.id
+ const { id, uuid } = await server.videos.upload()
+ videoUUID = uuid
+ videoId = id
- await updateMyAvatar({
- url: server.url,
- accessToken: server.accessToken,
- fixture: 'avatar.png'
- })
+ await server.users.updateMyAvatar({ fixture: 'avatar.png' })
- await createUser({
- url: server.url,
- accessToken: server.accessToken,
- username: 'user1',
- password: 'password'
- })
- userAccessTokenServer1 = await getAccessToken(server.url, 'user1', 'password')
+ userAccessTokenServer1 = await server.users.generateUserAndToken('user1')
- command = server.commentsCommand
+ command = server.comments
})
describe('User comments', function () {