From: Chocobozzz <me@florianbigard.com>
Date: Thu, 17 Mar 2022 09:50:26 +0000 (+0100)
Subject: Fix CI
X-Git-Tag: v4.2.0-rc.1~306
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=db1ccd05d349c400c658dec68d11c8b01c9ccd01;p=github%2FChocobozzz%2FPeerTube.git

Fix CI
---

diff --git a/scripts/ci.sh b/scripts/ci.sh
index 5f1230d33..3d23f0297 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -50,8 +50,8 @@ elif [ "$1" = "client" ]; then
     helperFiles=$(findTestFiles ./dist/server/tests/helpers)
     libFiles=$(findTestFiles ./dist/server/tests/lib)
     miscFiles="./dist/server/tests/client.js ./dist/server/tests/misc-endpoints.js"
-    # Not in plugin task, it needs an index.html
-    pluginFiles="./dist/server/tests/plugins/html-injection.js"
+    # Not in their own task, they need an index.html
+    pluginFiles="./dist/server/tests/plugins/html-injection.js ./dist/server/tests/api/server/plugins.js"
 
     MOCHA_PARALLEL=true runTest "$1" 2 $feedsFiles $helperFiles $miscFiles $pluginFiles $libFiles
 elif [ "$1" = "cli-plugin" ]; then
@@ -75,7 +75,7 @@ elif [ "$1" = "api-2" ]; then
     npm run build:server
 
     liveFiles=$(findTestFiles ./dist/server/tests/api/live)
-    serverFiles=$(findTestFiles ./dist/server/tests/api/server)
+    serverFiles=$(findTestFiles ./dist/server/tests/api/server plugins.js)
     usersFiles=$(findTestFiles ./dist/server/tests/api/users)
 
     MOCHA_PARALLEL=true runTest "$1" 3 $liveFiles $serverFiles $usersFiles
diff --git a/server/tests/api/server/jobs.ts b/server/tests/api/server/jobs.ts
index 6cc88a123..96ab2a576 100644
--- a/server/tests/api/server/jobs.ts
+++ b/server/tests/api/server/jobs.ts
@@ -3,6 +3,7 @@
 import 'mocha'
 import * as chai from 'chai'
 import { dateIsValid } from '@server/tests/shared'
+import { wait } from '@shared/core-utils'
 import {
   cleanupTests,
   createMultipleServers,
@@ -11,8 +12,6 @@ import {
   setAccessTokensToServers,
   waitJobs
 } from '@shared/server-commands'
-import { wait } from '@shared/core-utils'
-import { uuid } from 'short-uuid'
 
 const expect = chai.expect