Improve tests when waiting pending jobs

[github/Chocobozzz/PeerTube.git] / server / tests / client.ts

diff --git a/server/tests/client.ts b/server/tests/client.ts
index 5f947ed2b98e632fa9520d59ce598d0a911847c1..68765545221927c2eec9c7e07630438a4730ea7d 100644 (file)
--- a/server/tests/client.ts
+++ b/server/tests/client.ts
@@ -9,9 +9,9 @@ import {
   ServerInfo,
   flushTests,
   runServer,
-  loginAndGetAccessToken,
+  serverLogin,
   uploadVideo,
-  getVideosList
+  getVideosList, updateCustomConfig, getCustomConfig, killallServers
 } from './utils'
 
 describe('Test a client controllers', function () {
@@ -23,11 +23,11 @@ describe('Test a client controllers', function () {
     await flushTests()
 
     server = await runServer(1)
-    server.accessToken = await loginAndGetAccessToken(server)
+    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 +41,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 +73,35 @@ 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)
+
+    expect(res.text).to.contain('<meta property="twitter:card" content="summary_large_image" />')
+    expect(res.text).to.contain('<meta property="twitter:site" content="@Chocobozzz" />')
+  })
 
-    // Keep the logs if the test failed
-    if (this['ok']) {
-      await flushTests()
+  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" />')
+  })
+
+  after(async function () {
+    killallServers([ server ])
   })
 })