Merge branch 'develop' of https://github.com/Chocobozzz/PeerTube into move-utils-to-shared

6 files changed, 9 insertions, 13 deletions

diff --git a/server/tests/api/activitypub/security.ts b/server/tests/api/activitypub/security.ts
index 69b7c0148..b71a61c8c 100644
--- a/server/tests/api/activitypub/security.ts
+++ b/server/tests/api/activitypub/security.ts
@@ -8,15 +8,12 @@ import {
   killallServers,
   ServerInfo
 } from '../../../../shared/utils'
-import {
-  makePOSTAPRequest,
-  makeFollowRequest,
-} from '../../utils/requests/activitypub'
 import { HTTP_SIGNATURE } from '../../../initializers'
 import { buildDigest, buildGlobalHeaders } from '../../../lib/job-queue/handlers/utils/activitypub-http-utils'
 import * as chai from 'chai'
 import { setActorField } from '../../utils/miscs/sql'
 import { activityPubContextify, buildSignedActivity } from '../../../helpers/activitypub'
+import { makeFollowRequest, makePOSTAPRequest } from '../../utils/requests/activitypub'
 
 const expect = chai.expect
 
diff --git a/server/tests/api/users/index.ts b/server/tests/api/users/index.ts
index 0a1b8b0b2..ff433315d 100644
--- a/server/tests/api/users/index.ts
+++ b/server/tests/api/users/index.ts
@@ -1,5 +1,5 @@
 import './blocklist'
 import './user-subscriptions'
 import './users'
-import './users-verification'
 import './users-multiple-servers'
+import './users-verification'
diff --git a/server/tests/api/videos/video-blacklist-management.ts b/server/tests/api/videos/video-blacklist-management.ts
index 06d80a270..61411e30d 100644
--- a/server/tests/api/videos/video-blacklist-management.ts
+++ b/server/tests/api/videos/video-blacklist-management.ts
@@ -1,7 +1,7 @@
 /* tslint:disable:no-unused-expression */
 
 import * as chai from 'chai'
-import * as lodash from 'lodash'
+import { orderBy } from 'lodash'
 import 'mocha'
 import {
   addVideoToBlacklist,
@@ -22,7 +22,6 @@ import { waitJobs } from '../../../../shared/utils/server/jobs'
 import { VideoAbuse } from '../../../../shared/models/videos'
 
 const expect = chai.expect
-const orderBy = lodash.orderBy
 
 describe('Test video blacklist management', function () {
   let servers: ServerInfo[] = []
diff --git a/server/tests/api/videos/video-channels.ts b/server/tests/api/videos/video-channels.ts
index 5bffffc66..63514d69c 100644
--- a/server/tests/api/videos/video-channels.ts
+++ b/server/tests/api/videos/video-channels.ts
@@ -7,10 +7,12 @@ import {
   createUser,
   doubleFollow,
   flushAndRunMultipleServers,
-  getVideoChannelVideos, serverLogin, testImage,
+  getVideoChannelVideos,
+  testImage,
   updateVideo,
   updateVideoChannelAvatar,
-  uploadVideo, wait, userLogin
+  uploadVideo,
+  userLogin
 } from '../../../../shared/utils'
 import {
   addVideoChannel,
diff --git a/server/tests/api/videos/video-schedule-update.ts b/server/tests/api/videos/video-schedule-update.ts
index ecfc5e034..632c4244c 100644
--- a/server/tests/api/videos/video-schedule-update.ts
+++ b/server/tests/api/videos/video-schedule-update.ts
@@ -16,7 +16,6 @@ import {
   uploadVideo,
   wait
 } from '../../../../shared/utils'
-import { join } from 'path'
 import { waitJobs } from '../../../../shared/utils/server/jobs'
 
 const expect = chai.expect
diff --git a/server/tests/api/videos/video-transcoder.ts b/server/tests/api/videos/video-transcoder.ts
index f9458f0ec..68cf00194 100644
--- a/server/tests/api/videos/video-transcoder.ts
+++ b/server/tests/api/videos/video-transcoder.ts
@@ -3,13 +3,13 @@
 import * as chai from 'chai'
 import 'mocha'
 import { omit } from 'lodash'
-import * as ffmpeg from 'fluent-ffmpeg'
 import { getMaxBitrate, VideoDetails, VideoResolution, VideoState } from '../../../../shared/models/videos'
 import { audio, getVideoFileBitrate, getVideoFileFPS, getVideoFileResolution } from '../../../helpers/ffmpeg-utils'
 import {
   buildAbsoluteFixturePath,
   doubleFollow,
   flushAndRunMultipleServers,
+  generateHighBitrateVideo,
   getMyVideos,
   getVideo,
   getVideosList,
@@ -18,8 +18,7 @@ import {
   ServerInfo,
   setAccessTokensToServers,
   uploadVideo,
-  webtorrentAdd,
-  generateHighBitrateVideo
+  webtorrentAdd
 } from '../../../../shared/utils'
 import { join } from 'path'
 import { waitJobs } from '../../../../shared/utils/server/jobs'