From 84992f56069644b11f28cca2bb46277cd5912b69 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 3 Aug 2022 11:49:39 +0200 Subject: [PATCH] Fix tests --- server/tests/api/videos/video-channels.ts | 5 ++--- .../fixtures/peertube-plugin-test-id-pass-auth-three/main.js | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/server/tests/api/videos/video-channels.ts b/server/tests/api/videos/video-channels.ts index bbb9b12d6..ffe6eef73 100644 --- a/server/tests/api/videos/video-channels.ts +++ b/server/tests/api/videos/video-channels.ts @@ -430,7 +430,7 @@ describe('Test video channels', function () { expect(body.data[1].displayName).to.equal('video channel updated') }) - it('Should create the main channel with an uuid if there is a conflict', async function () { + it('Should create the main channel with a suffix if there is a conflict', async function () { { const videoChannel = { name: 'toto_channel', displayName: 'My toto channel' } const created = await servers[0].channels.create({ attributes: videoChannel }) @@ -442,8 +442,7 @@ describe('Test video channels', function () { const accessToken = await servers[0].login.getAccessToken({ username: 'toto', password: 'password' }) const { videoChannels } = await servers[0].users.getMyInfo({ token: accessToken }) - const videoChannel = videoChannels[0] - expect(videoChannel.name).to.match(/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/) + expect(videoChannels[0].name).to.equal('toto_channel-1') } }) diff --git a/server/tests/fixtures/peertube-plugin-test-id-pass-auth-three/main.js b/server/tests/fixtures/peertube-plugin-test-id-pass-auth-three/main.js index caa6a7ccd..1200acfbd 100644 --- a/server/tests/fixtures/peertube-plugin-test-id-pass-auth-three/main.js +++ b/server/tests/fixtures/peertube-plugin-test-id-pass-auth-three/main.js @@ -32,7 +32,7 @@ async function register ({ login (body) { if (body.id === 'ward') { return Promise.resolve({ - username: 'ward-42', + username: '-ward-42', email: 'ward@example.com' }) }