From 2769876fb26742f5cc8aa4b761be7bafca97d18d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 17 Mar 2022 09:09:06 +0100 Subject: Fix client html cache on theme update --- server/tests/api/check-params/video-editor.ts | 3 + server/tests/api/server/plugins.ts | 104 +++++++++++++++----------- 2 files changed, 64 insertions(+), 43 deletions(-) (limited to 'server/tests/api') diff --git a/server/tests/api/check-params/video-editor.ts b/server/tests/api/check-params/video-editor.ts index 1fd22c497..5f5faf8fb 100644 --- a/server/tests/api/check-params/video-editor.ts +++ b/server/tests/api/check-params/video-editor.ts @@ -122,7 +122,10 @@ describe('Test video editor API validator', function () { }) it('Should fail with an already in transcoding state video', async function () { + this.timeout(30000) + const { uuid } = await server.videos.quickUpload({ name: 'transcoded video' }) + await waitJobs([ server ]) await server.jobs.pauseJobQueue() await server.videos.runTranscoding({ videoId: uuid, transcodingType: 'hls' }) diff --git a/server/tests/api/server/plugins.ts b/server/tests/api/server/plugins.ts index 76d3e2481..8aa34fb15 100644 --- a/server/tests/api/server/plugins.ts +++ b/server/tests/api/server/plugins.ts @@ -95,15 +95,15 @@ describe('Test plugins', function () { }) it('Should have the plugin loaded in the configuration', async function () { - const config = await server.config.getConfig() - - const theme = config.theme.registered.find(r => r.name === 'background-red') - expect(theme).to.not.be.undefined - expect(theme.npmName).to.equal('peertube-theme-background-red') - - const plugin = config.plugin.registered.find(r => r.name === 'hello-world') - expect(plugin).to.not.be.undefined - expect(plugin.npmName).to.equal('peertube-plugin-hello-world') + for (const config of [ await server.config.getConfig(), await server.config.getIndexHTMLConfig() ]) { + const theme = config.theme.registered.find(r => r.name === 'background-red') + expect(theme).to.not.be.undefined + expect(theme.npmName).to.equal('peertube-theme-background-red') + + const plugin = config.plugin.registered.find(r => r.name === 'hello-world') + expect(plugin).to.not.be.undefined + expect(plugin.npmName).to.equal('peertube-plugin-hello-world') + } }) it('Should update the default theme in the configuration', async function () { @@ -113,8 +113,9 @@ describe('Test plugins', function () { } }) - const config = await server.config.getConfig() - expect(config.theme.default).to.equal('background-red') + for (const config of [ await server.config.getConfig(), await server.config.getIndexHTMLConfig() ]) { + expect(config.theme.default).to.equal('background-red') + } }) it('Should update my default theme', async function () { @@ -228,45 +229,62 @@ describe('Test plugins', function () { }) it('Should update the plugin and the theme', async function () { - this.timeout(90000) + this.timeout(180000) // Wait the scheduler that get the latest plugins versions await wait(6000) - // Fake update our plugin version - await server.sql.setPluginVersion('hello-world', '0.0.1') + async function testUpdate (type: 'plugin' | 'theme', name: string) { + // Fake update our plugin version + await server.sql.setPluginVersion(name, '0.0.1') - // Fake update package.json - const packageJSON = await command.getPackageJSON('peertube-plugin-hello-world') - const oldVersion = packageJSON.version + // Fake update package.json + const packageJSON = await command.getPackageJSON(`peertube-${type}-${name}`) + const oldVersion = packageJSON.version - packageJSON.version = '0.0.1' - await command.updatePackageJSON('peertube-plugin-hello-world', packageJSON) + packageJSON.version = '0.0.1' + await command.updatePackageJSON(`peertube-${type}-${name}`, packageJSON) - // Restart the server to take into account this change - await killallServers([ server ]) - await server.run() + // Restart the server to take into account this change + await killallServers([ server ]) + await server.run() - { - const body = await command.list({ pluginType: PluginType.PLUGIN }) + const checkConfig = async (version: string) => { + for (const config of [ await server.config.getConfig(), await server.config.getIndexHTMLConfig() ]) { + expect(config[type].registered.find(r => r.name === name).version).to.equal(version) + } + } - const plugin = body.data[0] - expect(plugin.version).to.equal('0.0.1') - expect(plugin.latestVersion).to.exist - expect(plugin.latestVersion).to.not.equal('0.0.1') - } + const getPluginFromAPI = async () => { + const body = await command.list({ pluginType: type === 'plugin' ? PluginType.PLUGIN : PluginType.THEME }) - { - await command.update({ npmName: 'peertube-plugin-hello-world' }) + return body.data.find(p => p.name === name) + } - const body = await command.list({ pluginType: PluginType.PLUGIN }) + { + const plugin = await getPluginFromAPI() + expect(plugin.version).to.equal('0.0.1') + expect(plugin.latestVersion).to.exist + expect(plugin.latestVersion).to.not.equal('0.0.1') + + await checkConfig('0.0.1') + } + + { + await command.update({ npmName: `peertube-${type}-${name}` }) - const plugin = body.data[0] - expect(plugin.version).to.equal(oldVersion) + const plugin = await getPluginFromAPI() + expect(plugin.version).to.equal(oldVersion) - const updatedPackageJSON = await command.getPackageJSON('peertube-plugin-hello-world') - expect(updatedPackageJSON.version).to.equal(oldVersion) + const updatedPackageJSON = await command.getPackageJSON(`peertube-${type}-${name}`) + expect(updatedPackageJSON.version).to.equal(oldVersion) + + await checkConfig(oldVersion) + } } + + await testUpdate('theme', 'background-red') + await testUpdate('plugin', 'hello-world') }) it('Should uninstall the plugin', async function () { @@ -293,15 +311,15 @@ describe('Test plugins', function () { }) it('Should have updated the configuration', async function () { - const config = await server.config.getConfig() + for (const config of [ await server.config.getConfig(), await server.config.getIndexHTMLConfig() ]) { + expect(config.theme.default).to.equal('default') - expect(config.theme.default).to.equal('default') + const theme = config.theme.registered.find(r => r.name === 'background-red') + expect(theme).to.be.undefined - const theme = config.theme.registered.find(r => r.name === 'background-red') - expect(theme).to.be.undefined - - const plugin = config.plugin.registered.find(r => r.name === 'hello-world') - expect(plugin).to.be.undefined + const plugin = config.plugin.registered.find(r => r.name === 'hello-world') + expect(plugin).to.be.undefined + } }) it('Should have updated the user theme', async function () { -- cgit v1.2.3