X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fsearch%2Fsearch-index.ts;h=21473b6bf0a02e991996b7dadbd321204a490a36;hb=17ecdf61ce1d374cc8ba17601b93c9bda08112b2;hp=b18d40b2af19841342548811ce6e725fa728d8c4;hpb=28dca0a2211524bbf3ad17666c607eb6325763b8;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/search/search-index.ts b/server/tests/api/search/search-index.ts
index b18d40b2a..21473b6bf 100644
--- a/server/tests/api/search/search-index.ts
+++ b/server/tests/api/search/search-index.ts
@@ -1,8 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import 'mocha'
-import * as chai from 'chai'
-import { cleanupTests, createSingleServer, PeerTubeServer, SearchCommand, setAccessTokensToServers } from '@shared/server-commands'
+import { expect } from 'chai'
 import {
   BooleanBothQuery,
   VideoChannelsSearchQuery,
@@ -11,8 +9,7 @@ import {
   VideoPlaylistType,
   VideosSearchQuery
 } from '@shared/models'
-
-const expect = chai.expect
+import { cleanupTests, createSingleServer, PeerTubeServer, SearchCommand, setAccessTokensToServers } from '@shared/server-commands'
 
 describe('Test index search', function () {
   const localVideoName = 'local video' + new Date().toISOString()
@@ -35,8 +32,6 @@ describe('Test index search', function () {
   describe('Default search', async function () {
 
     it('Should make a local videos search by default', async function () {
-      this.timeout(10000)
-
       await server.config.updateCustomSubConfig({
         newConfig: {
           search: {
@@ -60,7 +55,7 @@ describe('Test index search', function () {
 
       expect(body.total).to.equal(1)
       expect(body.data[0].name).to.equal('root_channel')
-      expect(body.data[0].host).to.equal('localhost:' + server.port)
+      expect(body.data[0].host).to.equal(server.host)
     })
 
     it('Should make an index videos search by default', async function () {
@@ -84,28 +79,6 @@ describe('Test index search', function () {
       const body = await command.searchChannels({ search: 'root' })
       expect(body.total).to.be.greaterThan(2)
     })
-
-    it('Should make an index videos search if local search is disabled', async function () {
-      await server.config.updateCustomSubConfig({
-        newConfig: {
-          search: {
-            searchIndex: {
-              enabled: true,
-              isDefaultSearch: false,
-              disableLocalSearch: true
-            }
-          }
-        }
-      })
-
-      const body = await command.searchVideos({ search: 'local video' })
-      expect(body.total).to.be.greaterThan(2)
-    })
-
-    it('Should make an index channels search if local search is disabled', async function () {
-      const body = await command.searchChannels({ search: 'root' })
-      expect(body.total).to.be.greaterThan(2)
-    })
   })
 
   describe('Videos search', async function () {
@@ -136,14 +109,14 @@ describe('Test index search', function () {
       expect(video.account.url).to.equal('https://framatube.org/accounts/framasoft')
       // TODO: remove, deprecated in 4.2
       expect(video.account.avatar).to.exist
-      expect(video.account.avatars.length).to.equal(1, 'Account should have one avatar image')
+      expect(video.account.avatars.length).to.equal(2, 'Account should have one avatar image')
 
       expect(video.channel.host).to.equal('framatube.org')
       expect(video.channel.name).to.equal('joinpeertube')
       expect(video.channel.url).to.equal('https://framatube.org/video-channels/joinpeertube')
       // TODO: remove, deprecated in 4.2
       expect(video.channel.avatar).to.exist
-      expect(video.channel.avatars.length).to.equal(1, 'Channel should have one avatar image')
+      expect(video.channel.avatars.length).to.equal(2, 'Channel should have one avatar image')
     }
 
     const baseSearch: VideosSearchQuery = {
@@ -322,7 +295,7 @@ describe('Test index search', function () {
       expect(videoChannel.host).to.equal('framatube.org')
       // TODO: remove, deprecated in 4.2
       expect(videoChannel.avatar).to.exist
-      expect(videoChannel.avatars.length).to.equal(1, 'Channel should have two avatar images')
+      expect(videoChannel.avatars.length).to.equal(2, 'Channel should have two avatar images')
       expect(videoChannel.displayName).to.exist
 
       expect(videoChannel.ownerAccount.url).to.equal('https://framatube.org/accounts/framasoft')
@@ -330,7 +303,7 @@ describe('Test index search', function () {
       expect(videoChannel.ownerAccount.host).to.equal('framatube.org')
       // TODO: remove, deprecated in 4.2
       expect(videoChannel.ownerAccount.avatar).to.exist
-      expect(videoChannel.ownerAccount.avatars.length).to.equal(1, 'Account should have two avatar images')
+      expect(videoChannel.ownerAccount.avatars.length).to.equal(2, 'Account should have two avatar images')
     }
 
     it('Should make a simple search and not have results', async function () {
@@ -345,8 +318,8 @@ describe('Test index search', function () {
     })
 
     it('Should make host search and have appropriate results', async function () {
-      await check({ search: 'Framasoft', host: 'example.com' }, false)
-      await check({ search: 'Framasoft', host: 'framatube.org' }, true)
+      await check({ search: 'Framasoft videos', host: 'example.com' }, false)
+      await check({ search: 'Framasoft videos', host: 'framatube.org' }, true)
     })
 
     it('Should make handles search and have appropriate results', async function () {