diff options
author | Chocobozzz <me@florianbigard.com> | 2020-06-18 13:38:20 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2020-06-18 13:39:13 +0200 |
commit | c24aac6bc73033195c37d81cf2b7449c9b54712c (patch) | |
tree | f736377972b32f7a9cbd8ed5ca518ef589fc983f /server | |
parent | 6567e5a796a740ce512a487218cfcfb914872657 (diff) | |
download | PeerTube-c24aac6bc73033195c37d81cf2b7449c9b54712c.tar.gz PeerTube-c24aac6bc73033195c37d81cf2b7449c9b54712c.tar.zst PeerTube-c24aac6bc73033195c37d81cf2b7449c9b54712c.zip |
Fix tests
Diffstat (limited to 'server')
-rw-r--r-- | server/tests/api/ci-4.sh | 2 | ||||
-rw-r--r-- | server/typings/express/index.d.ts (renamed from server/typings/express.d.ts) | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/server/tests/api/ci-4.sh b/server/tests/api/ci-4.sh index 7d83cbdfc..e71b9b154 100644 --- a/server/tests/api/ci-4.sh +++ b/server/tests/api/ci-4.sh | |||
@@ -6,5 +6,5 @@ redundancyFiles=$(find server/tests/api/redundancy -type f | grep -v index.ts | | |||
6 | activitypubFiles=$(find server/tests/api/activitypub -type f | grep -v index.ts | xargs echo) | 6 | activitypubFiles=$(find server/tests/api/activitypub -type f | grep -v index.ts | xargs echo) |
7 | 7 | ||
8 | MOCHA_PARALLEL=true npm run mocha -- --parallel --jobs $1 --timeout 30000 --exit \ | 8 | MOCHA_PARALLEL=true npm run mocha -- --parallel --jobs $1 --timeout 30000 --exit \ |
9 | --require ts-node/register --require tsconfig-paths/register --bail \ | 9 | --require ts-node/register --files --require tsconfig-paths/register --bail \ |
10 | $redundancyFiles $activitypubFiles | 10 | $redundancyFiles $activitypubFiles |
diff --git a/server/typings/express.d.ts b/server/typings/express/index.d.ts index 451bf9103..ad3212340 100644 --- a/server/typings/express.d.ts +++ b/server/typings/express/index.d.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { RegisteredPlugin } from '../lib/plugins/plugin-manager' | 1 | import { RegisteredPlugin } from '../../lib/plugins/plugin-manager' |
2 | import { | 2 | import { |
3 | MAccountDefault, | 3 | MAccountDefault, |
4 | MActorAccountChannelId, | 4 | MActorAccountChannelId, |
@@ -18,15 +18,15 @@ import { | |||
18 | MVideoShareActor, | 18 | MVideoShareActor, |
19 | MVideoThumbnail, | 19 | MVideoThumbnail, |
20 | MVideoWithRights | 20 | MVideoWithRights |
21 | } from '../types/models' | 21 | } from '../../types/models' |
22 | import { MVideoPlaylistFull, MVideoPlaylistFullSummary } from '../types/models/video/video-playlist' | 22 | import { MVideoPlaylistFull, MVideoPlaylistFullSummary } from '../../types/models/video/video-playlist' |
23 | import { MVideoImportDefault } from '@server/types/models/video/video-import' | 23 | import { MVideoImportDefault } from '@server/types/models/video/video-import' |
24 | import { MAccountBlocklist, MActorUrl, MStreamingPlaylist, MVideoFile, MVideoImmutable } from '@server/types/models' | 24 | import { MAccountBlocklist, MActorUrl, MStreamingPlaylist, MVideoFile, MVideoImmutable } from '@server/types/models' |
25 | import { MVideoPlaylistElement, MVideoPlaylistElementVideoUrlPlaylistPrivacy } from '@server/types/models/video/video-playlist-element' | 25 | import { MVideoPlaylistElement, MVideoPlaylistElementVideoUrlPlaylistPrivacy } from '@server/types/models/video/video-playlist-element' |
26 | import { MAccountVideoRateAccountVideo } from '@server/types/models/video/video-rate' | 26 | import { MAccountVideoRateAccountVideo } from '@server/types/models/video/video-rate' |
27 | import { MVideoChangeOwnershipFull } from '../types/models/video/video-change-ownership' | 27 | import { MVideoChangeOwnershipFull } from '../../types/models/video/video-change-ownership' |
28 | import { MPlugin, MServer } from '@server/types/models/server' | 28 | import { MPlugin, MServer } from '@server/types/models/server' |
29 | import { MServerBlocklist } from '../types/models/server/server-blocklist' | 29 | import { MServerBlocklist } from '../../types/models/server/server-blocklist' |
30 | import { MOAuthTokenUser } from '@server/types/models/oauth/oauth-token' | 30 | import { MOAuthTokenUser } from '@server/types/models/oauth/oauth-token' |
31 | import { UserRole } from '@shared/models' | 31 | import { UserRole } from '@shared/models' |
32 | import { RegisterServerAuthExternalOptions } from '@shared/models/plugins/register-server-auth.model' | 32 | import { RegisterServerAuthExternalOptions } from '@shared/models/plugins/register-server-auth.model' |