X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2FsinglePod.js;h=573eaa3a89ab0c22f79720e71486784b6beec8d6;hb=8d30905858245f12a42fc327d2d57cbfe062d548;hp=1a53ada3ace5d15256793a51f12ba202f5536dc6;hpb=a877d5acc5c52b8667c65f725bbca9a52e40ec48;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/singlePod.js b/server/tests/api/singlePod.js
index 1a53ada3a..573eaa3a8 100644
--- a/server/tests/api/singlePod.js
+++ b/server/tests/api/singlePod.js
@@ -1,17 +1,20 @@
 'use strict'
 
-const async = require('async')
 const chai = require('chai')
+const each = require('async/each')
 const expect = chai.expect
 const fs = require('fs')
 const keyBy = require('lodash/keyBy')
 const pathUtils = require('path')
+const series = require('async/series')
 
+const loginUtils = require('../utils/login')
+const miscsUtils = require('../utils/miscs')
+const serversUtils = require('../utils/servers')
+const videosUtils = require('../utils/videos')
 const webtorrent = require(pathUtils.join(__dirname, '../../lib/webtorrent'))
 webtorrent.silent = true
 
-const utils = require('./utils')
-
 describe('Test a single pod', function () {
   let server = null
   let videoId = -1
@@ -20,18 +23,18 @@ describe('Test a single pod', function () {
   before(function (done) {
     this.timeout(20000)
 
-    async.series([
+    series([
       function (next) {
-        utils.flushTests(next)
+        serversUtils.flushTests(next)
       },
       function (next) {
-        utils.runServer(1, function (server1) {
+        serversUtils.runServer(1, function (server1) {
           server = server1
           next()
         })
       },
       function (next) {
-        utils.loginAndGetAccessToken(server, function (err, token) {
+        loginUtils.loginAndGetAccessToken(server, function (err, token) {
           if (err) throw err
           server.accessToken = token
           next()
@@ -44,11 +47,12 @@ describe('Test a single pod', function () {
   })
 
   it('Should not have videos', function (done) {
-    utils.getVideosList(server.url, function (err, res) {
+    videosUtils.getVideosList(server.url, function (err, res) {
       if (err) throw err
 
-      expect(res.body).to.be.an('array')
-      expect(res.body.length).to.equal(0)
+      expect(res.body.total).to.equal(0)
+      expect(res.body.data).to.be.an('array')
+      expect(res.body.data.length).to.equal(0)
 
       done()
     })
@@ -56,29 +60,35 @@ describe('Test a single pod', function () {
 
   it('Should upload the video', function (done) {
     this.timeout(5000)
-    utils.uploadVideo(server.url, server.accessToken, 'my super name', 'my super description', 'video_short.webm', done)
+    const name = 'my super name'
+    const description = 'my super description'
+    const tags = [ 'tag1', 'tag2', 'tag3' ]
+    const file = 'video_short.webm'
+    videosUtils.uploadVideo(server.url, server.accessToken, name, description, tags, file, done)
   })
 
   it('Should seed the uploaded video', function (done) {
     // Yes, this could be long
     this.timeout(60000)
 
-    utils.getVideosList(server.url, function (err, res) {
+    videosUtils.getVideosList(server.url, function (err, res) {
       if (err) throw err
 
-      expect(res.body).to.be.an('array')
-      expect(res.body.length).to.equal(1)
+      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[0]
+      const video = res.body.data[0]
       expect(video.name).to.equal('my super name')
       expect(video.description).to.equal('my super description')
-      expect(video.podUrl).to.equal('http://localhost:9001')
+      expect(video.podUrl).to.equal('localhost:9001')
       expect(video.magnetUri).to.exist
       expect(video.author).to.equal('root')
       expect(video.isLocal).to.be.true
-      expect(utils.dateIsValid(video.createdDate)).to.be.true
+      expect(video.tags).to.deep.equal([ 'tag1', 'tag2', 'tag3' ])
+      expect(miscsUtils.dateIsValid(video.createdDate)).to.be.true
 
-      utils.testImage(server.url, 'video_short.webm', video.thumbnailPath, function (err, test) {
+      videosUtils.testVideoImage(server.url, 'video_short.webm', video.thumbnailPath, function (err, test) {
         if (err) throw err
         expect(test).to.equal(true)
 
@@ -100,19 +110,20 @@ describe('Test a single pod', function () {
     // Yes, this could be long
     this.timeout(60000)
 
-    utils.getVideo(server.url, videoId, function (err, res) {
+    videosUtils.getVideo(server.url, videoId, function (err, res) {
       if (err) throw err
 
       const video = res.body
       expect(video.name).to.equal('my super name')
       expect(video.description).to.equal('my super description')
-      expect(video.podUrl).to.equal('http://localhost:9001')
+      expect(video.podUrl).to.equal('localhost:9001')
       expect(video.magnetUri).to.exist
       expect(video.author).to.equal('root')
       expect(video.isLocal).to.be.true
-      expect(utils.dateIsValid(video.createdDate)).to.be.true
+      expect(video.tags).to.deep.equal([ 'tag1', 'tag2', 'tag3' ])
+      expect(miscsUtils.dateIsValid(video.createdDate)).to.be.true
 
-      utils.testImage(server.url, 'video_short.webm', video.thumbnailPath, function (err, test) {
+      videosUtils.testVideoImage(server.url, 'video_short.webm', video.thumbnailPath, function (err, test) {
         if (err) throw err
         expect(test).to.equal(true)
 
@@ -127,22 +138,24 @@ describe('Test a single pod', function () {
     })
   })
 
-  it('Should search the video', function (done) {
-    utils.searchVideo(server.url, 'my', function (err, res) {
+  it('Should search the video by name by default', function (done) {
+    videosUtils.searchVideo(server.url, 'my', function (err, res) {
       if (err) throw err
 
-      expect(res.body).to.be.an('array')
-      expect(res.body.length).to.equal(1)
+      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[0]
+      const video = res.body.data[0]
       expect(video.name).to.equal('my super name')
       expect(video.description).to.equal('my super description')
-      expect(video.podUrl).to.equal('http://localhost:9001')
+      expect(video.podUrl).to.equal('localhost:9001')
       expect(video.author).to.equal('root')
       expect(video.isLocal).to.be.true
-      expect(utils.dateIsValid(video.createdDate)).to.be.true
+      expect(video.tags).to.deep.equal([ 'tag1', 'tag2', 'tag3' ])
+      expect(miscsUtils.dateIsValid(video.createdDate)).to.be.true
 
-      utils.testImage(server.url, 'video_short.webm', video.thumbnailPath, function (err, test) {
+      videosUtils.testVideoImage(server.url, 'video_short.webm', video.thumbnailPath, function (err, test) {
         if (err) throw err
         expect(test).to.equal(true)
 
@@ -151,19 +164,96 @@ describe('Test a single pod', function () {
     })
   })
 
-  it('Should not find a search', function (done) {
-    utils.searchVideo(server.url, 'hello', function (err, res) {
+  it('Should search the video by podUrl', function (done) {
+    videosUtils.searchVideo(server.url, '9001', 'podUrl', function (err, res) {
       if (err) throw err
 
-      expect(res.body).to.be.an('array')
-      expect(res.body.length).to.equal(0)
+      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.podUrl).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(miscsUtils.dateIsValid(video.createdDate)).to.be.true
+
+      videosUtils.testVideoImage(server.url, 'video_short.webm', video.thumbnailPath, function (err, test) {
+        if (err) throw err
+        expect(test).to.equal(true)
+
+        done()
+      })
+    })
+  })
+
+  it('Should search the video by tag', function (done) {
+    videosUtils.searchVideo(server.url, 'tag1', 'tags', function (err, res) {
+      if (err) throw err
+
+      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.podUrl).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(miscsUtils.dateIsValid(video.createdDate)).to.be.true
+
+      videosUtils.testVideoImage(server.url, 'video_short.webm', video.thumbnailPath, function (err, test) {
+        if (err) throw err
+        expect(test).to.equal(true)
+
+        done()
+      })
+    })
+  })
+
+  it('Should not find a search by name by default', function (done) {
+    videosUtils.searchVideo(server.url, 'hello', function (err, res) {
+      if (err) throw err
+
+      expect(res.body.total).to.equal(0)
+      expect(res.body.data).to.be.an('array')
+      expect(res.body.data.length).to.equal(0)
+
+      done()
+    })
+  })
+
+  it('Should not find a search by author', function (done) {
+    videosUtils.searchVideo(server.url, 'hello', 'author', function (err, res) {
+      if (err) throw err
+
+      expect(res.body.total).to.equal(0)
+      expect(res.body.data).to.be.an('array')
+      expect(res.body.data.length).to.equal(0)
+
+      done()
+    })
+  })
+
+  it('Should not find a search by tag', function (done) {
+    videosUtils.searchVideo(server.url, 'tag', 'tags', function (err, res) {
+      if (err) throw err
+
+      expect(res.body.total).to.equal(0)
+      expect(res.body.data).to.be.an('array')
+      expect(res.body.data.length).to.equal(0)
 
       done()
     })
   })
 
   it('Should remove the video', function (done) {
-    utils.removeVideo(server.url, server.accessToken, videoId, function (err) {
+    videosUtils.removeVideo(server.url, server.accessToken, videoId, function (err) {
       if (err) throw err
 
       fs.readdir(pathUtils.join(__dirname, '../../../test1/uploads/'), function (err, files) {
@@ -176,11 +266,12 @@ describe('Test a single pod', function () {
   })
 
   it('Should not have videos', function (done) {
-    utils.getVideosList(server.url, function (err, res) {
+    videosUtils.getVideosList(server.url, function (err, res) {
       if (err) throw err
 
-      expect(res.body).to.be.an('array')
-      expect(res.body.length).to.equal(0)
+      expect(res.body.total).to.equal(0)
+      expect(res.body.data).to.be.an('array')
+      expect(res.body.data.length).to.equal(0)
 
       done()
     })
@@ -192,16 +283,21 @@ describe('Test a single pod', function () {
       'video_short.mp4', 'video_short.ogv', 'video_short.webm',
       'video_short1.webm', 'video_short2.webm', 'video_short3.webm'
     ]
-    async.each(videos, function (video, callbackEach) {
-      utils.uploadVideo(server.url, server.accessToken, video + ' name', video + ' description', video, callbackEach)
+    each(videos, function (video, callbackEach) {
+      const name = video + ' name'
+      const description = video + ' description'
+      const tags = [ 'tag1', 'tag2', 'tag3' ]
+
+      videosUtils.uploadVideo(server.url, server.accessToken, name, description, tags, video, callbackEach)
     }, done)
   })
 
   it('Should have the correct durations', function (done) {
-    utils.getVideosList(server.url, function (err, res) {
+    videosUtils.getVideosList(server.url, function (err, res) {
       if (err) throw err
 
-      const videos = res.body
+      expect(res.body.total).to.equal(6)
+      const videos = res.body.data
       expect(videos).to.be.an('array')
       expect(videos.length).to.equal(6)
 
@@ -218,18 +314,18 @@ describe('Test a single pod', function () {
   })
 
   it('Should have the correct thumbnails', function (done) {
-    utils.getVideosList(server.url, function (err, res) {
+    videosUtils.getVideosList(server.url, function (err, res) {
       if (err) throw err
 
-      const videos = res.body
+      const videos = res.body.data
       // For the next test
       videosListBase = videos
 
-      async.each(videos, function (video, callbackEach) {
+      each(videos, function (video, callbackEach) {
         if (err) throw err
         const videoName = video.name.replace(' name', '')
 
-        utils.testImage(server.url, videoName, video.thumbnailPath, function (err, test) {
+        videosUtils.testVideoImage(server.url, videoName, video.thumbnailPath, function (err, test) {
           if (err) throw err
 
           expect(test).to.equal(true)
@@ -240,10 +336,11 @@ describe('Test a single pod', function () {
   })
 
   it('Should list only the two first videos', function (done) {
-    utils.getVideosListPagination(server.url, 0, 2, function (err, res) {
+    videosUtils.getVideosListPagination(server.url, 0, 2, function (err, res) {
       if (err) throw err
 
-      const videos = res.body
+      const videos = res.body.data
+      expect(res.body.total).to.equal(6)
       expect(videos.length).to.equal(2)
       expect(videos[0].name === videosListBase[0].name)
       expect(videos[1].name === videosListBase[1].name)
@@ -253,11 +350,12 @@ describe('Test a single pod', function () {
   })
 
   it('Should list only the next three videos', function (done) {
-    utils.getVideosListPagination(server.url, 2, 3, function (err, res) {
+    videosUtils.getVideosListPagination(server.url, 2, 3, function (err, res) {
       if (err) throw err
 
-      const videos = res.body
-      expect(videos.length).to.equal(4)
+      const videos = res.body.data
+      expect(res.body.total).to.equal(6)
+      expect(videos.length).to.equal(3)
       expect(videos[0].name === videosListBase[2].name)
       expect(videos[1].name === videosListBase[3].name)
       expect(videos[2].name === videosListBase[4].name)
@@ -267,10 +365,11 @@ describe('Test a single pod', function () {
   })
 
   it('Should list the last video', function (done) {
-    utils.getVideosListPagination(server.url, 5, 6, function (err, res) {
+    videosUtils.getVideosListPagination(server.url, 5, 6, function (err, res) {
       if (err) throw err
 
-      const videos = res.body
+      const videos = res.body.data
+      expect(res.body.total).to.equal(6)
       expect(videos.length).to.equal(1)
       expect(videos[0].name === videosListBase[5].name)
 
@@ -279,10 +378,11 @@ describe('Test a single pod', function () {
   })
 
   it('Should search the first video', function (done) {
-    utils.searchVideoWithPagination(server.url, 'webm', 0, 1, function (err, res) {
+    videosUtils.searchVideoWithPagination(server.url, 'webm', 'name', 0, 1, function (err, res) {
       if (err) throw err
 
-      const videos = res.body
+      const videos = res.body.data
+      expect(res.body.total).to.equal(4)
       expect(videos.length).to.equal(1)
       expect(videos[0].name === 'video_short.webm name')
 
@@ -291,10 +391,11 @@ describe('Test a single pod', function () {
   })
 
   it('Should search the last two videos', function (done) {
-    utils.searchVideoWithPagination(server.url, 'webm', 2, 2, function (err, res) {
+    videosUtils.searchVideoWithPagination(server.url, 'webm', 'name', 2, 2, function (err, res) {
       if (err) throw err
 
-      const videos = res.body
+      const videos = res.body.data
+      expect(res.body.total).to.equal(4)
       expect(videos.length).to.equal(2)
       expect(videos[0].name === 'video_short2.webm name')
       expect(videos[1].name === 'video_short3.webm name')
@@ -303,22 +404,74 @@ describe('Test a single pod', function () {
     })
   })
 
-  it('Should search all the videos', function (done) {
-    utils.searchVideoWithPagination(server.url, 'webm', 0, 15, function (err, res) {
+  it('Should search all the webm videos', function (done) {
+    videosUtils.searchVideoWithPagination(server.url, 'webm', 'name', 0, 15, function (err, res) {
       if (err) throw err
 
-      const videos = res.body
+      const videos = res.body.data
+      expect(res.body.total).to.equal(4)
       expect(videos.length).to.equal(4)
 
       done()
     })
   })
 
+  it('Should search all the root author videos', function (done) {
+    videosUtils.searchVideoWithPagination(server.url, 'root', 'author', 0, 15, function (err, res) {
+      if (err) throw err
+
+      const videos = res.body.data
+      expect(res.body.total).to.equal(6)
+      expect(videos.length).to.equal(6)
+
+      done()
+    })
+  })
+
+  it('Should search all the 9001 port videos', function (done) {
+    videosUtils.searchVideoWithPagination(server.url, '9001', 'podUrl', 0, 15, function (err, res) {
+      if (err) throw err
+
+      const videos = res.body.data
+      expect(res.body.total).to.equal(6)
+      expect(videos.length).to.equal(6)
+
+      done()
+    })
+  })
+
+  it('Should search all the localhost videos', function (done) {
+    videosUtils.searchVideoWithPagination(server.url, 'localhost', 'podUrl', 0, 15, function (err, res) {
+      if (err) throw err
+
+      const videos = res.body.data
+      expect(res.body.total).to.equal(6)
+      expect(videos.length).to.equal(6)
+
+      done()
+    })
+  })
+
+  it('Should search the good magnetUri video', function (done) {
+    const video = videosListBase[0]
+    videosUtils.searchVideoWithPagination(server.url, encodeURIComponent(video.magnetUri), 'magnetUri', 0, 15, function (err, res) {
+      if (err) throw err
+
+      const videos = res.body.data
+      expect(res.body.total).to.equal(1)
+      expect(videos.length).to.equal(1)
+      expect(videos[0].name).to.equal(video.name)
+
+      done()
+    })
+  })
+
   it('Should list and sort by name in descending order', function (done) {
-    utils.getVideosListSort(server.url, '-name', function (err, res) {
+    videosUtils.getVideosListSort(server.url, '-name', function (err, res) {
       if (err) throw err
 
-      const videos = res.body
+      const videos = res.body.data
+      expect(res.body.total).to.equal(6)
       expect(videos.length).to.equal(6)
       expect(videos[5].name === 'video_short.mp4 name')
       expect(videos[4].name === 'video_short.ogv name')
@@ -332,10 +485,11 @@ describe('Test a single pod', function () {
   })
 
   it('Should search and sort by name in ascending order', function (done) {
-    utils.searchVideoWithSort(server.url, 'webm', 'name', function (err, res) {
+    videosUtils.searchVideoWithSort(server.url, 'webm', 'name', function (err, res) {
       if (err) throw err
 
-      const videos = res.body
+      const videos = res.body.data
+      expect(res.body.total).to.equal(4)
       expect(videos.length).to.equal(4)
 
       expect(videos[0].name === 'video_short.webm name')
@@ -353,7 +507,7 @@ describe('Test a single pod', function () {
 
     // Keep the logs if the test failed
     if (this.ok) {
-      utils.flushTests(done)
+      serversUtils.flushTests(done)
     } else {
       done()
     }