diff options
| author | Chocobozzz <me@florianbigard.com> | 2020-11-06 11:22:12 +0100 |
|---|---|---|
| committer | Chocobozzz <chocobozzz@cpy.re> | 2020-11-09 15:33:04 +0100 |
| commit | c8f3cfeba7acc2ab9c5f03161d22856202a49326 (patch) | |
| tree | 227a9b6063f1eef27362ab5b5122cb411a239361 | |
| parent | 053aed43fb255b4ae4324a845534f2f562c3b6cc (diff) | |
| download | PeerTube-c8f3cfeba7acc2ab9c5f03161d22856202a49326.tar.gz PeerTube-c8f3cfeba7acc2ab9c5f03161d22856202a49326.tar.zst PeerTube-c8f3cfeba7acc2ab9c5f03161d22856202a49326.zip | |
Fix tests
| -rwxr-xr-x | scripts/ci.sh | 2 | ||||
| -rw-r--r-- | server/models/video/video.ts | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/ci.sh b/scripts/ci.sh index e29b07ad7..238eba371 100755 --- a/scripts/ci.sh +++ b/scripts/ci.sh | |||
| @@ -60,7 +60,7 @@ elif [ "$1" = "api-2" ]; then | |||
| 60 | usersFiles=$(findTestFiles server/tests/api/users) | 60 | usersFiles=$(findTestFiles server/tests/api/users) |
| 61 | liveFiles=$(findTestFiles server/tests/api/live) | 61 | liveFiles=$(findTestFiles server/tests/api/live) |
| 62 | 62 | ||
| 63 | MOCHA_PARALLEL=true runTest 2 $serverFiles $usersFiles liveFiles | 63 | MOCHA_PARALLEL=true runTest 2 $serverFiles $usersFiles $liveFiles |
| 64 | elif [ "$1" = "api-3" ]; then | 64 | elif [ "$1" = "api-3" ]; then |
| 65 | npm run build:server | 65 | npm run build:server |
| 66 | 66 | ||
diff --git a/server/models/video/video.ts b/server/models/video/video.ts index 8e71f8c32..60f295056 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts | |||
| @@ -964,7 +964,7 @@ export class VideoModel extends Model<VideoModel> { | |||
| 964 | } | 964 | } |
| 965 | ] | 965 | ] |
| 966 | }, | 966 | }, |
| 967 | VideoLiveModel, | 967 | VideoLiveModel.unscoped(), |
| 968 | VideoFileModel, | 968 | VideoFileModel, |
| 969 | TagModel | 969 | TagModel |
| 970 | ] | 970 | ] |