X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fcli%2Fupdate-host.ts;h=d3a1520cffcb21adccb866804b54f6305ae14331;hb=078f17e6d90376050f43ce639e88e11869b49ee7;hp=4358f28e303914842da63b314893d19d1375eaa6;hpb=5f04dd2f743961e0a06c29531cc3ccc9e4928d56;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/cli/update-host.ts b/server/tests/cli/update-host.ts
index 4358f28e3..d3a1520cf 100644
--- a/server/tests/cli/update-host.ts
+++ b/server/tests/cli/update-host.ts
@@ -1,21 +1,23 @@
-import 'mocha'
-import * as chai from 'chai'
-const expect = chai.expect
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
+import 'mocha'
+import { expect } from 'chai'
 import {
-  execCLI,
-  flushTests,
-  getEnvCli,
+  cleanupTests,
+  createUser,
+  flushAndRunServer,
+  getVideo,
   getVideosList,
   killallServers,
+  makeActivityPubGetRequest,
   parseTorrentVideo,
-  runServer,
+  reRunServer,
   ServerInfo,
   setAccessTokensToServers,
   uploadVideo,
-  wait,
-  getVideo
-} from '../utils'
+  waitJobs
+} from '@shared/extra-utils'
+import { VideoDetails } from '@shared/models'
 
 describe('Test update host scripts', function () {
   let server: ServerInfo
@@ -23,33 +25,92 @@ describe('Test update host scripts', function () {
   before(async function () {
     this.timeout(60000)
 
-    await flushTests()
-
     const overrideConfig = {
       webserver: {
         port: 9256
       }
     }
     // Run server 2 to have transcoding enabled
-    server = await runServer(2, overrideConfig)
+    server = await flushAndRunServer(2, overrideConfig)
     await setAccessTokensToServers([ server ])
 
     // Upload two videos for our needs
     const videoAttributes = {}
+    const resVideo1 = await uploadVideo(server.url, server.accessToken, videoAttributes)
+    const video1UUID = resVideo1.body.video.uuid
     await uploadVideo(server.url, server.accessToken, videoAttributes)
-    await uploadVideo(server.url, server.accessToken, videoAttributes)
-    await wait(30000)
+
+    // Create a user
+    await createUser({ url: server.url, accessToken: server.accessToken, username: 'toto', password: 'coucou' })
+
+    // Create channel
+    const videoChannel = {
+      name: 'second_channel',
+      displayName: 'second video channel',
+      description: 'super video channel description'
+    }
+    await server.channelsCommand.create({ attributes: videoChannel })
+
+    // Create comments
+    const text = 'my super first comment'
+    await server.commentsCommand.createThread({ videoId: video1UUID, text })
+
+    await waitJobs(server)
   })
 
-  it('Should update torrent hosts', async function () {
+  it('Should run update host', async function () {
     this.timeout(30000)
 
     killallServers([ server ])
     // Run server with standard configuration
-    server = await runServer(2)
+    await reRunServer(server)
 
-    const env = getEnvCli(server)
-    await execCLI(`${env} npm run update-host`)
+    await server.cliCommand.execWithEnv(`npm run update-host`)
+  })
+
+  it('Should have updated videos url', async function () {
+    const res = await getVideosList(server.url)
+    expect(res.body.total).to.equal(2)
+
+    for (const video of res.body.data) {
+      const { body } = await makeActivityPubGetRequest(server.url, '/videos/watch/' + video.uuid)
+
+      expect(body.id).to.equal('http://localhost:9002/videos/watch/' + video.uuid)
+
+      const res = await getVideo(server.url, video.uuid)
+      const videoDetails: VideoDetails = res.body
+
+      expect(videoDetails.trackerUrls[0]).to.include(server.host)
+      expect(videoDetails.streamingPlaylists[0].playlistUrl).to.include(server.host)
+      expect(videoDetails.streamingPlaylists[0].segmentsSha256Url).to.include(server.host)
+    }
+  })
+
+  it('Should have updated video channels url', async function () {
+    const { data, total } = await server.channelsCommand.list({ sort: '-name' })
+    expect(total).to.equal(3)
+
+    for (const channel of data) {
+      const { body } = await makeActivityPubGetRequest(server.url, '/video-channels/' + channel.name)
+
+      expect(body.id).to.equal('http://localhost:9002/video-channels/' + channel.name)
+    }
+  })
+
+  it('Should have updated accounts url', async function () {
+    const body = await server.accountsCommand.list()
+    expect(body.total).to.equal(3)
+
+    for (const account of body.data) {
+      const usernameWithDomain = account.name
+      const { body } = await makeActivityPubGetRequest(server.url, '/accounts/' + usernameWithDomain)
+
+      expect(body.id).to.equal('http://localhost:9002/accounts/' + usernameWithDomain)
+    }
+  })
+
+  it('Should have updated torrent hosts', async function () {
+    this.timeout(30000)
 
     const res = await getVideosList(server.url)
     const videos = res.body.data
@@ -57,7 +118,7 @@ describe('Test update host scripts', function () {
 
     for (const video of videos) {
       const res2 = await getVideo(server.url, video.id)
-      const videoDetails = res2.body
+      const videoDetails: VideoDetails = res2.body
 
       expect(videoDetails.files).to.have.lengthOf(4)
 
@@ -65,19 +126,19 @@ describe('Test update host scripts', function () {
         expect(file.magnetUri).to.contain('localhost%3A9002%2Ftracker%2Fsocket')
         expect(file.magnetUri).to.contain('localhost%3A9002%2Fstatic%2Fwebseed%2F')
 
-        const torrent = await parseTorrentVideo(server, videoDetails.uuid, file.resolution)
-        expect(torrent.announce[0]).to.equal('ws://localhost:9002/tracker/socket')
+        const torrent = await parseTorrentVideo(server, videoDetails.uuid, file.resolution.id)
+        const announceWS = torrent.announce.find(a => a === 'ws://localhost:9002/tracker/socket')
+        expect(announceWS).to.not.be.undefined
+
+        const announceHttp = torrent.announce.find(a => a === 'http://localhost:9002/tracker/announce')
+        expect(announceHttp).to.not.be.undefined
+
         expect(torrent.urlList[0]).to.contain('http://localhost:9002/static/webseed')
       }
     }
   })
 
   after(async function () {
-    killallServers([ server ])
-
-    // Keep the logs if the test failed
-    if (this['ok']) {
-      await flushTests()
-    }
+    await cleanupTests([ server ])
   })
 })