X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fsearch%2Fsearch-activitypub-video-playlists.ts;h=b9a42429227fb13885a25fb6e6f515729436d96e;hb=7804e577de25345da51ac3d88f6121108012b523;hp=33ca7be12af1af82cc8197bfb75d04e94daba50c;hpb=c4fa01f7c45b66b112ebd08abce744b7c4041feb;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/search/search-activitypub-video-playlists.ts b/server/tests/api/search/search-activitypub-video-playlists.ts
index 33ca7be12..b9a424292 100644
--- a/server/tests/api/search/search-activitypub-video-playlists.ts
+++ b/server/tests/api/search/search-activitypub-video-playlists.ts
@@ -2,17 +2,18 @@
 
 import 'mocha'
 import * as chai from 'chai'
+import { wait } from '@shared/core-utils'
+import { VideoPlaylistPrivacy } from '@shared/models'
 import {
   cleanupTests,
   createMultipleServers,
   PeerTubeServer,
   SearchCommand,
   setAccessTokensToServers,
+  setDefaultAccountAvatar,
   setDefaultVideoChannel,
-  wait,
   waitJobs
-} from '@shared/extra-utils'
-import { VideoPlaylistPrivacy } from '@shared/models'
+} from '@shared/server-commands'
 
 const expect = chai.expect
 
@@ -31,6 +32,7 @@ describe('Test ActivityPub playlists search', function () {
 
     await setAccessTokensToServers(servers)
     await setDefaultVideoChannel(servers)
+    await setDefaultAccountAvatar(servers)
 
     {
       const video1 = (await servers[0].videos.quickUpload({ name: 'video 1' })).uuid
@@ -71,7 +73,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 +83,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 +93,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 +105,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 +122,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 +176,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 +200,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