Cleanup tests imports

18 files changed, 18 insertions, 54 deletions

diff --git a/server/tests/api/server/auto-follows.ts b/server/tests/api/server/auto-follows.ts
index 9666e61dd..cdaadb3ad 100644
--- a/server/tests/api/server/auto-follows.ts
+++ b/server/tests/api/server/auto-follows.ts
@@ -1,12 +1,10 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
+import { expect } from 'chai'
 import { MockInstancesIndex } from '@server/tests/shared'
 import { wait } from '@shared/core-utils'
 import { cleanupTests, createMultipleServers, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands'
 
-const expect = chai.expect
-
 async function checkFollow (follower: PeerTubeServer, following: PeerTubeServer, exists: boolean) {
   {
     const body = await following.follows.getFollowers({ start: 0, count: 5, sort: '-createdAt' })
diff --git a/server/tests/api/server/bulk.ts b/server/tests/api/server/bulk.ts
index 560dcc76e..05762c7c2 100644
--- a/server/tests/api/server/bulk.ts
+++ b/server/tests/api/server/bulk.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
+import { expect } from 'chai'
 import {
   BulkCommand,
   cleanupTests,
@@ -11,8 +11,6 @@ import {
   waitJobs
 } from '@shared/server-commands'
 
-const expect = chai.expect
-
 describe('Test bulk actions', function () {
   const commentsUser3: { videoId: number, commentId: number }[] = []
 
diff --git a/server/tests/api/server/config-defaults.ts b/server/tests/api/server/config-defaults.ts
index 47ee4746d..4fa37d0e2 100644
--- a/server/tests/api/server/config-defaults.ts
+++ b/server/tests/api/server/config-defaults.ts
@@ -1,12 +1,10 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
+import { expect } from 'chai'
 import { FIXTURE_URLS } from '@server/tests/shared'
 import { VideoDetails, VideoPrivacy } from '@shared/models'
 import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers, setDefaultVideoChannel } from '@shared/server-commands'
 
-const expect = chai.expect
-
 describe('Test config defaults', function () {
   let server: PeerTubeServer
   let channelId: number
diff --git a/server/tests/api/server/config.ts b/server/tests/api/server/config.ts
index 2b2b093a7..b8c99e804 100644
--- a/server/tests/api/server/config.ts
+++ b/server/tests/api/server/config.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
+import { expect } from 'chai'
 import { parallelTests } from '@shared/core-utils'
 import { CustomConfig, HttpStatusCode } from '@shared/models'
 import {
@@ -12,8 +12,6 @@ import {
   setAccessTokensToServers
 } from '@shared/server-commands'
 
-const expect = chai.expect
-
 function checkInitialConfig (server: PeerTubeServer, data: CustomConfig) {
   expect(data.instance.name).to.equal('PeerTube')
   expect(data.instance.shortDescription).to.equal(
diff --git a/server/tests/api/server/contact-form.ts b/server/tests/api/server/contact-form.ts
index 3eb6c8548..fcd7f3c4c 100644
--- a/server/tests/api/server/contact-form.ts
+++ b/server/tests/api/server/contact-form.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
+import { expect } from 'chai'
 import { MockSmtpServer } from '@server/tests/shared'
 import { wait } from '@shared/core-utils'
 import { HttpStatusCode } from '@shared/models'
@@ -13,8 +13,6 @@ import {
   waitJobs
 } from '@shared/server-commands'
 
-const expect = chai.expect
-
 describe('Test contact form', function () {
   let server: PeerTubeServer
   const emails: object[] = []
diff --git a/server/tests/api/server/email.ts b/server/tests/api/server/email.ts
index 5ac66225f..1826c268a 100644
--- a/server/tests/api/server/email.ts
+++ b/server/tests/api/server/email.ts
@@ -1,12 +1,10 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
+import { expect } from 'chai'
 import { MockSmtpServer } from '@server/tests/shared'
 import { HttpStatusCode } from '@shared/models'
 import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands'
 
-const expect = chai.expect
-
 describe('Test emails', function () {
   let server: PeerTubeServer
   let userId: number
diff --git a/server/tests/api/server/follow-constraints.ts b/server/tests/api/server/follow-constraints.ts
index c5c8c8595..5998f58cc 100644
--- a/server/tests/api/server/follow-constraints.ts
+++ b/server/tests/api/server/follow-constraints.ts
@@ -1,11 +1,9 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
+import { expect } from 'chai'
 import { cleanupTests, createMultipleServers, doubleFollow, PeerTubeServer, setAccessTokensToServers } from '@shared/server-commands'
 import { HttpStatusCode, PeerTubeProblemDocument, ServerErrorCode } from '@shared/models'
 
-const expect = chai.expect
-
 describe('Test follow constraints', function () {
   let servers: PeerTubeServer[] = []
   let video1UUID: string
diff --git a/server/tests/api/server/follows-moderation.ts b/server/tests/api/server/follows-moderation.ts
index dc189fec5..deeaac85a 100644
--- a/server/tests/api/server/follows-moderation.ts
+++ b/server/tests/api/server/follows-moderation.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
+import { expect } from 'chai'
 import { expectStartWith } from '@server/tests/shared'
 import { ActorFollow, FollowState } from '@shared/models'
 import {
@@ -12,8 +12,6 @@ import {
   waitJobs
 } from '@shared/server-commands'
 
-const expect = chai.expect
-
 async function checkServer1And2HasFollowers (servers: PeerTubeServer[], state = 'accepted') {
   const fns = [
     servers[0].follows.getFollowings.bind(servers[0].follows),
diff --git a/server/tests/api/server/follows.ts b/server/tests/api/server/follows.ts
index 3ff8c3583..96d39352b 100644
--- a/server/tests/api/server/follows.ts
+++ b/server/tests/api/server/follows.ts
@@ -1,12 +1,10 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
+import { expect } from 'chai'
 import { completeVideoCheck, dateIsValid, expectAccountFollows, expectChannelsFollows, testCaptionFile } from '@server/tests/shared'
 import { VideoCreateResult, VideoPrivacy } from '@shared/models'
 import { cleanupTests, createMultipleServers, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands'
 
-const expect = chai.expect
-
 describe('Test follows', function () {
   let servers: PeerTubeServer[] = []
 
diff --git a/server/tests/api/server/handle-down.ts b/server/tests/api/server/handle-down.ts
index 78b3f8560..9ace65ddf 100644
--- a/server/tests/api/server/handle-down.ts
+++ b/server/tests/api/server/handle-down.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
+import { expect } from 'chai'
 import { completeVideoCheck } from '@server/tests/shared'
 import { wait } from '@shared/core-utils'
 import { HttpStatusCode, JobState, VideoCreateResult, VideoPrivacy } from '@shared/models'
@@ -14,8 +14,6 @@ import {
   waitJobs
 } from '@shared/server-commands'
 
-const expect = chai.expect
-
 describe('Test handle downs', function () {
   let servers: PeerTubeServer[] = []
   let threadIdServer1: number
diff --git a/server/tests/api/server/homepage.ts b/server/tests/api/server/homepage.ts
index 1867826d6..9c45800f2 100644
--- a/server/tests/api/server/homepage.ts
+++ b/server/tests/api/server/homepage.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
+import { expect } from 'chai'
 import { HttpStatusCode } from '@shared/models'
 import {
   cleanupTests,
@@ -13,8 +13,6 @@ import {
   setDefaultChannelAvatar
 } from '../../../../shared/server-commands/index'
 
-const expect = chai.expect
-
 async function getHomepageState (server: PeerTubeServer) {
   const config = await server.config.getConfig()
 
diff --git a/server/tests/api/server/jobs.ts b/server/tests/api/server/jobs.ts
index 8217da19b..211e32b1e 100644
--- a/server/tests/api/server/jobs.ts
+++ b/server/tests/api/server/jobs.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
+import { expect } from 'chai'
 import { dateIsValid } from '@server/tests/shared'
 import { wait } from '@shared/core-utils'
 import {
@@ -12,8 +12,6 @@ import {
   waitJobs
 } from '@shared/server-commands'
 
-const expect = chai.expect
-
 describe('Test jobs', function () {
   let servers: PeerTubeServer[]
 
diff --git a/server/tests/api/server/logs.ts b/server/tests/api/server/logs.ts
index 8e626c9df..3b3314d34 100644
--- a/server/tests/api/server/logs.ts
+++ b/server/tests/api/server/logs.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
+import { expect } from 'chai'
 import { HttpStatusCode } from '@shared/models'
 import {
   cleanupTests,
@@ -12,8 +12,6 @@ import {
   waitJobs
 } from '@shared/server-commands'
 
-const expect = chai.expect
-
 describe('Test logs', function () {
   let server: PeerTubeServer
   let logsCommand: LogsCommand
diff --git a/server/tests/api/server/plugins.ts b/server/tests/api/server/plugins.ts
index fbcf4651e..8ac7023eb 100644
--- a/server/tests/api/server/plugins.ts
+++ b/server/tests/api/server/plugins.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
+import { expect } from 'chai'
 import { pathExists, remove } from 'fs-extra'
 import { join } from 'path'
 import { testHelloWorldRegisteredSettings } from '@server/tests/shared'
@@ -16,8 +16,6 @@ import {
   setAccessTokensToServers
 } from '@shared/server-commands'
 
-const expect = chai.expect
-
 describe('Test plugins', function () {
   let server: PeerTubeServer = null
   let command: PluginsCommand
diff --git a/server/tests/api/server/proxy.ts b/server/tests/api/server/proxy.ts
index 851bed058..a4151ebdd 100644
--- a/server/tests/api/server/proxy.ts
+++ b/server/tests/api/server/proxy.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
+import { expect } from 'chai'
 import { expectNotStartWith, expectStartWith, FIXTURE_URLS, MockProxy } from '@server/tests/shared'
 import { areObjectStorageTestsDisabled } from '@shared/core-utils'
 import { HttpStatusCode, VideoPrivacy } from '@shared/models'
@@ -15,8 +15,6 @@ import {
   waitJobs
 } from '@shared/server-commands'
 
-const expect = chai.expect
-
 describe('Test proxy', function () {
   let servers: PeerTubeServer[] = []
   let proxy: MockProxy
diff --git a/server/tests/api/server/services.ts b/server/tests/api/server/services.ts
index ed7aca6b6..380308a34 100644
--- a/server/tests/api/server/services.ts
+++ b/server/tests/api/server/services.ts
@@ -1,11 +1,9 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
+import { expect } from 'chai'
 import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers, setDefaultVideoChannel } from '@shared/server-commands'
 import { Video, VideoPlaylistPrivacy } from '@shared/models'
 
-const expect = chai.expect
-
 describe('Test services', function () {
   let server: PeerTubeServer = null
   let playlistUUID: string
diff --git a/server/tests/api/server/slow-follows.ts b/server/tests/api/server/slow-follows.ts
index 73ac26bf8..a967fa724 100644
--- a/server/tests/api/server/slow-follows.ts
+++ b/server/tests/api/server/slow-follows.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
+import { expect } from 'chai'
 import { Job } from '@shared/models'
 import {
   cleanupTests,
@@ -11,8 +11,6 @@ import {
   waitJobs
 } from '@shared/server-commands'
 
-const expect = chai.expect
-
 describe('Test slow follows', function () {
   let servers: PeerTubeServer[] = []
 
diff --git a/server/tests/api/server/stats.ts b/server/tests/api/server/stats.ts
index 6dad22aa1..762fc422d 100644
--- a/server/tests/api/server/stats.ts
+++ b/server/tests/api/server/stats.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
+import { expect } from 'chai'
 import { wait } from '@shared/core-utils'
 import { ActivityType, VideoPlaylistPrivacy } from '@shared/models'
 import {
@@ -14,8 +14,6 @@ import {
   waitJobs
 } from '@shared/server-commands'
 
-const expect = chai.expect
-
 describe('Test stats (excluding redundancy)', function () {
   let servers: PeerTubeServer[] = []
   let channelId