X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Ftests%2Fapi%2Fvideos%2Fsingle-server.ts;h=5e163e9df005aa02a02f6d9219af27bf7de5da97;hb=77a87fec6c244074b786f67e135a1fe35bd7009f;hp=8f55075fb67d519904179f71008e6537f50ead74;hpb=7b0956ec4f7753c864c4cea220e6f189327baa93;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/videos/single-server.ts b/server/tests/api/videos/single-server.ts
index 8f55075fb..5e163e9df 100644
--- a/server/tests/api/videos/single-server.ts
+++ b/server/tests/api/videos/single-server.ts
@@ -8,7 +8,7 @@ import {
   checkVideoFilesWereRemoved, completeVideoCheck, flushTests, getVideo, getVideoCategories, getVideoLanguages, getVideoLicences,
   getVideoPrivacies, getVideosList, getVideosListPagination, getVideosListSort, killallServers, rateVideo, removeVideo, runServer,
   searchVideo, searchVideoWithPagination, searchVideoWithSort, ServerInfo, setAccessTokensToServers, testImage, updateVideo, uploadVideo,
-  viewVideo
+  viewVideo, wait
 } from '../../utils'
 
 const expect = chai.expect
@@ -23,11 +23,14 @@ describe('Test a single server', function () {
     name: 'my super name',
     category: 2,
     licence: 6,
-    language: 3,
+    language: 'zh',
     nsfw: true,
     description: 'my super description',
-    host: 'localhost:9001',
-    account: 'root',
+    support: 'my super support text',
+    account: {
+      name: 'root',
+      host: 'localhost:9001'
+    },
     isLocal: true,
     duration: 5,
     tags: [ 'tag1', 'tag2', 'tag3' ],
@@ -51,11 +54,14 @@ describe('Test a single server', function () {
     name: 'my super video updated',
     category: 4,
     licence: 2,
-    language: 5,
+    language: 'ar',
     nsfw: false,
     description: 'my super description updated',
-    host: 'localhost:9001',
-    account: 'root',
+    support: 'my super support text updated',
+    account: {
+      name: 'root',
+      host: 'localhost:9001'
+    },
     isLocal: true,
     tags: [ 'tagup1', 'tagup2' ],
     privacy: VideoPrivacy.PUBLIC,
@@ -109,7 +115,7 @@ describe('Test a single server', function () {
     const languages = res.body
     expect(Object.keys(languages)).to.have.length.above(5)
 
-    expect(languages[3]).to.equal('Mandarin')
+    expect(languages['ru']).to.equal('Russian')
   })
 
   it('Should list video privacies', async function () {
@@ -147,8 +153,7 @@ describe('Test a single server', function () {
   })
 
   it('Should get and seed the uploaded video', async function () {
-    // Yes, this could be long
-    this.timeout(60000)
+    this.timeout(5000)
 
     const res = await getVideosList(server.url)
 
@@ -161,8 +166,7 @@ describe('Test a single server', function () {
   })
 
   it('Should get the video by UUID', async function () {
-    // Yes, this could be long
-    this.timeout(60000)
+    this.timeout(5000)
 
     const res = await getVideo(server.url, videoUUID)
 
@@ -171,10 +175,22 @@ describe('Test a single server', function () {
   })
 
   it('Should have the views updated', async function () {
+    this.timeout(10000)
+
     await viewVideo(server.url, videoId)
     await viewVideo(server.url, videoId)
     await viewVideo(server.url, videoId)
 
+    await wait(1500)
+
+    await viewVideo(server.url, videoId)
+    await viewVideo(server.url, videoId)
+
+    await wait(1500)
+
+    await viewVideo(server.url, videoId)
+    await viewVideo(server.url, videoId)
+
     const res = await getVideo(server.url, videoId)
 
     const video = res.body
@@ -192,32 +208,6 @@ describe('Test a single server', function () {
     await completeVideoCheck(server.url, video, getCheckAttributes)
   })
 
-  // Not implemented yet
-  // it('Should search the video by serverHost', async function () {
-  //     const res = await   videosUtils.searchVideo(server.url, '9001', 'host')
-
-  //     expect(res.body.total).to.equal(1)
-  //     expect(res.body.data).to.be.an('array')
-  //     expect(res.body.data.length).to.equal(1)
-
-  //     const video = res.body.data[0]
-  //     expect(video.name).to.equal('my super name')
-  //     expect(video.description).to.equal('my super description')
-  //     expect(video.serverHost).to.equal('localhost:9001')
-  //     expect(video.author).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
-  //     expect(dateIsValid(video.updatedAt)).to.be.true
-
-  //     const test = await testVideoImage(server.url, 'video_short.webm', video.thumbnailPath)
-  //       expect(test).to.equal(true)
-
-  //       done()
-  //     })
-  //   })
-  // })
-
   // Not implemented yet
   // it('Should search the video by tag', async function () {
   //   const res = await searchVideo(server.url, 'tag1')
@@ -232,12 +222,12 @@ describe('Test a single server', function () {
   //   expect(video.categoryLabel).to.equal('Films')
   //   expect(video.licence).to.equal(6)
   //   expect(video.licenceLabel).to.equal('Attribution - Non Commercial - No Derivatives')
-  //   expect(video.language).to.equal(3)
-  //   expect(video.languageLabel).to.equal('Mandarin')
+  //   expect(video.language).to.equal('zh')
+  //   expect(video.languageLabel).to.equal('Chinese')
   //   expect(video.nsfw).to.be.ok
   //   expect(video.description).to.equal('my super description')
-  //   expect(video.serverHost).to.equal('localhost:9001')
-  //   expect(video.accountName).to.equal('root')
+  //   expect(video.account.name).to.equal('root')
+  //   expect(video.account.host).to.equal('localhost:9001')
   //   expect(video.isLocal).to.be.true
   //   expect(video.tags).to.deep.equal([ 'tag1', 'tag2', 'tag3' ])
   //   expect(dateIsValid(video.createdAt)).to.be.true
@@ -302,7 +292,7 @@ describe('Test a single server', function () {
         description: video + ' description',
         category: 2,
         licence: 1,
-        language: 1,
+        language: 'en',
         nsfw: true,
         tags: [ 'tag1', 'tag2', 'tag3' ],
         fixture: video
@@ -468,7 +458,7 @@ describe('Test a single server', function () {
       name: 'my super video updated',
       category: 4,
       licence: 2,
-      language: 5,
+      language: 'ar',
       nsfw: false,
       description: 'my super description updated',
       commentsEnabled: false,