X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fplugins%2Fplugin-helpers.ts;h=e951a1299c02bc92a30e2f1fed33a8dbcf0a4cb8;hb=0c302acb3c358b4d4d8dee45aed1de1108ea37ea;hp=31c18350abbaa08d024fc080604e0af011189134;hpb=cea2fd90ddb3bf57c2fed77128938d12d4c2be6b;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/plugins/plugin-helpers.ts b/server/tests/plugins/plugin-helpers.ts
index 31c18350a..e951a1299 100644
--- a/server/tests/plugins/plugin-helpers.ts
+++ b/server/tests/plugins/plugin-helpers.ts
@@ -46,7 +46,7 @@ describe('Test plugin helpers', function () {
   describe('Logger', function () {
 
     it('Should have logged things', async function () {
-      await servers[0].servers.waitUntilLog('localhost:' + servers[0].port + ' peertube-plugin-test-four', 1, false)
+      await servers[0].servers.waitUntilLog(servers[0].host + ' peertube-plugin-test-four', 1, false)
       await servers[0].servers.waitUntilLog('Hello world from plugin four', 1)
     })
   })
@@ -61,7 +61,19 @@ describe('Test plugin helpers', function () {
   describe('Config', function () {
 
     it('Should have the correct webserver url', async function () {
-      await servers[0].servers.waitUntilLog(`server url is http://localhost:${servers[0].port}`)
+      await servers[0].servers.waitUntilLog(`server url is ${servers[0].url}`)
+    })
+
+    it('Should have the correct listening config', async function () {
+      const res = await makeGetRequest({
+        url: servers[0].url,
+        path: '/plugins/test-four/router/server-listening-config',
+        expectedStatus: HttpStatusCode.OK_200
+      })
+
+      expect(res.body.config).to.exist
+      expect(res.body.config.hostname).to.equal('::')
+      expect(res.body.config.port).to.equal(servers[0].port)
     })
 
     it('Should have the correct config', async function () {
@@ -207,8 +219,7 @@ describe('Test plugin helpers', function () {
     })
 
     it('Should mute server 2', async function () {
-      this.timeout(10000)
-      await postCommand(servers[0], 'blockServer', { hostToBlock: `localhost:${servers[1].port}` })
+      await postCommand(servers[0], 'blockServer', { hostToBlock: servers[1].host })
 
       const { data } = await servers[0].videos.list()
 
@@ -217,7 +228,7 @@ describe('Test plugin helpers', function () {
     })
 
     it('Should unmute server 2', async function () {
-      await postCommand(servers[0], 'unblockServer', { hostToUnblock: `localhost:${servers[1].port}` })
+      await postCommand(servers[0], 'unblockServer', { hostToUnblock: servers[1].host })
 
       const { data } = await servers[0].videos.list()
 
@@ -225,7 +236,7 @@ describe('Test plugin helpers', function () {
     })
 
     it('Should mute account of server 2', async function () {
-      await postCommand(servers[0], 'blockAccount', { handleToBlock: `root@localhost:${servers[1].port}` })
+      await postCommand(servers[0], 'blockAccount', { handleToBlock: `root@${servers[1].host}` })
 
       const { data } = await servers[0].videos.list()
 
@@ -234,7 +245,7 @@ describe('Test plugin helpers', function () {
     })
 
     it('Should unmute account of server 2', async function () {
-      await postCommand(servers[0], 'unblockAccount', { handleToUnblock: `root@localhost:${servers[1].port}` })
+      await postCommand(servers[0], 'unblockAccount', { handleToUnblock: `root@${servers[1].host}` })
 
       const { data } = await servers[0].videos.list()
 
@@ -242,8 +253,6 @@ describe('Test plugin helpers', function () {
     })
 
     it('Should blacklist video', async function () {
-      this.timeout(10000)
-
       await postCommand(servers[0], 'blacklist', { videoUUID: videoUUIDServer1, unfederate: true })
 
       await waitJobs(servers)
@@ -257,8 +266,6 @@ describe('Test plugin helpers', function () {
     })
 
     it('Should unblacklist video', async function () {
-      this.timeout(10000)
-
       await postCommand(servers[0], 'unblacklist', { videoUUID: videoUUIDServer1 })
 
       await waitJobs(servers)
@@ -275,7 +282,7 @@ describe('Test plugin helpers', function () {
     let videoUUID: string
     let videoPath: string
 
-    before(async () => {
+    before(async function () {
       this.timeout(240000)
 
       await servers[0].config.enableTranscoding()
@@ -307,7 +314,7 @@ describe('Test plugin helpers', function () {
             expect(file.fps).to.equal(25)
 
             expect(await pathExists(file.path)).to.be.true
-            await makeRawRequest(file.url, HttpStatusCode.OK_200)
+            await makeRawRequest({ url: file.url, expectedStatus: HttpStatusCode.OK_200 })
           }
         }
 
@@ -321,12 +328,12 @@ describe('Test plugin helpers', function () {
         const miniature = body.thumbnails.find(t => t.type === ThumbnailType.MINIATURE)
         expect(miniature).to.exist
         expect(await pathExists(miniature.path)).to.be.true
-        await makeRawRequest(miniature.url, HttpStatusCode.OK_200)
+        await makeRawRequest({ url: miniature.url, expectedStatus: HttpStatusCode.OK_200 })
 
         const preview = body.thumbnails.find(t => t.type === ThumbnailType.PREVIEW)
         expect(preview).to.exist
         expect(await pathExists(preview.path)).to.be.true
-        await makeRawRequest(preview.url, HttpStatusCode.OK_200)
+        await makeRawRequest({ url: preview.url, expectedStatus: HttpStatusCode.OK_200 })
       }
     })