X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fclient.ts;h=778dcd08e549f59176ca9c6efa7a516a0bc390eb;hb=e590b4a512617bbf63595b684386f68abea7d8b8;hp=5f947ed2b98e632fa9520d59ce598d0a911847c1;hpb=d8755eed1e452d2efbfc983af0e9d228d152bf6b;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/client.ts b/server/tests/client.ts
index 5f947ed2b..778dcd08e 100644
--- a/server/tests/client.ts
+++ b/server/tests/client.ts
@@ -3,16 +3,26 @@
 import 'mocha'
 import * as chai from 'chai'
 import * as request from 'supertest'
-const expect = chai.expect
-
 import {
+  cleanupTests,
+  flushAndRunServer,
+  getCustomConfig,
+  getVideosList,
+  makeHTMLRequest,
   ServerInfo,
-  flushTests,
-  runServer,
-  loginAndGetAccessToken,
-  uploadVideo,
-  getVideosList
-} from './utils'
+  serverLogin,
+  updateCustomConfig,
+  updateCustomSubConfig,
+  uploadVideo
+} from '../../shared/extra-utils'
+
+const expect = chai.expect
+
+function checkIndexTags (html: string, title: string, description: string, css: string) {
+  expect(html).to.contain('<title>' + title + '</title>')
+  expect(html).to.contain('<meta name="description" content="' + description + '" />')
+  expect(html).to.contain('<style class="custom-css-style">' + css + '</style>')
+}
 
 describe('Test a client controllers', function () {
   let server: ServerInfo
@@ -20,14 +30,12 @@ describe('Test a client controllers', function () {
   before(async function () {
     this.timeout(120000)
 
-    await flushTests()
-
-    server = await runServer(1)
-    server.accessToken = await loginAndGetAccessToken(server)
+    server = await flushAndRunServer(1)
+    server.accessToken = await serverLogin(server)
 
     const videoAttributes = {
-      name: 'my super name for pod 1',
-      description: 'my super description for pod 1'
+      name: 'my super name for server 1',
+      description: 'my super description for server 1'
     }
     await uploadVideo(server.url, server.accessToken, videoAttributes)
 
@@ -41,26 +49,29 @@ describe('Test a client controllers', function () {
 
   it('Should have valid Open Graph tags on the watch page with video id', async function () {
     const res = await request(server.url)
-                        .get('/videos/watch/' + server.video.id)
-                        .expect(200)
+      .get('/videos/watch/' + server.video.id)
+      .set('Accept', 'text/html')
+      .expect(200)
 
-    expect(res.text).to.contain('<meta property="og:title" content="my super name for pod 1" />')
-    expect(res.text).to.contain('<meta property="og:description" content="my super description for pod 1" />')
+    expect(res.text).to.contain('<meta property="og:title" content="my super name for server 1" />')
+    expect(res.text).to.contain('<meta property="og:description" content="my super description for server 1" />')
   })
 
   it('Should have valid Open Graph tags on the watch page with video uuid', async function () {
     const res = await request(server.url)
-                        .get('/videos/watch/' + server.video.uuid)
-                        .expect(200)
+      .get('/videos/watch/' + server.video.uuid)
+      .set('Accept', 'text/html')
+      .expect(200)
 
-    expect(res.text).to.contain('<meta property="og:title" content="my super name for pod 1" />')
-    expect(res.text).to.contain('<meta property="og:description" content="my super description for pod 1" />')
+    expect(res.text).to.contain('<meta property="og:title" content="my super name for server 1" />')
+    expect(res.text).to.contain('<meta property="og:description" content="my super description for server 1" />')
   })
 
   it('Should have valid oEmbed discovery tags', async function () {
     const path = '/videos/watch/' + server.video.uuid
     const res = await request(server.url)
       .get(path)
+      .set('Accept', 'text/html')
       .expect(200)
 
     const expectedLink = '<link rel="alternate" type="application/json+oembed" href="http://localhost:9001/services/oembed?' +
@@ -70,12 +81,70 @@ describe('Test a client controllers', function () {
     expect(res.text).to.contain(expectedLink)
   })
 
-  after(async function () {
-    process.kill(-server.app.pid)
+  it('Should have valid twitter card', async function () {
+    const res = await request(server.url)
+      .get('/videos/watch/' + server.video.uuid)
+      .set('Accept', 'text/html')
+      .expect(200)
 
-    // Keep the logs if the test failed
-    if (this['ok']) {
-      await flushTests()
+    expect(res.text).to.contain('<meta property="twitter:card" content="summary_large_image" />')
+    expect(res.text).to.contain('<meta property="twitter:site" content="@Chocobozzz" />')
+  })
+
+  it('Should have valid twitter card if Twitter is whitelisted', async function () {
+    const res1 = await getCustomConfig(server.url, server.accessToken)
+    const config = res1.body
+    config.services.twitter = {
+      username: '@Kuja',
+      whitelisted: true
     }
+    await updateCustomConfig(server.url, server.accessToken, config)
+
+    const res = await request(server.url)
+      .get('/videos/watch/' + server.video.uuid)
+      .set('Accept', 'text/html')
+      .expect(200)
+
+    expect(res.text).to.contain('<meta property="twitter:card" content="player" />')
+    expect(res.text).to.contain('<meta property="twitter:site" content="@Kuja" />')
+  })
+
+  it('Should have valid index html tags (title, description...)', async function () {
+    const res = await makeHTMLRequest(server.url, '/videos/trending')
+
+    const description = 'PeerTube, a federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser ' +
+      'with WebTorrent and Angular.'
+    checkIndexTags(res.text, 'PeerTube', description, '')
+  })
+
+  it('Should update the customized configuration and have the correct index html tags', async function () {
+    await updateCustomSubConfig(server.url, server.accessToken, {
+      instance: {
+        name: 'PeerTube updated',
+        shortDescription: 'my short description',
+        description: 'my super description',
+        terms: 'my super terms',
+        defaultClientRoute: '/videos/recently-added',
+        defaultNSFWPolicy: 'blur',
+        customizations: {
+          javascript: 'alert("coucou")',
+          css: 'body { background-color: red; }'
+        }
+      }
+    })
+
+    const res = await makeHTMLRequest(server.url, '/videos/trending')
+
+    checkIndexTags(res.text, 'PeerTube updated', 'my short description', 'body { background-color: red; }')
+  })
+
+  it('Should have valid index html updated tags (title, description...)', async function () {
+    const res = await makeHTMLRequest(server.url, '/videos/trending')
+
+    checkIndexTags(res.text, 'PeerTube updated', 'my short description', 'body { background-color: red; }')
+  })
+
+  after(async function () {
+    await cleanupTests([ server ])
   })
 })