From 8b0d42ee372de6589796be26b83e5bffb1b69cdf Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 29 Dec 2017 14:32:51 +0100
Subject: Fix tests

---
 server/tests/api/server/follows.ts          |  4 ++--
 server/tests/api/videos/multiple-servers.ts |  4 ++--
 server/tests/api/videos/services.ts         | 22 ++++++++--------------
 server/tests/api/videos/single-server.ts    | 29 +++--------------------------
 4 files changed, 15 insertions(+), 44 deletions(-)

(limited to 'server')

diff --git a/server/tests/api/server/follows.ts b/server/tests/api/server/follows.ts
index 311631aae..fc9c5c3b6 100644
--- a/server/tests/api/server/follows.ts
+++ b/server/tests/api/server/follows.ts
@@ -10,7 +10,7 @@ import {
   flushAndRunMultipleServers, flushTests, getVideosList, killallServers, ServerInfo, setAccessTokensToServers, uploadVideo,
   wait
 } from '../../utils/index'
-import { dateIsValid, webtorrentAdd } from '../../utils/miscs/miscs'
+import { dateIsValid } from '../../utils/miscs/miscs'
 import { follow, getFollowersListPaginationAndSort, getFollowingListPaginationAndSort, unfollow } from '../../utils/server/follows'
 import { userLogin } from '../../utils/users/login'
 import { createUser } from '../../utils/users/users'
@@ -18,7 +18,7 @@ import {
   addVideoCommentReply, addVideoCommentThread, getVideoCommentThreads,
   getVideoThreadComments
 } from '../../utils/videos/video-comments'
-import { getVideo, rateVideo, testVideoImage } from '../../utils/videos/videos'
+import { rateVideo } from '../../utils/videos/videos'
 
 const expect = chai.expect
 
diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts
index d35d1204a..abd051a30 100644
--- a/server/tests/api/videos/multiple-servers.ts
+++ b/server/tests/api/videos/multiple-servers.ts
@@ -98,7 +98,7 @@ describe('Test multiple servers', function () {
             description: 'super channel',
             isLocal
           },
-          fixture: 'video_short.webm',
+          fixture: 'video_short1.webm',
           files: [
             {
               resolution: 720,
@@ -289,7 +289,7 @@ describe('Test multiple servers', function () {
             description: '',
             isLocal
           },
-          fixture: 'video_short3.webm',
+          fixture: 'video_short.webm',
           files: [
             {
               resolution: 720,
diff --git a/server/tests/api/videos/services.ts b/server/tests/api/videos/services.ts
index b3167aebc..699f79ab7 100644
--- a/server/tests/api/videos/services.ts
+++ b/server/tests/api/videos/services.ts
@@ -1,20 +1,12 @@
 /* tslint:disable:no-unused-expression */
 
-import 'mocha'
 import * as chai from 'chai'
-const expect = chai.expect
-
-import {
-  ServerInfo,
-  flushTests,
-  uploadVideo,
-  getVideosList,
-  setAccessTokensToServers,
-  killallServers,
-  getOEmbed
-} from '../../utils/index'
+import 'mocha'
+import { flushTests, getOEmbed, getVideosList, killallServers, ServerInfo, setAccessTokensToServers, uploadVideo } from '../../utils/index'
 import { runServer } from '../../utils/server/servers'
 
+const expect = chai.expect
+
 describe('Test services', function () {
   let server: ServerInfo = null
 
@@ -30,8 +22,10 @@ describe('Test services', function () {
     const videoAttributes = {
       name: 'my super name'
     }
-    const res = await uploadVideo(server.url, server.accessToken, videoAttributes)
-    server.video = res.body.video
+    await uploadVideo(server.url, server.accessToken, videoAttributes)
+
+    const res = await getVideosList(server.url)
+    server.video = res.body.data[0]
   })
 
   it('Should have a valid oEmbed response', async function () {
diff --git a/server/tests/api/videos/single-server.ts b/server/tests/api/videos/single-server.ts
index 934c653b1..2a3126f32 100644
--- a/server/tests/api/videos/single-server.ts
+++ b/server/tests/api/videos/single-server.ts
@@ -6,32 +6,9 @@ import 'mocha'
 import { join } from 'path'
 import { VideoPrivacy } from '../../../../shared/models/videos'
 import {
-  dateIsValid,
-  flushTests,
-  getVideo,
-  getVideoCategories,
-  getVideoLanguages,
-  getVideoLicences,
-  getVideoPrivacies,
-  getVideosList,
-  getVideosListPagination,
-  getVideosListSort,
-  killallServers,
-  rateVideo,
-  readdirPromise,
-  removeVideo,
-  runServer,
-  searchVideo,
-  searchVideoWithPagination,
-  searchVideoWithSort,
-  ServerInfo,
-  setAccessTokensToServers,
-  testVideoImage,
-  updateVideo,
-  uploadVideo,
-  wait,
-  webtorrentAdd,
-  viewVideo, completeVideoCheck, immutableAssign
+  completeVideoCheck, flushTests, getVideo, getVideoCategories, getVideoLanguages, getVideoLicences, getVideoPrivacies,
+  getVideosList, getVideosListPagination, getVideosListSort, killallServers, rateVideo, readdirPromise, removeVideo, runServer, searchVideo,
+  searchVideoWithPagination, searchVideoWithSort, ServerInfo, setAccessTokensToServers, testVideoImage, updateVideo, uploadVideo, viewVideo
 } from '../../utils'
 
 const expect = chai.expect
-- 
cgit v1.2.3