From 46246b5f194caafba4e3a72e9365acd8b35785de Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Sun, 22 May 2016 09:15:00 +0200 Subject: Extends the search feature by customizing the search field (name, podUrl...) --- server/tests/api/singlePod.js | 99 ++++++++++++++++++++++++++++++++++++++++--- server/tests/api/utils.js | 25 +++++++---- 2 files changed, 109 insertions(+), 15 deletions(-) (limited to 'server/tests') diff --git a/server/tests/api/singlePod.js b/server/tests/api/singlePod.js index 884a83032..296dd0aa4 100644 --- a/server/tests/api/singlePod.js +++ b/server/tests/api/singlePod.js @@ -129,7 +129,7 @@ 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 @@ -154,7 +154,32 @@ 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 @@ -166,6 +191,18 @@ describe('Test a single pod', function () { }) }) + 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() + }) + }) + it('Should remove the video', function (done) { utils.removeVideo(server.url, server.accessToken, videoId, function (err) { if (err) throw err @@ -288,7 +325,7 @@ 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.data @@ -301,7 +338,7 @@ 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.data @@ -314,8 +351,8 @@ 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.data @@ -326,6 +363,56 @@ describe('Test a single pod', function () { }) }) + 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 diff --git a/server/tests/api/utils.js b/server/tests/api/utils.js index 218b46157..c6430c930 100644 --- a/server/tests/api/utils.js +++ b/server/tests/api/utils.js @@ -291,24 +291,31 @@ function runServer (number, callback) { }) } -function searchVideo (url, search, end) { - const path = '/api/v1/videos' +function searchVideo (url, search, field, end) { + if (!end) { + end = field + field = null + } - request(url) - .get(path + '/search/' + search) - .set('Accept', 'application/json') - .expect(200) - .expect('Content-Type', /json/) - .end(end) + const path = '/api/v1/videos' + const req = request(url) + .get(path + '/search/' + search) + .set('Accept', 'application/json') + + if (field) req.query({ field: field }) + req.expect(200) + .expect('Content-Type', /json/) + .end(end) } -function searchVideoWithPagination (url, search, start, count, end) { +function searchVideoWithPagination (url, search, field, start, count, end) { const path = '/api/v1/videos' request(url) .get(path + '/search/' + search) .query({ start: start }) .query({ count: count }) + .query({ field: field }) .set('Accept', 'application/json') .expect(200) .expect('Content-Type', /json/) -- cgit v1.2.3