interesting
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix tests

This commit is contained in:
Chocobozzz 2020-06-18 13:38:20 +02:00
parent 6567e5a796
commit c24aac6bc7
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/ci.sh
View File

@ -13,7 +13,7 @@ perl -0777 -i -pe 's#proxy:(\n\s+)enabled: false\n\s+url: ""#proxy:$1enabled: t
if [ "$1" = "misc" ]; then if [ "$1" = "misc" ]; then
npm run build -- --light npm run build -- --light
mocha --timeout 5000 --exit --require ts-node/register --require tsconfig-paths/register --bail server/tests/client.ts \ mocha --timeout 5000 --exit --require ts-node/register --files --require tsconfig-paths/register --bail server/tests/client.ts \
server/tests/feeds/index.ts \ server/tests/feeds/index.ts \
server/tests/misc-endpoints.ts \ server/tests/misc-endpoints.ts \
server/tests/helpers/index.ts \ server/tests/helpers/index.ts \

2
server/tests/api/ci-4.sh
View File

@ -6,5 +6,5 @@ redundancyFiles=$(find server/tests/api/redundancy -type f | grep -v index.ts |
activitypubFiles=$(find server/tests/api/activitypub -type f | grep -v index.ts | xargs echo) activitypubFiles=$(find server/tests/api/activitypub -type f | grep -v index.ts | xargs echo)
MOCHA_PARALLEL=true npm run mocha -- --parallel --jobs $1 --timeout 30000 --exit \ MOCHA_PARALLEL=true npm run mocha -- --parallel --jobs $1 --timeout 30000 --exit \
--require ts-node/register --require tsconfig-paths/register --bail \ --require ts-node/register --files --require tsconfig-paths/register --bail \
$redundancyFiles $activitypubFiles $redundancyFiles $activitypubFiles

10
server/typings/express.d.ts → server/typings/express/index.d.ts vendored
View File

@ -1,4 +1,4 @@
import { RegisteredPlugin } from '../lib/plugins/plugin-manager' import { RegisteredPlugin } from '../../lib/plugins/plugin-manager'
import { import {
MAccountDefault, MAccountDefault,
MActorAccountChannelId, MActorAccountChannelId,
@ -18,15 +18,15 @@ import {
MVideoShareActor, MVideoShareActor,
MVideoThumbnail, MVideoThumbnail,
MVideoWithRights MVideoWithRights
} from '../types/models' } from '../../types/models'
import { MVideoPlaylistFull, MVideoPlaylistFullSummary } from '../types/models/video/video-playlist' import { MVideoPlaylistFull, MVideoPlaylistFullSummary } from '../../types/models/video/video-playlist'
import { MVideoImportDefault } from '@server/types/models/video/video-import' import { MVideoImportDefault } from '@server/types/models/video/video-import'
import { MAccountBlocklist, MActorUrl, MStreamingPlaylist, MVideoFile, MVideoImmutable } from '@server/types/models' import { MAccountBlocklist, MActorUrl, MStreamingPlaylist, MVideoFile, MVideoImmutable } from '@server/types/models'
import { MVideoPlaylistElement, MVideoPlaylistElementVideoUrlPlaylistPrivacy } from '@server/types/models/video/video-playlist-element' import { MVideoPlaylistElement, MVideoPlaylistElementVideoUrlPlaylistPrivacy } from '@server/types/models/video/video-playlist-element'
import { MAccountVideoRateAccountVideo } from '@server/types/models/video/video-rate' import { MAccountVideoRateAccountVideo } from '@server/types/models/video/video-rate'
import { MVideoChangeOwnershipFull } from '../types/models/video/video-change-ownership' import { MVideoChangeOwnershipFull } from '../../types/models/video/video-change-ownership'
import { MPlugin, MServer } from '@server/types/models/server' import { MPlugin, MServer } from '@server/types/models/server'
import { MServerBlocklist } from '../types/models/server/server-blocklist' import { MServerBlocklist } from '../../types/models/server/server-blocklist'
import { MOAuthTokenUser } from '@server/types/models/oauth/oauth-token' import { MOAuthTokenUser } from '@server/types/models/oauth/oauth-token'
import { UserRole } from '@shared/models' import { UserRole } from '@shared/models'
import { RegisterServerAuthExternalOptions } from '@shared/models/plugins/register-server-auth.model' import { RegisterServerAuthExternalOptions } from '@shared/models/plugins/register-server-auth.model'

1
tsconfig.json
View File

@ -28,6 +28,7 @@
"@shared/*": [ "shared/*" ] "@shared/*": [ "shared/*" ]
} }
}, },
"include": [ "." ],
"exclude": [ "exclude": [
"server/tools/", "server/tools/",
"node_modules", "node_modules",