X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fcli%2Fupdate-host.ts;h=811ea6a9f44f71871cb17fbeb466f535e593144b;hb=b9f234371bfaf0d9cfa81e02fcea92cac1f9ae13;hp=39242c494cde3f027f7053d5d196c6eac95f0087;hpb=adcaf1a8671b85f62f77058edd50fe146cb41c8e;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/cli/update-host.ts b/server/tests/cli/update-host.ts
index 39242c494..811ea6a9f 100644
--- a/server/tests/cli/update-host.ts
+++ b/server/tests/cli/update-host.ts
@@ -2,22 +2,29 @@
 
 import 'mocha'
 import * as chai from 'chai'
-const expect = chai.expect
-
+import { VideoDetails } from '../../../shared/models/videos'
+import { waitJobs } from '../../../shared/utils/server/jobs'
+import { addVideoCommentThread } from '../../../shared/utils/videos/video-comments'
 import {
+  addVideoChannel,
+  createUser,
   execCLI,
   flushTests,
   getEnvCli,
+  getVideo,
+  getVideoChannelsList,
   getVideosList,
   killallServers,
+  makeActivityPubGetRequest,
   parseTorrentVideo,
   runServer,
   ServerInfo,
   setAccessTokensToServers,
-  uploadVideo,
-  wait,
-  getVideo
-} from '../utils'
+  uploadVideo
+} from '../../../shared/utils'
+import { getAccountsList } from '../../../shared/utils/users/accounts'
+
+const expect = chai.expect
 
 describe('Test update host scripts', function () {
   let server: ServerInfo
@@ -38,12 +45,29 @@ describe('Test update host scripts', function () {
 
     // 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(server.url, server.accessToken, 'toto', 'coucou')
+
+    // Create channel
+    const videoChannel = {
+      name: 'second_channel',
+      displayName: 'second video channel',
+      description: 'super video channel description'
+    }
+    await addVideoChannel(server.url, server.accessToken, videoChannel)
+
+    // Create comments
+    const text = 'my super first comment'
+    await addVideoCommentThread(server.url, server.accessToken, video1UUID, text)
+
+    await waitJobs(server)
   })
 
-  it('Should update torrent hosts', async function () {
+  it('Should run update host', async function () {
     this.timeout(30000)
 
     killallServers([ server ])
@@ -52,6 +76,44 @@ describe('Test update host scripts', function () {
 
     const env = getEnvCli(server)
     await execCLI(`${env} 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)
+    }
+  })
+
+  it('Should have updated video channels url', async function () {
+    const res = await getVideoChannelsList(server.url, 0, 5, '-name')
+    expect(res.body.total).to.equal(3)
+
+    for (const channel of res.body.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 update accounts url', async function () {
+    const res = await getAccountsList(server.url)
+    expect(res.body.total).to.equal(3)
+
+    for (const account of res.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 update torrent hosts', async function () {
+    this.timeout(30000)
 
     const res = await getVideosList(server.url)
     const videos = res.body.data
@@ -59,7 +121,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)
 
@@ -67,7 +129,7 @@ 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)
+        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
 
@@ -81,10 +143,5 @@ describe('Test update host scripts', function () {
 
   after(async function () {
     killallServers([ server ])
-
-    // Keep the logs if the test failed
-    if (this['ok']) {
-      await flushTests()
-    }
   })
 })