3 files changed, 122 insertions, 41 deletions

diff --git a/server/tests/api/check-params/users.ts b/server/tests/api/check-params/users.ts
index e1655e85b..7b25df29f 100644
--- a/server/tests/api/check-params/users.ts
+++ b/server/tests/api/check-params/users.ts
@@ -627,7 +627,7 @@ describe('Test users API validators', function () {
       }
       await importVideo(server.url, server.accessToken, immutableAssign(baseAttributes, { targetUrl: getYoutubeVideoUrl() }))
       await importVideo(server.url, server.accessToken, immutableAssign(baseAttributes, { magnetUri: getMagnetURI() }))
-      await importVideo(server.url, server.accessToken, immutableAssign(baseAttributes, { torrentfile: '60fps_small-240p.torrent' }))
+      await importVideo(server.url, server.accessToken, immutableAssign(baseAttributes, { torrentfile: 'video-720p.torrent' }))
 
       await waitJobs([ server ])
 
diff --git a/server/tests/api/check-params/video-imports.ts b/server/tests/api/check-params/video-imports.ts
index e62f0918e..38ddd4e56 100644
--- a/server/tests/api/check-params/video-imports.ts
+++ b/server/tests/api/check-params/video-imports.ts
@@ -303,7 +303,7 @@ describe('Test video imports API validator', function () {
 
       fields = omit(fields, 'magnetUri')
       const attaches = {
-        'torrentfile': join(__dirname, '..', '..', 'fixtures', '60fps_small-240p.torrent')
+        'torrentfile': join(__dirname, '..', '..', 'fixtures', 'video-720p.torrent')
       }
 
       await makeUploadRequest({ url: server.url, path, token: server.accessToken, fields, attaches, statusCodeExpected: 409 })
diff --git a/server/tests/api/videos/video-imports.ts b/server/tests/api/videos/video-imports.ts
index f21ade5c3..b7866d529 100644
--- a/server/tests/api/videos/video-imports.ts
+++ b/server/tests/api/videos/video-imports.ts
@@ -2,7 +2,7 @@
 
 import * as chai from 'chai'
 import 'mocha'
-import { VideoDetails, VideoPrivacy } from '../../../../shared/models/videos'
+import { VideoDetails, VideoImport, VideoPrivacy } from '../../../../shared/models/videos'
 import {
   doubleFollow,
   flushAndRunMultipleServers,
@@ -10,12 +10,13 @@ import {
   getMyVideos,
   getVideo,
   getVideosList,
+  immutableAssign,
   killallServers,
   ServerInfo,
   setAccessTokensToServers
 } from '../../utils'
 import { waitJobs } from '../../utils/server/jobs'
-import { getMyVideoImports, getYoutubeVideoUrl, importVideo } from '../../utils/videos/video-imports'
+import { getMagnetURI, getYoutubeVideoUrl, importVideo, getMyVideoImports } from '../../utils/videos/video-imports'
 
 const expect = chai.expect
 
@@ -24,19 +25,36 @@ describe('Test video imports', function () {
   let channelIdServer1: number
   let channelIdServer2: number
 
-  async function checkVideoServer1 (url: string, id: number | string) {
-    const res = await getVideo(url, id)
-    const video: VideoDetails = res.body
-
-    expect(video.name).to.equal('small video - youtube')
-    expect(video.category.label).to.equal('News')
-    expect(video.licence.label).to.equal('Attribution')
-    expect(video.language.label).to.equal('Unknown')
-    expect(video.nsfw).to.be.false
-    expect(video.description).to.equal('this is a super description')
-    expect(video.tags).to.deep.equal([ 'tag1', 'tag2' ])
+  async function checkVideosServer1 (url: string, idHttp: string, idMagnet: string, idTorrent: string) {
+    const resHttp = await getVideo(url, idHttp)
+    const videoHttp: VideoDetails = resHttp.body
+
+    expect(videoHttp.name).to.equal('small video - youtube')
+    expect(videoHttp.category.label).to.equal('News')
+    expect(videoHttp.licence.label).to.equal('Attribution')
+    expect(videoHttp.language.label).to.equal('Unknown')
+    expect(videoHttp.nsfw).to.be.false
+    expect(videoHttp.description).to.equal('this is a super description')
+    expect(videoHttp.tags).to.deep.equal([ 'tag1', 'tag2' ])
+    expect(videoHttp.files).to.have.lengthOf(1)
+
+    const resMagnet = await getVideo(url, idMagnet)
+    const videoMagnet: VideoDetails = resMagnet.body
+    const resTorrent = await getVideo(url, idTorrent)
+    const videoTorrent: VideoDetails = resTorrent.body
+
+    for (const video of [ videoMagnet, videoTorrent ]) {
+      expect(video.category.label).to.equal('Misc')
+      expect(video.licence.label).to.equal('Unknown')
+      expect(video.language.label).to.equal('Unknown')
+      expect(video.nsfw).to.be.false
+      expect(video.description).to.equal('this is a super torrent description')
+      expect(video.tags).to.deep.equal([ 'tag_torrent1', 'tag_torrent2' ])
+      expect(video.files).to.have.lengthOf(1)
+    }
 
-    expect(video.files).to.have.lengthOf(1)
+    expect(videoTorrent.name).to.contain('你好 世界 720p.mp4')
+    expect(videoMagnet.name).to.contain('super peertube2 video')
   }
 
   async function checkVideoServer2 (url: string, id: number | string) {
@@ -75,50 +93,88 @@ describe('Test video imports', function () {
     await doubleFollow(servers[0], servers[1])
   })
 
-  it('Should import a video on server 1', async function () {
+  it('Should import videos on server 1', async function () {
     this.timeout(60000)
 
-    const attributes = {
-      targetUrl: getYoutubeVideoUrl(),
+    const baseAttributes = {
       channelId: channelIdServer1,
       privacy: VideoPrivacy.PUBLIC
     }
-    const res = await importVideo(servers[0].url, servers[0].accessToken, attributes)
-    expect(res.body.video.name).to.equal('small video - youtube')
+
+    {
+      const attributes = immutableAssign(baseAttributes, { targetUrl: getYoutubeVideoUrl() })
+      const res = await importVideo(servers[0].url, servers[0].accessToken, attributes)
+      expect(res.body.video.name).to.equal('small video - youtube')
+    }
+
+    {
+      const attributes = immutableAssign(baseAttributes, {
+        magnetUri: getMagnetURI(),
+        description: 'this is a super torrent description',
+        tags: [ 'tag_torrent1', 'tag_torrent2' ]
+      })
+      const res = await importVideo(servers[0].url, servers[0].accessToken, attributes)
+      expect(res.body.video.name).to.equal('super peertube2 video')
+    }
+
+    {
+      const attributes = immutableAssign(baseAttributes, {
+        torrentfile: 'video-720p.torrent',
+        description: 'this is a super torrent description',
+        tags: [ 'tag_torrent1', 'tag_torrent2' ]
+      })
+      const res = await importVideo(servers[0].url, servers[0].accessToken, attributes)
+      expect(res.body.video.name).to.equal('你好 世界 720p.mp4')
+    }
   })
 
-  it('Should list the video to import in my videos on server 1', async function () {
-    const res = await getMyVideos(servers[0].url, servers[0].accessToken, 0, 5)
+  it('Should list the videos to import in my videos on server 1', async function () {
+    const res = await getMyVideos(servers[0].url, servers[0].accessToken, 0, 5, 'createdAt')
 
-    expect(res.body.total).to.equal(1)
+    expect(res.body.total).to.equal(3)
 
     const videos = res.body.data
-    expect(videos).to.have.lengthOf(1)
+    expect(videos).to.have.lengthOf(3)
     expect(videos[0].name).to.equal('small video - youtube')
+    expect(videos[1].name).to.equal('super peertube2 video')
+    expect(videos[2].name).to.equal('你好 世界 720p.mp4')
   })
 
-  it('Should list the video to import in my imports on server 1', async function () {
-    const res = await getMyVideoImports(servers[0].url, servers[0].accessToken)
+  it('Should list the videos to import in my imports on server 1', async function () {
+    const res = await getMyVideoImports(servers[0].url, servers[0].accessToken, '-createdAt')
+
+    expect(res.body.total).to.equal(3)
+    const videoImports: VideoImport[] = res.body.data
+    expect(videoImports).to.have.lengthOf(3)
+
+    expect(videoImports[2].targetUrl).to.equal(getYoutubeVideoUrl())
+    expect(videoImports[2].magnetUri).to.be.null
+    expect(videoImports[2].torrentName).to.be.null
+    expect(videoImports[2].video.name).to.equal('small video - youtube')
 
-    expect(res.body.total).to.equal(1)
-    const videoImports = res.body.data
-    expect(videoImports).to.have.lengthOf(1)
+    expect(videoImports[1].targetUrl).to.be.null
+    expect(videoImports[1].magnetUri).to.equal(getMagnetURI())
+    expect(videoImports[1].torrentName).to.be.null
+    expect(videoImports[1].video.name).to.equal('super peertube2 video')
 
-    expect(videoImports[0].targetUrl).to.equal(getYoutubeVideoUrl())
-    expect(videoImports[0].video.name).to.equal('small video - youtube')
+    expect(videoImports[0].targetUrl).to.be.null
+    expect(videoImports[0].magnetUri).to.be.null
+    expect(videoImports[0].torrentName).to.equal('video-720p.torrent')
+    expect(videoImports[0].video.name).to.equal('你好 世界 720p.mp4')
   })
 
-  it('Should have the video listed on the two instances1', async function () {
+  it('Should have the video listed on the two instances', async function () {
     this.timeout(120000)
 
     await waitJobs(servers)
 
     for (const server of servers) {
       const res = await getVideosList(server.url)
-      expect(res.body.total).to.equal(1)
-      expect(res.body.data).to.have.lengthOf(1)
+      expect(res.body.total).to.equal(3)
+      expect(res.body.data).to.have.lengthOf(3)
 
-      await checkVideoServer1(server.url, res.body.data[0].uuid)
+      const [ videoHttp, videoMagnet, videoTorrent ] = res.body.data
+      await checkVideosServer1(server.url, videoHttp.uuid, videoMagnet.uuid, videoTorrent.uuid)
     }
   })
 
@@ -127,7 +183,7 @@ describe('Test video imports', function () {
 
     const attributes = {
       targetUrl: getYoutubeVideoUrl(),
-      channelId: channelIdServer1,
+      channelId: channelIdServer2,
       privacy: VideoPrivacy.PUBLIC,
       category: 10,
       licence: 7,
@@ -140,18 +196,43 @@ describe('Test video imports', function () {
     expect(res.body.video.name).to.equal('my super name')
   })
 
-  it('Should have the video listed on the two instances', async function () {
+  it('Should have the videos listed on the two instances', async function () {
     this.timeout(120000)
 
     await waitJobs(servers)
 
     for (const server of servers) {
       const res = await getVideosList(server.url)
-      expect(res.body.total).to.equal(2)
-      expect(res.body.data).to.have.lengthOf(2)
+      expect(res.body.total).to.equal(4)
+      expect(res.body.data).to.have.lengthOf(4)
 
       await checkVideoServer2(server.url, res.body.data[0].uuid)
-      await checkVideoServer1(server.url, res.body.data[1].uuid)
+
+      const [ ,videoHttp, videoMagnet, videoTorrent ] = res.body.data
+      await checkVideosServer1(server.url, videoHttp.uuid, videoMagnet.uuid, videoTorrent.uuid)
+    }
+  })
+
+  it('Should import a video that will be transcoded', async function () {
+    this.timeout(120000)
+
+    const attributes = {
+      name: 'transcoded video',
+      magnetUri: getMagnetURI(),
+      channelId: channelIdServer2,
+      privacy: VideoPrivacy.PUBLIC
+    }
+    const res = await importVideo(servers[1].url, servers[1].accessToken, attributes)
+    const videoUUID = res.body.video.uuid
+
+    await waitJobs(servers)
+
+    for (const server of servers) {
+      const res = await getVideo(server.url, videoUUID)
+      const video: VideoDetails = res.body
+
+      expect(video.name).to.equal('transcoded video')
+      expect(video.files).to.have.lengthOf(4)
     }
   })