X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fsingle-server.ts;h=e99955ef4356551c782bedd3ab66b35e5fad0769;hb=e11f68a3562d2468480c396f47f1bdd2a306e17a;hp=fe192d3911775b8bf73117c6d6c6d4bb99184c2c;hpb=f3aaa9a95cc2b61f1f255472d7014d08faa66561;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/single-server.ts b/server/tests/api/single-server.ts
index fe192d391..e99955ef4 100644
--- a/server/tests/api/single-server.ts
+++ b/server/tests/api/single-server.ts
@@ -1,40 +1,41 @@
 /* tslint:disable:no-unused-expression */
 
+import * as chai from 'chai'
 import { keyBy } from 'lodash'
-import { join } from 'path'
 import 'mocha'
-import * as chai from 'chai'
-const expect = chai.expect
-
+import { join } from 'path'
+import * as request from 'supertest'
 import {
-  ServerInfo,
-  flushTests,
-  runServer,
-  uploadVideo,
-  getVideosList,
-  rateVideo,
-  removeVideo,
-  wait,
-  setAccessTokensToServers,
-  searchVideo,
-  killallServers,
   dateIsValid,
+  flushTests,
+  getVideo,
   getVideoCategories,
-  getVideoLicences,
   getVideoLanguages,
+  getVideoLicences,
   getVideoPrivacies,
-  testVideoImage,
-  webtorrentAdd,
-  getVideo,
-  readdirPromise,
+  getVideosList,
   getVideosListPagination,
-  searchVideoWithPagination,
   getVideosListSort,
+  killallServers,
+  rateVideo,
+  readdirPromise,
+  removeVideo,
+  runServer,
+  searchVideo,
+  searchVideoWithPagination,
   searchVideoWithSort,
-  updateVideo
+  ServerInfo,
+  setAccessTokensToServers,
+  testVideoImage,
+  updateVideo,
+  uploadVideo,
+  wait,
+  webtorrentAdd
 } from '../utils'
 import { viewVideo } from '../utils/videos'
 
