Make some fields optional when uploading a video

2 files changed, 60 insertions, 46 deletions

diff --git a/server/tests/api/check-params/videos.ts b/server/tests/api/check-params/videos.ts
index 2962f5640..00a209665 100644
--- a/server/tests/api/check-params/videos.ts
+++ b/server/tests/api/check-params/videos.ts
@@ -189,14 +189,6 @@ describe('Test videos API validator', function () {
       await makePostUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches })
     })
 
-    it('Should fail without a category', async function () {
-      const fields = getCompleteVideoUploadAttributes()
-      delete fields.category
-
-      const attaches = getVideoUploadAttaches
-      await makePostUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches })
-    })
-
     it('Should fail with a bad category', async function () {
       const fields = getCompleteVideoUploadAttributes()
       fields.category = 125
@@ -205,14 +197,6 @@ describe('Test videos API validator', function () {
       await makePostUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches })
     })
 
-    it('Should fail without a licence', async function () {
-      const fields = getCompleteVideoUploadAttributes()
-      delete fields.licence
-
-      const attaches = getVideoUploadAttaches()
-      await makePostUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches })
-    })
-
     it('Should fail with a bad licence', async function () {
       const fields = getCompleteVideoUploadAttributes()
       fields.licence = 125
@@ -245,14 +229,6 @@ describe('Test videos API validator', function () {
       await makePostUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches })
     })
 
-    it('Should fail without description', async function () {
-      const fields = getCompleteVideoUploadAttributes()
-      delete fields.description
-
-      const attaches = getVideoUploadAttaches()
-      await makePostUploadRequest({ url: server.url, path: path + '/upload', token: server.accessToken, fields, attaches })
-    })
-
     it('Should fail with a long description', async function () {
       const fields = getCompleteVideoUploadAttributes()
       fields.description = 'my super description which is very very very very very very very very very very very very long'.repeat(35)
diff --git a/server/tests/api/single-server.ts b/server/tests/api/single-server.ts
index d7e9ad41f..fbb2dd1fb 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
@@ -693,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(204)
+
+    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 ])