Begin video watch design

[github/Chocobozzz/PeerTube.git] / server / tests / api / single-server.ts

diff --git a/server/tests/api/single-server.ts b/server/tests/api/single-server.ts
index 40e2c64fe0acbdc1ff8c63f268374bb72c169331..d7e9ad41f78a09438a604eb8712b123d94737e9a 100644 (file)
--- a/server/tests/api/single-server.ts
+++ b/server/tests/api/single-server.ts
@@ -33,6 +33,7 @@ import {
   searchVideoWithSort,
   updateVideo
 } from '../utils'
+import { viewVideo } from '../utils/videos'
 
 describe('Test a single server', function () {
   let server: ServerInfo = null
@@ -126,7 +127,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
@@ -175,7 +176,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
@@ -214,13 +215,17 @@ describe('Test a single server', function () {
   })
 
   it('Should have the views updated', async function () {
+    await viewVideo(server.url, videoId)
+    await viewVideo(server.url, videoId)
+    await viewVideo(server.url, videoId)
+
     const res = await getVideo(server.url, videoId)
 
     const video = res.body
     expect(video.views).to.equal(3)
   })
 
-  it('Should search the video by name by default', async function () {
+  it('Should search the video by name', async function () {
     const res = await searchVideo(server.url, 'my')
 
     expect(res.body.total).to.equal(1)
@@ -238,7 +243,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
@@ -274,35 +279,36 @@ describe('Test a single server', function () {
   //   })
   // })
 
-  it('Should search the video by tag', async function () {
-    const res = await searchVideo(server.url, 'tag1', 'tags')
-
-    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.category).to.equal(2)
-    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.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.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)
-  })
+  // Not implemented yet
+  // it('Should search the video by tag', async function () {
+  //   const res = await searchVideo(server.url, 'tag1')
+  //
+  //   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.category).to.equal(2)
+  //   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.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.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)
+  // })
 
-  it('Should not find a search by name by default', async function () {
+  it('Should not find a search by name', async function () {
     const res = await searchVideo(server.url, 'hello')
 
     expect(res.body.total).to.equal(0)
@@ -310,21 +316,23 @@ describe('Test a single server', function () {
     expect(res.body.data.length).to.equal(0)
   })
 
-  it('Should not find a search by author', async function () {
-    const res = await searchVideo(server.url, 'hello', 'account')
-
-    expect(res.body.total).to.equal(0)
-    expect(res.body.data).to.be.an('array')
-    expect(res.body.data.length).to.equal(0)
-  })
-
-  it('Should not find a search by tag', async function () {
-    const res = await searchVideo(server.url, 'hello', 'tags')
-
-    expect(res.body.total).to.equal(0)
-    expect(res.body.data).to.be.an('array')
-    expect(res.body.data.length).to.equal(0)
-  })
+  // Not implemented yet
+  // it('Should not find a search by author', async function () {
+  //   const res = await searchVideo(server.url, 'hello')
+  //
+  //   expect(res.body.total).to.equal(0)
+  //   expect(res.body.data).to.be.an('array')
+  //   expect(res.body.data.length).to.equal(0)
+  // })
+  //
+  // Not implemented yet
+  // it('Should not find a search by tag', async function () {
+  //   const res = await searchVideo(server.url, 'hello')
+  //
+  //   expect(res.body.total).to.equal(0)
+  //   expect(res.body.data).to.be.an('array')
+  //   expect(res.body.data.length).to.equal(0)
+  // })
 
   it('Should remove the video', async function () {
     await removeVideo(server.url, server.accessToken, videoId)
@@ -438,7 +446,7 @@ describe('Test a single server', function () {
   })
 
   it('Should search the first video', async function () {
-    const res = await searchVideoWithPagination(server.url, 'webm', 'name', 0, 1, 'name')
+    const res = await searchVideoWithPagination(server.url, 'webm', 0, 1, 'name')
 
     const videos = res.body.data
     expect(res.body.total).to.equal(4)
@@ -447,7 +455,7 @@ describe('Test a single server', function () {
   })
 
   it('Should search the last two videos', async function () {
-    const res = await searchVideoWithPagination(server.url, 'webm', 'name', 2, 2, 'name')
+    const res = await searchVideoWithPagination(server.url, 'webm', 2, 2, 'name')
 
     const videos = res.body.data
     expect(res.body.total).to.equal(4)
@@ -457,20 +465,21 @@ describe('Test a single server', function () {
   })
 
   it('Should search all the webm videos', async function () {
-    const res = await searchVideoWithPagination(server.url, 'webm', 'name', 0, 15)
+    const res = await searchVideoWithPagination(server.url, 'webm', 0, 15)
 
     const videos = res.body.data
     expect(res.body.total).to.equal(4)
     expect(videos.length).to.equal(4)
   })
 
-  it('Should search all the root author videos', async function () {
-    const res = await searchVideoWithPagination(server.url, 'root', 'account', 0, 15)
-
-    const videos = res.body.data
-    expect(res.body.total).to.equal(6)
-    expect(videos.length).to.equal(6)
-  })
+  // Not implemented yet
+  // it('Should search all the root author videos', async function () {
+  //   const res = await searchVideoWithPagination(server.url, 'root', 0, 15)
+  //
+  //   const videos = res.body.data
+  //   expect(res.body.total).to.equal(6)
+  //   expect(videos.length).to.equal(6)
+  // })
 
   // Not implemented yet
   // it('Should search all the 9001 port videos', async function () {
@@ -554,7 +563,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
@@ -603,7 +613,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
@@ -643,7 +653,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