+const expect = chai.expect
+
 describe('Test a single server', function () {
   let server: ServerInfo = null
   let videoId = -1
@@ -103,7 +104,10 @@ describe('Test a single server', function () {
       licence: 6,
       tags: [ 'tag1', 'tag2', 'tag3' ]
     }
-    await uploadVideo(server.url, server.accessToken, videoAttributes)
+    const res = await uploadVideo(server.url, server.accessToken, videoAttributes)
+    expect(res.body.video).to.not.be.undefined
+    expect(res.body.video.id).to.equal(1)
+    expect(res.body.video.uuid).to.have.length.above(5)
   })
 
   it('Should seed the uploaded video', async function () {
@@ -127,7 +131,7 @@ describe('Test a single server', function () {
     expect(video.nsfw).to.be.ok
     expect(video.description).to.equal('my super description')
     expect(video.serverHost).to.equal('localhost:9001')
-    expect(video.account).to.equal('root')
+    expect(video.accountName).to.equal('root')
     expect(video.isLocal).to.be.true
     expect(video.tags).to.deep.equal([ 'tag1', 'tag2', 'tag3' ])
     expect(dateIsValid(video.createdAt)).to.be.true
@@ -176,7 +180,7 @@ describe('Test a single server', function () {
     expect(video.nsfw).to.be.ok
     expect(video.description).to.equal('my super description')
     expect(video.serverHost).to.equal('localhost:9001')
-    expect(video.account).to.equal('root')
+    expect(video.accountName).to.equal('root')
     expect(video.isLocal).to.be.true
     expect(video.tags).to.deep.equal([ 'tag1', 'tag2', 'tag3' ])
     expect(dateIsValid(video.createdAt)).to.be.true
@@ -243,7 +247,7 @@ describe('Test a single server', function () {
     expect(video.nsfw).to.be.ok
     expect(video.description).to.equal('my super description')
     expect(video.serverHost).to.equal('localhost:9001')
-    expect(video.account).to.equal('root')
+    expect(video.accountName).to.equal('root')
     expect(video.isLocal).to.be.true
     expect(video.tags).to.deep.equal([ 'tag1', 'tag2', 'tag3' ])
     expect(dateIsValid(video.createdAt)).to.be.true
@@ -298,7 +302,7 @@ describe('Test a single server', function () {
   //   expect(video.nsfw).to.be.ok
   //   expect(video.description).to.equal('my super description')
   //   expect(video.serverHost).to.equal('localhost:9001')
-  //   expect(video.account).to.equal('root')
+  //   expect(video.accountName).to.equal('root')
   //   expect(video.isLocal).to.be.true
   //   expect(video.tags).to.deep.equal([ 'tag1', 'tag2', 'tag3' ])
   //   expect(dateIsValid(video.createdAt)).to.be.true
@@ -360,7 +364,7 @@ describe('Test a single server', function () {
       'video_short1.webm', 'video_short2.webm', 'video_short3.webm'
     ]
 
-    // const tasks: Promise<any>[] = []
+    const tasks: Promise<any>[] = []
     for (const video of videos) {
       const videoAttributes = {
         name: video + ' name',
@@ -374,13 +378,10 @@ describe('Test a single server', function () {
       }
 
       const p = uploadVideo(server.url, server.accessToken, videoAttributes)
-      await p
+      tasks.push(p)
     }
-    // FIXME: concurrent uploads does not work :(
-    //   tasks.push(p)
-    // }
-    //
-    // await Promise.all(tasks)
+
+    await Promise.all(tasks)
   })
 
   it('Should have the correct durations', async function () {
@@ -563,7 +564,8 @@ describe('Test a single server', function () {
     expect(video.nsfw).to.be.ok
     expect(video.description).to.equal('my super description updated')
     expect(video.serverHost).to.equal('localhost:9001')
-    expect(video.account).to.equal('root')
+    expect(video.accountName).to.equal('root')
+    expect(video.account.name).to.equal('root')
     expect(video.isLocal).to.be.true
     expect(video.tags).to.deep.equal([ 'tagup1', 'tagup2' ])
     expect(dateIsValid(video.createdAt)).to.be.true
@@ -612,7 +614,7 @@ describe('Test a single server', function () {
     expect(video.nsfw).to.be.ok
     expect(video.description).to.equal('my super description updated')
     expect(video.serverHost).to.equal('localhost:9001')
-    expect(video.account).to.equal('root')
+    expect(video.accountName).to.equal('root')
     expect(video.isLocal).to.be.true
     expect(video.tags).to.deep.equal([ 'supertag', 'tag1', 'tag2' ])
     expect(dateIsValid(video.createdAt)).to.be.true
@@ -652,7 +654,7 @@ describe('Test a single server', function () {
     expect(video.nsfw).to.be.ok
     expect(video.description).to.equal('hello everybody')
     expect(video.serverHost).to.equal('localhost:9001')
-    expect(video.account).to.equal('root')
+    expect(video.accountName).to.equal('root')
     expect(video.isLocal).to.be.true
     expect(video.tags).to.deep.equal([ 'supertag', 'tag1', 'tag2' ])
     expect(dateIsValid(video.createdAt)).to.be.true
@@ -692,6 +694,43 @@ describe('Test a single server', function () {
     expect(video.dislikes).to.equal(1)
   })
 
+  it('Should upload a video with minimum parameters', async function () {
+    const path = '/api/v1/videos/upload'
+
+    const req = request(server.url)
+      .post(path)
+      .set('Accept', 'application/json')
+      .set('Authorization', 'Bearer ' + server.accessToken)
+      .field('name', 'minimum parameters')
+      .field('privacy', '1')
+      .field('nsfw', 'false')
+      .field('channelId', '1')
+
+    const filePath = join(__dirname, '..', 'api', 'fixtures', 'video_short.webm')
+
+    await req.attach('videofile', filePath)
+      .expect(200)
+
+    const res = await getVideosList(server.url)
+    const video = res.body.data.find(v => v.name === 'minimum parameters')
+
+    expect(video.name).to.equal('minimum parameters')
+    expect(video.category).to.equal(null)
+    expect(video.categoryLabel).to.equal('Misc')
+    expect(video.licence).to.equal(null)
+    expect(video.licenceLabel).to.equal('Unknown')
+    expect(video.language).to.equal(null)
+    expect(video.languageLabel).to.equal('Unknown')
+    expect(video.nsfw).to.not.be.ok
+    expect(video.description).to.equal(null)
+    expect(video.serverHost).to.equal('localhost:9001')
+    expect(video.accountName).to.equal('root')
+    expect(video.isLocal).to.be.true
+    expect(video.tags).to.deep.equal([ ])
+    expect(dateIsValid(video.createdAt)).to.be.true
+    expect(dateIsValid(video.updatedAt)).to.be.true
+  })
+
   after(async function () {
     killallServers([ server ])