From b033851fb54241bb703f86add025229e68cc6f59 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 29 Jul 2021 10:27:24 +0200 Subject: Search channels against handles and not names --- server/tests/api/check-params/search.ts | 4 ++++ server/tests/api/search/search-channels.ts | 17 ++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) (limited to 'server/tests') diff --git a/server/tests/api/check-params/search.ts b/server/tests/api/check-params/search.ts index 789ea7754..cc15d2593 100644 --- a/server/tests/api/check-params/search.ts +++ b/server/tests/api/check-params/search.ts @@ -216,6 +216,10 @@ describe('Test videos API validator', function () { await makeGetRequest({ url: server.url, path, query: { ...query, host: '6565' }, expectedStatus: HttpStatusCode.BAD_REQUEST_400 }) }) + it('Should fail with invalid handles', async function () { + await makeGetRequest({ url: server.url, path, query: { ...query, handles: [ '' ] }, expectedStatus: HttpStatusCode.BAD_REQUEST_400 }) + }) + it('Should succeed with the correct parameters', async function () { await makeGetRequest({ url: server.url, path, query, expectedStatus: HttpStatusCode.OK_200 }) }) diff --git a/server/tests/api/search/search-channels.ts b/server/tests/api/search/search-channels.ts index ef78c0f67..4485c424e 100644 --- a/server/tests/api/search/search-channels.ts +++ b/server/tests/api/search/search-channels.ts @@ -122,18 +122,25 @@ describe('Test channels search', function () { it('Should filter by names', async function () { { - const body = await command.advancedChannelSearch({ search: { names: [ 'squall_channel', 'zell_channel' ] } }) - expect(body.total).to.equal(2) - expect(body.data).to.have.lengthOf(2) + const body = await command.advancedChannelSearch({ search: { handles: [ 'squall_channel', 'zell_channel' ] } }) + expect(body.total).to.equal(1) + expect(body.data).to.have.lengthOf(1) expect(body.data[0].displayName).to.equal('Squall channel') - expect(body.data[1].displayName).to.equal('Zell channel') } { - const body = await command.advancedChannelSearch({ search: { names: [ 'chocobozzz_channel' ] } }) + const body = await command.advancedChannelSearch({ search: { handles: [ 'chocobozzz_channel' ] } }) expect(body.total).to.equal(0) expect(body.data).to.have.lengthOf(0) } + + { + const body = await command.advancedChannelSearch({ search: { handles: [ 'squall_channel', 'zell_channel@' + remoteServer.host ] } }) + expect(body.total).to.equal(2) + expect(body.data).to.have.lengthOf(2) + expect(body.data[0].displayName).to.equal('Squall channel') + expect(body.data[1].displayName).to.equal('Zell channel') + } }) after(async function () { -- cgit v1.2.3