X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fcheck-params%2Fservices.ts;h=d15753aedd61d2319cb00117fedfc3b5d16e803d;hb=bfbd912886eba17b4aa9a40dcef2fddc685d85bf;hp=f82520574e588f9448c16ded2887cdf32712dcb1;hpb=c5d31dba56d669c0df0209761c43c5a6ac7cec4a;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/check-params/services.ts b/server/tests/api/check-params/services.ts
index f82520574..d15753aed 100644
--- a/server/tests/api/check-params/services.ts
+++ b/server/tests/api/check-params/services.ts
@@ -1,159 +1,107 @@
 /* tslint:disable:no-unused-expression */
 
-import * as request from 'supertest'
 import 'mocha'
 
 import {
-  flushTests,
-  runServer,
+  cleanupTests,
+  flushAndRunServer,
+  makeGetRequest,
+  ServerInfo,
   setAccessTokensToServers,
-  killallServers
-} from '../../utils'
-import { getVideosList, uploadVideo } from '../../utils/videos/videos'
+  uploadVideo
+} from '../../../../shared/extra-utils'
 
 describe('Test services API validators', function () {
-  let server
+  let server: ServerInfo
 
   // ---------------------------------------------------------------
 
   before(async function () {
     this.timeout(60000)
 
-    await flushTests()
-
-    server = await runServer(1)
+    server = await flushAndRunServer(1)
     await setAccessTokensToServers([ server ])
 
-    const videoAttributes = {
-      name: 'my super name'
-    }
-    await uploadVideo(server.url, server.accessToken, videoAttributes)
-
-    const res = await getVideosList(server.url)
-    server.video = res.body.data[0]
+    const res = await uploadVideo(server.url, server.accessToken, { name: 'my super name' })
+    server.video = res.body.video
   })
 
   describe('Test oEmbed API validators', function () {
-    const path = '/services/oembed'
 
     it('Should fail with an invalid url', async function () {
       const embedUrl = 'hello.com'
-
-      await request(server.url)
-        .get(path)
-        .query({ url: embedUrl })
-        .set('Accept', 'application/json')
-        .set('Authorization', 'Bearer ' + server.accessToken)
-        .expect(400)
+      await checkParamEmbed(server, embedUrl)
     })
 
     it('Should fail with an invalid host', async function () {
       const embedUrl = 'http://hello.com/videos/watch/' + server.video.uuid
-
-      await request(server.url)
-        .get(path)
-        .query({ url: embedUrl })
-        .set('Accept', 'application/json')
-        .set('Authorization', 'Bearer ' + server.accessToken)
-        .expect(400)
+      await checkParamEmbed(server, embedUrl)
     })
 
     it('Should fail with an invalid video id', async function () {
-      const embedUrl = 'http://localhost:9001/videos/watch/blabla'
-
-      await request(server.url)
-        .get(path)
-        .query({ url: embedUrl })
-        .set('Accept', 'application/json')
-        .set('Authorization', 'Bearer ' + server.accessToken)
-        .expect(400)
+      const embedUrl = `http://localhost:${server.port}/videos/watch/blabla`
+      await checkParamEmbed(server, embedUrl)
     })
 
     it('Should fail with an unknown video', async function () {
-      const embedUrl = 'http://localhost:9001/videos/watch/88fc0165-d1f0-4a35-a51a-3b47f668689c'
-
-      await request(server.url)
-        .get(path)
-        .query({ url: embedUrl })
-        .set('Accept', 'application/json')
-        .set('Authorization', 'Bearer ' + server.accessToken)
-        .expect(404)
+      const embedUrl = `http://localhost:${server.port}/videos/watch/88fc0165-d1f0-4a35-a51a-3b47f668689c`
+      await checkParamEmbed(server, embedUrl, 404)
     })
 
     it('Should fail with an invalid path', async function () {
-      const embedUrl = 'http://localhost:9001/videos/watchs/' + server.video.uuid
-
-      await request(server.url)
-        .get(path)
-        .query({ url: embedUrl })
-        .set('Accept', 'application/json')
-        .set('Authorization', 'Bearer ' + server.accessToken)
-        .expect(400)
+      const embedUrl = `http://localhost:${server.port}/videos/watchs/${server.video.uuid}`
+
+      await checkParamEmbed(server, embedUrl)
     })
 
     it('Should fail with an invalid max height', async function () {
-      const embedUrl = 'http://localhost:9001/videos/watch/' + server.video.uuid
-
-      await request(server.url)
-        .get(path)
-        .query({
-          url: embedUrl,
-          maxheight: 'hello'
-        })
-        .set('Accept', 'application/json')
-        .set('Authorization', 'Bearer ' + server.accessToken)
-        .expect(400)
+      const embedUrl = `http://localhost:${server.port}/videos/watch/${server.video.uuid}`
+
+      await checkParamEmbed(server, embedUrl, 400, { maxheight: 'hello' })
     })
 
     it('Should fail with an invalid max width', async function () {
-      const embedUrl = 'http://localhost:9001/videos/watch/' + server.video.uuid
-
-      await request(server.url)
-        .get(path)
-        .query({
-          url: embedUrl,
-          maxwidth: 'hello'
-        })
-        .set('Accept', 'application/json')
-        .set('Authorization', 'Bearer ' + server.accessToken)
-        .expect(400)
+      const embedUrl = `http://localhost:${server.port}/videos/watch/${server.video.uuid}`
+
+      await checkParamEmbed(server, embedUrl, 400, { maxwidth: 'hello' })
     })
 
     it('Should fail with an invalid format', async function () {
-      const embedUrl = 'http://localhost:9001/videos/watch/' + server.video.uuid
-
-      await request(server.url)
-        .get(path)
-        .query({
-          url: embedUrl,
-          format: 'blabla'
-        })
-        .set('Accept', 'application/json')
-        .set('Authorization', 'Bearer ' + server.accessToken)
-        .expect(400)
+      const embedUrl = `http://localhost:${server.port}/videos/watch/${server.video.uuid}`
+
+      await checkParamEmbed(server, embedUrl, 400, { format: 'blabla' })
     })
 
     it('Should fail with a non supported format', async function () {
-      const embedUrl = 'http://localhost:9001/videos/watch/' + server.video.uuid
-
-      await request(server.url)
-        .get(path)
-        .query({
-          url: embedUrl,
-          format: 'xml'
-        })
-        .set('Accept', 'application/json')
-        .set('Authorization', 'Bearer ' + server.accessToken)
-        .expect(501)
+      const embedUrl = `http://localhost:${server.port}/videos/watch/${server.video.uuid}`
+
+      await checkParamEmbed(server, embedUrl, 501, { format: 'xml' })
+    })
+
+    it('Should succeed with the correct params', async function () {
+      const embedUrl = `http://localhost:${server.port}/videos/watch/${server.video.uuid}`
+      const query = {
+        format: 'json',
+        maxheight: 400,
+        maxwidth: 400
+      }
+
+      await checkParamEmbed(server, embedUrl, 200, query)
     })
   })
 
   after(async function () {
-    killallServers([ server ])
-
-    // Keep the logs if the test failed
-    if (this['ok']) {
-      await flushTests()
-    }
+    await cleanupTests([ server ])
   })
 })
+
+function checkParamEmbed (server: ServerInfo, embedUrl: string, statusCodeExpected = 400, query = {}) {
+  const path = '/services/oembed'
+
+  return makeGetRequest({
+    url: server.url,
+    path,
+    query: Object.assign(query, { url: embedUrl }),
+    statusCodeExpected
+  })
+}