X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2FsinglePod.js;h=296dd0aa411dc18fe5710ac8eee26fd76d134a06;hb=46246b5f194caafba4e3a72e9365acd8b35785de;hp=72002b6313eeaa6d8f7bb4d6608789dc463876fd;hpb=bb10240ee15d31a1cc17c0e3d748dde817e7d0cb;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/singlePod.js b/server/tests/api/singlePod.js
index 72002b631..296dd0aa4 100644
--- a/server/tests/api/singlePod.js
+++ b/server/tests/api/singlePod.js
@@ -47,8 +47,9 @@ describe('Test a single pod', function () {
     utils.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()
     })
@@ -66,13 +67,14 @@ describe('Test a single pod', function () {
     utils.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
@@ -106,7 +108,7 @@ describe('Test a single pod', function () {
       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
@@ -127,17 +129,18 @@ describe('Test a single pod', function () {
     })
   })
 
-  it('Should search the video', function (done) {
+  it('Should search the video by name by default', function (done) {
     utils.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
@@ -151,12 +154,50 @@ describe('Test a single pod', function () {
     })
   })
 
-  it('Should not find a search', function (done) {
+  it('Should search the video by podUrl', function (done) {
+    utils.searchVideo(server.url, '9001', 'podUrl', 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(utils.dateIsValid(video.createdDate)).to.be.true
+
+      utils.testImage(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) {
     utils.searchVideo(server.url, 'hello', 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()
+    })
+  })
+
+  it('Should not find a search by author', function (done) {
+    utils.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()
     })
@@ -179,8 +220,9 @@ describe('Test a single pod', function () {
     utils.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()
     })
@@ -201,7 +243,8 @@ describe('Test a single pod', function () {
     utils.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)
 
@@ -221,7 +264,7 @@ describe('Test a single pod', function () {
     utils.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
 
@@ -243,7 +286,8 @@ describe('Test a single pod', function () {
     utils.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)
@@ -256,7 +300,8 @@ describe('Test a single pod', function () {
     utils.getVideosListPagination(server.url, 2, 3, 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(4)
       expect(videos[0].name === videosListBase[2].name)
       expect(videos[1].name === videosListBase[3].name)
@@ -270,7 +315,8 @@ describe('Test a single pod', function () {
     utils.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 +325,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) {
+    utils.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 +338,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) {
+    utils.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,17 +351,103 @@ 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) {
+    utils.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) {
+    utils.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) {
+    utils.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) {
+    utils.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]
+    utils.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) {
+      if (err) throw err
+
+      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')
+      expect(videos[3].name === 'video_short.webm name')
+      expect(videos[2].name === 'video_short1.webm name')
+      expect(videos[1].name === 'video_short2.webm name')
+      expect(videos[0].name === 'video_short3.webm name')
+
+      done()
+    })
+  })
+
+  it('Should search and sort by name in ascending order', function (done) {
+    utils.searchVideoWithSort(server.url, 'webm', 'name', function (err, res) {
+      if (err) throw err
+
+      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')
+      expect(videos[1].name === 'video_short1.webm name')
+      expect(videos[2].name === 'video_short2.webm name')
+      expect(videos[3].name === 'video_short3.webm name')
+
+      done()
+    })
+  })
+
   after(function (done) {
     process.kill(-server.app.pid)
     process.kill(-webtorrent.app.pid)