From 1f5221fb4a511bb175083a9c7f578679c6122ce3 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 24 Aug 2020 13:37:49 +0200 Subject: Move html injection plugin tests in its own file --- server/tests/api/server/plugins.ts | 48 ++------------------ server/tests/plugins/html-injection.ts | 83 ++++++++++++++++++++++++++++++++++ server/tests/plugins/index.ts | 1 + 3 files changed, 89 insertions(+), 43 deletions(-) create mode 100644 server/tests/plugins/html-injection.ts (limited to 'server/tests') diff --git a/server/tests/api/server/plugins.ts b/server/tests/api/server/plugins.ts index ad0a5139b..ecf7c0d3f 100644 --- a/server/tests/api/server/plugins.ts +++ b/server/tests/api/server/plugins.ts @@ -11,7 +11,6 @@ import { getPlugin, getPluginPackageJSON, getPluginRegisteredSettings, - getPluginsCSS, getPublicSettings, installPlugin, killallServers, @@ -28,17 +27,16 @@ import { updatePluginPackageJSON, updatePluginSettings, wait, - waitUntilLog, - makeHTMLRequest + waitUntilLog } from '../../../../shared/extra-utils' -import { PluginType } from '../../../../shared/models/plugins/plugin.type' import { PeerTubePluginIndex } from '../../../../shared/models/plugins/peertube-plugin-index.model' -import { ServerConfig } from '../../../../shared/models/server' import { PeerTubePlugin } from '../../../../shared/models/plugins/peertube-plugin.model' -import { User } from '../../../../shared/models/users' import { PluginPackageJson } from '../../../../shared/models/plugins/plugin-package-json.model' -import { RegisteredServerSettings } from '../../../../shared/models/plugins/register-server-setting.model' +import { PluginType } from '../../../../shared/models/plugins/plugin.type' import { PublicServerSetting } from '../../../../shared/models/plugins/public-server.setting' +import { RegisteredServerSettings } from '../../../../shared/models/plugins/register-server-setting.model' +import { ServerConfig } from '../../../../shared/models/server' +import { User } from '../../../../shared/models/users' const expect = chai.expect @@ -119,18 +117,6 @@ describe('Test plugins', function () { } }) - it('Should have an empty global css', async function () { - { - const res = await getPluginsCSS(server.url) - expect(res.text).to.be.empty - } - - for (const path of [ '/', '/videos/embed/1', '/video-playlists/embed/1' ]) { - const res = await makeHTMLRequest(server.url, path) - expect(res.text).to.not.include('link rel="stylesheet" href="/plugins/global.css') - } - }) - it('Should install a plugin and a theme', async function () { this.timeout(30000) @@ -147,18 +133,6 @@ describe('Test plugins', function () { }) }) - it('Should have the correct global css', async function () { - { - const res = await getPluginsCSS(server.url) - expect(res.text).to.contain('background-color: red') - } - - for (const path of [ '/', '/videos/embed/1', '/video-playlists/embed/1' ]) { - const res = await makeHTMLRequest(server.url, path) - expect(res.text).to.include('link rel="stylesheet" href="/plugins/global.css') - } - }) - it('Should have the plugin loaded in the configuration', async function () { const res = await getConfig(server.url) const config: ServerConfig = res.body @@ -400,18 +374,6 @@ describe('Test plugins', function () { expect(res.body.data).to.have.lengthOf(0) }) - it('Should have an empty global css', async function () { - { - const res = await getPluginsCSS(server.url) - expect(res.text).to.be.empty - } - - for (const path of [ '/', '/videos/embed/1', '/video-playlists/embed/1' ]) { - const res = await makeHTMLRequest(server.url, path) - expect(res.text).to.not.include('link rel="stylesheet" href="/plugins/global.css') - } - }) - it('Should list uninstalled plugins', async function () { const res = await listPlugins({ url: server.url, diff --git a/server/tests/plugins/html-injection.ts b/server/tests/plugins/html-injection.ts new file mode 100644 index 000000000..293c1df21 --- /dev/null +++ b/server/tests/plugins/html-injection.ts @@ -0,0 +1,83 @@ +/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ + +import 'mocha' +import * as chai from 'chai' +import { + cleanupTests, + flushAndRunServer, + getPluginsCSS, + installPlugin, + makeHTMLRequest, + ServerInfo, + setAccessTokensToServers, + uninstallPlugin +} from '../../../shared/extra-utils' + +const expect = chai.expect + +describe('Test plugins HTML inection', function () { + let server: ServerInfo = null + + before(async function () { + this.timeout(30000) + + server = await flushAndRunServer(1) + await setAccessTokensToServers([ server ]) + }) + + it('Should not inject global css file in HTML', async function () { + { + const res = await getPluginsCSS(server.url) + expect(res.text).to.be.empty + } + + for (const path of [ '/', '/videos/embed/1', '/video-playlists/embed/1' ]) { + const res = await makeHTMLRequest(server.url, path) + expect(res.text).to.not.include('link rel="stylesheet" href="/plugins/global.css') + } + }) + + it('Should install a plugin and a theme', async function () { + this.timeout(30000) + + await installPlugin({ + url: server.url, + accessToken: server.accessToken, + npmName: 'peertube-plugin-hello-world' + }) + }) + + it('Should have the correct global css', async function () { + { + const res = await getPluginsCSS(server.url) + expect(res.text).to.contain('background-color: red') + } + + for (const path of [ '/', '/videos/embed/1', '/video-playlists/embed/1' ]) { + const res = await makeHTMLRequest(server.url, path) + expect(res.text).to.include('link rel="stylesheet" href="/plugins/global.css') + } + }) + + it('Should have an empty global css on uninstall', async function () { + await uninstallPlugin({ + url: server.url, + accessToken: server.accessToken, + npmName: 'peertube-plugin-hello-world' + }) + + { + const res = await getPluginsCSS(server.url) + expect(res.text).to.be.empty + } + + for (const path of [ '/', '/videos/embed/1', '/video-playlists/embed/1' ]) { + const res = await makeHTMLRequest(server.url, path) + expect(res.text).to.not.include('link rel="stylesheet" href="/plugins/global.css') + } + }) + + after(async function () { + await cleanupTests([ server ]) + }) +}) diff --git a/server/tests/plugins/index.ts b/server/tests/plugins/index.ts index 39c4c958a..b870a4055 100644 --- a/server/tests/plugins/index.ts +++ b/server/tests/plugins/index.ts @@ -1,4 +1,5 @@ import './action-hooks' +import './html-injection' import './id-and-pass-auth' import './external-auth' import './filter-hooks' -- cgit v1.2.3