-import 'mocha'
-import * as chai from 'chai'
-import {
- cleanupTests,
- createMultipleServers,
- dateIsValid,
- expectAccountFollows,
- expectChannelsFollows,
- PeerTubeServer,
- setAccessTokensToServers,
- testCaptionFile,
- waitJobs
-} from '@shared/extra-utils'
-import { VideoCreateResult, VideoPrivacy } from '@shared/models'
-import { completeVideoCheck } from '@server/tests/shared/video'
-
-const expect = chai.expect
+import { expect } from 'chai'
+import { completeVideoCheck, dateIsValid, expectAccountFollows, expectChannelsFollows, testCaptionFile } from '@server/tests/shared'
+import { Video, VideoPrivacy } from '@shared/models'
+import { cleanupTests, createMultipleServers, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands'