diff options
Diffstat (limited to 'server/tests/plugins/filter-hooks.ts')
-rw-r--r-- | server/tests/plugins/filter-hooks.ts | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/server/tests/plugins/filter-hooks.ts b/server/tests/plugins/filter-hooks.ts index c235508e8..b5e29d298 100644 --- a/server/tests/plugins/filter-hooks.ts +++ b/server/tests/plugins/filter-hooks.ts | |||
@@ -24,8 +24,7 @@ import { | |||
24 | updateVideo, | 24 | updateVideo, |
25 | uploadVideo, | 25 | uploadVideo, |
26 | uploadVideoAndGetId, | 26 | uploadVideoAndGetId, |
27 | waitJobs, | 27 | waitJobs |
28 | waitUntilLog | ||
29 | } from '@shared/extra-utils' | 28 | } from '@shared/extra-utils' |
30 | import { VideoDetails, VideoImportState, VideoPlaylist, VideoPlaylistPrivacy, VideoPrivacy } from '@shared/models' | 29 | import { VideoDetails, VideoImportState, VideoPlaylist, VideoPlaylistPrivacy, VideoPrivacy } from '@shared/models' |
31 | 30 | ||
@@ -475,8 +474,8 @@ describe('Test plugin filter hooks', function () { | |||
475 | } | 474 | } |
476 | }) | 475 | }) |
477 | 476 | ||
478 | await waitUntilLog(servers[0], 'Run hook filter:api.search.videos.local.list.params', 1) | 477 | await servers[0].serversCommand.waitUntilLog('Run hook filter:api.search.videos.local.list.params', 1) |
479 | await waitUntilLog(servers[0], 'Run hook filter:api.search.videos.local.list.result', 1) | 478 | await servers[0].serversCommand.waitUntilLog('Run hook filter:api.search.videos.local.list.result', 1) |
480 | }) | 479 | }) |
481 | 480 | ||
482 | it('Should run filter:api.search.videos.index.list.{params,result}', async function () { | 481 | it('Should run filter:api.search.videos.index.list.{params,result}', async function () { |
@@ -487,10 +486,10 @@ describe('Test plugin filter hooks', function () { | |||
487 | } | 486 | } |
488 | }) | 487 | }) |
489 | 488 | ||
490 | await waitUntilLog(servers[0], 'Run hook filter:api.search.videos.local.list.params', 1) | 489 | await servers[0].serversCommand.waitUntilLog('Run hook filter:api.search.videos.local.list.params', 1) |
491 | await waitUntilLog(servers[0], 'Run hook filter:api.search.videos.local.list.result', 1) | 490 | await servers[0].serversCommand.waitUntilLog('Run hook filter:api.search.videos.local.list.result', 1) |
492 | await waitUntilLog(servers[0], 'Run hook filter:api.search.videos.index.list.params', 1) | 491 | await servers[0].serversCommand.waitUntilLog('Run hook filter:api.search.videos.index.list.params', 1) |
493 | await waitUntilLog(servers[0], 'Run hook filter:api.search.videos.index.list.result', 1) | 492 | await servers[0].serversCommand.waitUntilLog('Run hook filter:api.search.videos.index.list.result', 1) |
494 | }) | 493 | }) |
495 | 494 | ||
496 | it('Should run filter:api.search.video-channels.local.list.{params,result}', async function () { | 495 | it('Should run filter:api.search.video-channels.local.list.{params,result}', async function () { |
@@ -500,8 +499,8 @@ describe('Test plugin filter hooks', function () { | |||
500 | } | 499 | } |
501 | }) | 500 | }) |
502 | 501 | ||
503 | await waitUntilLog(servers[0], 'Run hook filter:api.search.video-channels.local.list.params', 1) | 502 | await servers[0].serversCommand.waitUntilLog('Run hook filter:api.search.video-channels.local.list.params', 1) |
504 | await waitUntilLog(servers[0], 'Run hook filter:api.search.video-channels.local.list.result', 1) | 503 | await servers[0].serversCommand.waitUntilLog('Run hook filter:api.search.video-channels.local.list.result', 1) |
505 | }) | 504 | }) |
506 | 505 | ||
507 | it('Should run filter:api.search.video-channels.index.list.{params,result}', async function () { | 506 | it('Should run filter:api.search.video-channels.index.list.{params,result}', async function () { |
@@ -512,10 +511,10 @@ describe('Test plugin filter hooks', function () { | |||
512 | } | 511 | } |
513 | }) | 512 | }) |
514 | 513 | ||
515 | await waitUntilLog(servers[0], 'Run hook filter:api.search.video-channels.local.list.params', 1) | 514 | await servers[0].serversCommand.waitUntilLog('Run hook filter:api.search.video-channels.local.list.params', 1) |
516 | await waitUntilLog(servers[0], 'Run hook filter:api.search.video-channels.local.list.result', 1) | 515 | await servers[0].serversCommand.waitUntilLog('Run hook filter:api.search.video-channels.local.list.result', 1) |
517 | await waitUntilLog(servers[0], 'Run hook filter:api.search.video-channels.index.list.params', 1) | 516 | await servers[0].serversCommand.waitUntilLog('Run hook filter:api.search.video-channels.index.list.params', 1) |
518 | await waitUntilLog(servers[0], 'Run hook filter:api.search.video-channels.index.list.result', 1) | 517 | await servers[0].serversCommand.waitUntilLog('Run hook filter:api.search.video-channels.index.list.result', 1) |
519 | }) | 518 | }) |
520 | 519 | ||
521 | it('Should run filter:api.search.video-playlists.local.list.{params,result}', async function () { | 520 | it('Should run filter:api.search.video-playlists.local.list.{params,result}', async function () { |
@@ -525,8 +524,8 @@ describe('Test plugin filter hooks', function () { | |||
525 | } | 524 | } |
526 | }) | 525 | }) |
527 | 526 | ||
528 | await waitUntilLog(servers[0], 'Run hook filter:api.search.video-playlists.local.list.params', 1) | 527 | await servers[0].serversCommand.waitUntilLog('Run hook filter:api.search.video-playlists.local.list.params', 1) |
529 | await waitUntilLog(servers[0], 'Run hook filter:api.search.video-playlists.local.list.result', 1) | 528 | await servers[0].serversCommand.waitUntilLog('Run hook filter:api.search.video-playlists.local.list.result', 1) |
530 | }) | 529 | }) |
531 | 530 | ||
532 | it('Should run filter:api.search.video-playlists.index.list.{params,result}', async function () { | 531 | it('Should run filter:api.search.video-playlists.index.list.{params,result}', async function () { |
@@ -537,10 +536,10 @@ describe('Test plugin filter hooks', function () { | |||
537 | } | 536 | } |
538 | }) | 537 | }) |
539 | 538 | ||
540 | await waitUntilLog(servers[0], 'Run hook filter:api.search.video-playlists.local.list.params', 1) | 539 | await servers[0].serversCommand.waitUntilLog('Run hook filter:api.search.video-playlists.local.list.params', 1) |
541 | await waitUntilLog(servers[0], 'Run hook filter:api.search.video-playlists.local.list.result', 1) | 540 | await servers[0].serversCommand.waitUntilLog('Run hook filter:api.search.video-playlists.local.list.result', 1) |
542 | await waitUntilLog(servers[0], 'Run hook filter:api.search.video-playlists.index.list.params', 1) | 541 | await servers[0].serversCommand.waitUntilLog('Run hook filter:api.search.video-playlists.index.list.params', 1) |
543 | await waitUntilLog(servers[0], 'Run hook filter:api.search.video-playlists.index.list.result', 1) | 542 | await servers[0].serversCommand.waitUntilLog('Run hook filter:api.search.video-playlists.index.list.result', 1) |
544 | }) | 543 | }) |
545 | }) | 544 | }) |
546 | 545 | ||