From 975e6e0e44e2f2b25f804cd48a62e2a8d9e8117a Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Fri, 17 Nov 2017 12:05:59 +0100
Subject: Fix video full description

---
 server/tests/api/video-privacy.ts | 40 +++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'server/tests/api/video-privacy.ts')

diff --git a/server/tests/api/video-privacy.ts b/server/tests/api/video-privacy.ts
index beac1613e..eb1e4f873 100644
--- a/server/tests/api/video-privacy.ts
+++ b/server/tests/api/video-privacy.ts
@@ -1,24 +1,24 @@
 /* tslint:disable:no-unused-expression */
 
-import 'mocha'
 import * as chai from 'chai'
-const expect = chai.expect
-
+import 'mocha'
+import { VideoPrivacy } from '../../../shared/models/videos/video-privacy.enum'
 import {
-  ServerInfo,
+  flushAndRunMultipleServers,
   flushTests,
-  uploadVideo,
-  makeFriends,
   getVideosList,
-  wait,
+  killallServers,
+  ServerInfo,
   setAccessTokensToServers,
-  flushAndRunMultipleServers,
-  killallServers
+  uploadVideo,
+  wait
 } from '../utils'
-import { VideoPrivacy } from '../../../shared/models/videos/video-privacy.enum'
-import { getMyVideos, getVideo, getVideoWithToken, updateVideo } from '../utils/videos'
-import { createUser } from '../utils/users'
+import { doubleFollow } from '../utils/follows'
 import { getUserAccessToken } from '../utils/login'
+import { createUser } from '../utils/users'
+import { getMyVideos, getVideo, getVideoWithToken, updateVideo } from '../utils/videos'
+
+const expect = chai.expect
 
 describe('Test video privacy', function () {
   let servers: ServerInfo[] = []
@@ -35,11 +35,11 @@ describe('Test video privacy', function () {
     // Get the access tokens
     await setAccessTokensToServers(servers)
 
-    // Pod 1 makes friend with pod 2
-    await makeFriends(servers[0].url, servers[0].accessToken)
+    // Server 1 and server 2 follow each other
+    await doubleFollow(servers[0], servers[1])
   })
 
-  it('Should upload a private video on pod 1', async function () {
+  it('Should upload a private video on server 1', async function () {
     this.timeout(15000)
 
     const attributes = {
@@ -50,7 +50,7 @@ describe('Test video privacy', function () {
     await wait(11000)
   })
 
-  it('Should not have this private video on pod 2', async function () {
+  it('Should not have this private video on server 2', async function () {
     const res = await getVideosList(servers[1].url)
 
     expect(res.body.total).to.equal(0)
@@ -86,7 +86,7 @@ describe('Test video privacy', function () {
     await getVideoWithToken(servers[0].url, servers[0].accessToken, privateVideoUUID)
   })
 
-  it('Should upload a unlisted video on pod 2', async function () {
+  it('Should upload a unlisted video on server 2', async function () {
     this.timeout(30000)
 
     const attributes = {
@@ -98,7 +98,7 @@ describe('Test video privacy', function () {
     await wait(22000)
   })
 
-  it('Should not have this unlisted video listed on pod 1 and 2', async function () {
+  it('Should not have this unlisted video listed on server 1 and 2', async function () {
     for (const server of servers) {
       const res = await getVideosList(server.url)
 
@@ -124,7 +124,7 @@ describe('Test video privacy', function () {
     }
   })
 
-  it('Should update the private video to public on pod 1', async function () {
+  it('Should update the private video to public on server 1', async function () {
     this.timeout(15000)
 
     const attribute = {
@@ -137,7 +137,7 @@ describe('Test video privacy', function () {
     await wait(11000)
   })
 
-  it('Should not have this new unlisted video listed on pod 1 and 2', async function () {
+  it('Should not have this new unlisted video listed on server 1 and 2', async function () {
     for (const server of servers) {
       const res = await getVideosList(server.url)
 
-- 
cgit v1.2.3