X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fmisc-endpoints.ts;h=698d833283caea5b5a03e0463ccc1f2231b91453;hb=f2eb23cd87cf32b8fe545178143b5f49e06a58da;hp=4de47d693069acbad25c2a8e6312554eb9350996;hpb=314141279db4826bf4862576b7e0df104834ad00;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/misc-endpoints.ts b/server/tests/misc-endpoints.ts
index 4de47d693..698d83328 100644
--- a/server/tests/misc-endpoints.ts
+++ b/server/tests/misc-endpoints.ts
@@ -1,19 +1,19 @@
-/* tslint:disable:no-unused-expression */
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
 import 'mocha'
 import * as chai from 'chai'
 import {
   addVideoChannel,
+  cleanupTests,
   createUser,
-  flushTests,
-  killallServers,
+  flushAndRunServer,
   makeGetRequest,
-  runServer,
   ServerInfo,
   setAccessTokensToServers,
   uploadVideo
-} from './utils'
+} from '../../shared/extra-utils'
 import { VideoPrivacy } from '../../shared/models/videos'
+import { HttpStatusCode } from '@shared/core-utils'
 
 const expect = chai.expect
 
@@ -23,9 +23,7 @@ describe('Test misc endpoints', function () {
   before(async function () {
     this.timeout(120000)
 
-    await flushTests()
-
-    server = await runServer(1)
+    server = await flushAndRunServer(1)
     await setAccessTokensToServers([ server ])
   })
 
@@ -35,7 +33,7 @@ describe('Test misc endpoints', function () {
       const res = await makeGetRequest({
         url: server.url,
         path: '/.well-known/security.txt',
-        statusCodeExpected: 200
+        statusCodeExpected: HttpStatusCode.OK_200
       })
 
       expect(res.text).to.contain('security issue')
@@ -45,7 +43,7 @@ describe('Test misc endpoints', function () {
       const res = await makeGetRequest({
         url: server.url,
         path: '/.well-known/nodeinfo',
-        statusCodeExpected: 200
+        statusCodeExpected: HttpStatusCode.OK_200
       })
 
       expect(res.body.links).to.be.an('array')
@@ -57,7 +55,7 @@ describe('Test misc endpoints', function () {
       const res = await makeGetRequest({
         url: server.url,
         path: '/.well-known/dnt-policy.txt',
-        statusCodeExpected: 200
+        statusCodeExpected: HttpStatusCode.OK_200
       })
 
       expect(res.text).to.contain('http://www.w3.org/TR/tracking-dnt')
@@ -67,7 +65,7 @@ describe('Test misc endpoints', function () {
       const res = await makeGetRequest({
         url: server.url,
         path: '/.well-known/dnt',
-        statusCodeExpected: 200
+        statusCodeExpected: HttpStatusCode.OK_200
       })
 
       expect(res.body.tracking).to.equal('N')
@@ -77,7 +75,7 @@ describe('Test misc endpoints', function () {
       const res = await makeGetRequest({
         url: server.url,
         path: '/.well-known/change-password',
-        statusCodeExpected: 302
+        statusCodeExpected: HttpStatusCode.FOUND_302
       })
 
       expect(res.header.location).to.equal('/my-account/settings')
@@ -90,7 +88,7 @@ describe('Test misc endpoints', function () {
       const res = await makeGetRequest({
         url: server.url,
         path: '/robots.txt',
-        statusCodeExpected: 200
+        statusCodeExpected: HttpStatusCode.OK_200
       })
 
       expect(res.text).to.contain('User-agent')
@@ -100,7 +98,7 @@ describe('Test misc endpoints', function () {
       await makeGetRequest({
         url: server.url,
         path: '/security.txt',
-        statusCodeExpected: 301
+        statusCodeExpected: HttpStatusCode.MOVED_PERMANENTLY_301
       })
     })
 
@@ -108,7 +106,7 @@ describe('Test misc endpoints', function () {
       const res = await makeGetRequest({
         url: server.url,
         path: '/nodeinfo/2.0.json',
-        statusCodeExpected: 200
+        statusCodeExpected: HttpStatusCode.OK_200
       })
 
       expect(res.body.software.name).to.equal('peertube')
@@ -121,22 +119,22 @@ describe('Test misc endpoints', function () {
       const res = await makeGetRequest({
         url: server.url,
         path: '/sitemap.xml',
-        statusCodeExpected: 200
+        statusCodeExpected: HttpStatusCode.OK_200
       })
 
       expect(res.text).to.contain('xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"')
-      expect(res.text).to.contain('<url><loc>http://localhost:9001/about/instance</loc></url>')
+      expect(res.text).to.contain('<url><loc>http://localhost:' + server.port + '/about/instance</loc></url>')
     })
 
     it('Should get the empty cached sitemap', async function () {
       const res = await makeGetRequest({
         url: server.url,
         path: '/sitemap.xml',
-        statusCodeExpected: 200
+        statusCodeExpected: HttpStatusCode.OK_200
       })
 
       expect(res.text).to.contain('xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"')
-      expect(res.text).to.contain('<url><loc>http://localhost:9001/about/instance</loc></url>')
+      expect(res.text).to.contain('<url><loc>http://localhost:' + server.port + '/about/instance</loc></url>')
     })
 
     it('Should add videos, channel and accounts and get sitemap', async function () {
@@ -149,31 +147,31 @@ describe('Test misc endpoints', function () {
       await addVideoChannel(server.url, server.accessToken, { name: 'channel1', displayName: 'channel 1' })
       await addVideoChannel(server.url, server.accessToken, { name: 'channel2', displayName: 'channel 2' })
 
-      await createUser(server.url, server.accessToken, 'user1', 'password')
-      await createUser(server.url, server.accessToken, 'user2', 'password')
+      await createUser({ url: server.url, accessToken: server.accessToken, username: 'user1', password: 'password' })
+      await createUser({ url: server.url, accessToken: server.accessToken, username: 'user2', password: 'password' })
 
       const res = await makeGetRequest({
         url: server.url,
         path: '/sitemap.xml?t=1', // avoid using cache
-        statusCodeExpected: 200
+        statusCodeExpected: HttpStatusCode.OK_200
       })
 
       expect(res.text).to.contain('xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"')
-      expect(res.text).to.contain('<url><loc>http://localhost:9001/about/instance</loc></url>')
+      expect(res.text).to.contain('<url><loc>http://localhost:' + server.port + '/about/instance</loc></url>')
 
-      expect(res.text).to.contain('<video:title><![CDATA[video 1]]></video:title>')
-      expect(res.text).to.contain('<video:title><![CDATA[video 2]]></video:title>')
-      expect(res.text).to.not.contain('<video:title><![CDATA[video 3]]></video:title>')
+      expect(res.text).to.contain('<video:title>video 1</video:title>')
+      expect(res.text).to.contain('<video:title>video 2</video:title>')
+      expect(res.text).to.not.contain('<video:title>video 3</video:title>')
 
-      expect(res.text).to.contain('<url><loc>http://localhost:9001/video-channels/channel1</loc></url>')
-      expect(res.text).to.contain('<url><loc>http://localhost:9001/video-channels/channel2</loc></url>')
+      expect(res.text).to.contain('<url><loc>http://localhost:' + server.port + '/video-channels/channel1</loc></url>')
+      expect(res.text).to.contain('<url><loc>http://localhost:' + server.port + '/video-channels/channel2</loc></url>')
 
-      expect(res.text).to.contain('<url><loc>http://localhost:9001/accounts/user1</loc></url>')
-      expect(res.text).to.contain('<url><loc>http://localhost:9001/accounts/user2</loc></url>')
+      expect(res.text).to.contain('<url><loc>http://localhost:' + server.port + '/accounts/user1</loc></url>')
+      expect(res.text).to.contain('<url><loc>http://localhost:' + server.port + '/accounts/user2</loc></url>')
     })
   })
 
   after(async function () {
-    killallServers([ server ])
+    await cleanupTests([ server ])
   })
 })