aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
authorRigel Kent <sendmemail@rigelk.eu>2020-03-08 17:33:40 +0100
committerChocobozzz <chocobozzz@cpy.re>2020-03-10 16:23:40 +0100
commit482fa503e545e00252e25eee7b3e0f7d421cf9d4 (patch)
tree4aa27a683656ced173fe48b914cfd7d65b289717 /server
parent3b20bdd6dc7402b0723e038c57f0606131e20e54 (diff)
downloadPeerTube-482fa503e545e00252e25eee7b3e0f7d421cf9d4.tar.gz
PeerTube-482fa503e545e00252e25eee7b3e0f7d421cf9d4.tar.zst
PeerTube-482fa503e545e00252e25eee7b3e0f7d421cf9d4.zip
Use grid to organise settings in admin, my-account
Diffstat (limited to 'server')
-rw-r--r--server/tests/api/server/config.ts3
-rw-r--r--server/tests/client.ts3
2 files changed, 2 insertions, 4 deletions
diff --git a/server/tests/api/server/config.ts b/server/tests/api/server/config.ts
index 642525455..1d81e1dce 100644
--- a/server/tests/api/server/config.ts
+++ b/server/tests/api/server/config.ts
@@ -27,8 +27,7 @@ const expect = chai.expect
27function checkInitialConfig (server: ServerInfo, data: CustomConfig) { 27function checkInitialConfig (server: ServerInfo, data: CustomConfig) {
28 expect(data.instance.name).to.equal('PeerTube') 28 expect(data.instance.name).to.equal('PeerTube')
29 expect(data.instance.shortDescription).to.equal( 29 expect(data.instance.shortDescription).to.equal(
30 'PeerTube, a federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser ' + 30 'PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.'
31 'with WebTorrent and Angular.'
32 ) 31 )
33 expect(data.instance.description).to.equal('Welcome to this PeerTube instance!') 32 expect(data.instance.description).to.equal('Welcome to this PeerTube instance!')
34 33
diff --git a/server/tests/client.ts b/server/tests/client.ts
index d61724e51..670bc6701 100644
--- a/server/tests/client.ts
+++ b/server/tests/client.ts
@@ -112,8 +112,7 @@ describe('Test a client controllers', function () {
112 it('Should have valid index html tags (title, description...)', async function () { 112 it('Should have valid index html tags (title, description...)', async function () {
113 const res = await makeHTMLRequest(server.url, '/videos/trending') 113 const res = await makeHTMLRequest(server.url, '/videos/trending')
114 114
115 const description = 'PeerTube, a federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser ' + 115 const description = 'PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.'
116 'with WebTorrent and Angular.'
117 checkIndexTags(res.text, 'PeerTube', description, '') 116 checkIndexTags(res.text, 'PeerTube', description, '')
118 }) 117 })
119 118