shared/ typescript types dir server-commands

[github/Chocobozzz/PeerTube.git] / server / tests / api / search / search-activitypub-video-playlists.ts

diff --git a/server/tests/api/search/search-activitypub-video-playlists.ts b/server/tests/api/search/search-activitypub-video-playlists.ts
index 7c99b954b06e01d78d5f8d58a1bc5756a63ad73b..550af8ed20309164c11b13550d5c8f43b69cedfe 100644 (file)
--- a/server/tests/api/search/search-activitypub-video-playlists.ts
+++ b/server/tests/api/search/search-activitypub-video-playlists.ts
@@ -4,20 +4,20 @@ import 'mocha'
 import * as chai from 'chai'
 import {
   cleanupTests,
-  flushAndRunMultipleServers,
+  createMultipleServers,
+  PeerTubeServer,
   SearchCommand,
-  ServerInfo,
   setAccessTokensToServers,
   setDefaultVideoChannel,
   wait,
   waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
 import { VideoPlaylistPrivacy } from '@shared/models'
 
 const expect = chai.expect
 
 describe('Test ActivityPub playlists search', function () {
-  let servers: ServerInfo[]
+  let servers: PeerTubeServer[]
   let playlistServer1UUID: string
   let playlistServer2UUID: string
   let video2Server2: string
@@ -27,7 +27,7 @@ describe('Test ActivityPub playlists search', function () {
   before(async function () {
     this.timeout(120000)
 
-    servers = await flushAndRunMultipleServers(2)
+    servers = await createMultipleServers(2)
 
     await setAccessTokensToServers(servers)
     await setDefaultVideoChannel(servers)
@@ -71,7 +71,7 @@ describe('Test ActivityPub playlists search', function () {
 
   it('Should not find a remote playlist', async function () {
     {
-      const search = 'http://localhost:' + servers[1].port + '/video-playlists/43'
+      const search = servers[1].url + '/video-playlists/43'
       const body = await command.searchPlaylists({ search, token: servers[0].accessToken })
 
       expect(body.total).to.equal(0)
@@ -81,7 +81,7 @@ describe('Test ActivityPub playlists search', function () {
 
     {
       // Without token
-      const search = 'http://localhost:' + servers[1].port + '/video-playlists/' + playlistServer2UUID
+      const search = servers[1].url + '/video-playlists/' + playlistServer2UUID
       const body = await command.searchPlaylists({ search })
 
       expect(body.total).to.equal(0)
@@ -91,7 +91,7 @@ describe('Test ActivityPub playlists search', function () {
   })
 
   it('Should search a local playlist', async function () {
-    const search = 'http://localhost:' + servers[0].port + '/video-playlists/' + playlistServer1UUID
+    const search = servers[0].url + '/video-playlists/' + playlistServer1UUID
     const body = await command.searchPlaylists({ search })
 
     expect(body.total).to.equal(1)
@@ -103,8 +103,8 @@ describe('Test ActivityPub playlists search', function () {
 
   it('Should search a local playlist with an alternative URL', async function () {
     const searches = [
-      'http://localhost:' + servers[0].port + '/videos/watch/playlist/' + playlistServer1UUID,
-      'http://localhost:' + servers[0].port + '/w/p/' + playlistServer1UUID
+      servers[0].url + '/videos/watch/playlist/' + playlistServer1UUID,
+      servers[0].url + '/w/p/' + playlistServer1UUID
     ]
 
     for (const search of searches) {
@@ -120,11 +120,30 @@ describe('Test ActivityPub playlists search', function () {
     }
   })
 
+  it('Should search a local playlist with a query in URL', async function () {
+    const searches = [
+      servers[0].url + '/videos/watch/playlist/' + playlistServer1UUID,
+      servers[0].url + '/w/p/' + playlistServer1UUID
+    ]
+
+    for (const search of searches) {
+      for (const token of [ undefined, servers[0].accessToken ]) {
+        const body = await command.searchPlaylists({ search: search + '?param=1', token })
+
+        expect(body.total).to.equal(1)
+        expect(body.data).to.be.an('array')
+        expect(body.data).to.have.lengthOf(1)
+        expect(body.data[0].displayName).to.equal('playlist 1 on server 1')
+        expect(body.data[0].videosLength).to.equal(2)
+      }
+    }
+  })
+
   it('Should search a remote playlist', async function () {
     const searches = [
-      'http://localhost:' + servers[1].port + '/video-playlists/' + playlistServer2UUID,
-      'http://localhost:' + servers[1].port + '/videos/watch/playlist/' + playlistServer2UUID,
-      'http://localhost:' + servers[1].port + '/w/p/' + playlistServer2UUID
+      servers[1].url + '/video-playlists/' + playlistServer2UUID,
+      servers[1].url + '/videos/watch/playlist/' + playlistServer2UUID,
+      servers[1].url + '/w/p/' + playlistServer2UUID
     ]
 
     for (const search of searches) {
@@ -155,7 +174,7 @@ describe('Test ActivityPub playlists search', function () {
     await wait(10000)
 
     // Will run refresh async
-    const search = 'http://localhost:' + servers[1].port + '/video-playlists/' + playlistServer2UUID
+    const search = servers[1].url + '/video-playlists/' + playlistServer2UUID
     await command.searchPlaylists({ search, token: servers[0].accessToken })
 
     // Wait refresh
@@ -179,7 +198,7 @@ describe('Test ActivityPub playlists search', function () {
     await wait(10000)
 
     // Will run refresh async
-    const search = 'http://localhost:' + servers[1].port + '/video-playlists/' + playlistServer2UUID
+    const search = servers[1].url + '/video-playlists/' + playlistServer2UUID
     await command.searchPlaylists({ search, token: servers[0].accessToken })
 
     // Wait refresh