From: Chocobozzz Date: Tue, 10 May 2016 20:24:04 +0000 (+0200) Subject: thumbnail_path -> thumbnailPath X-Git-Tag: v0.0.1-alpha~953 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=36d560246f1d53f1d1c41d789d93349118b3492d;hp=9e5f374090ea0fb16f93edd79d5ad61a55db91e5;p=github%2FChocobozzz%2FPeerTube.git thumbnail_path -> thumbnailPath --- diff --git a/server/controllers/api/v1/videos.js b/server/controllers/api/v1/videos.js index 98f17ac6c..c6ea439f9 100644 --- a/server/controllers/api/v1/videos.js +++ b/server/controllers/api/v1/videos.js @@ -182,7 +182,7 @@ function getFormatedVideo (video_obj) { magnetUri: video_obj.magnetUri, author: video_obj.author, duration: video_obj.duration, - thumbnail_path: constants.THUMBNAILS_STATIC_PATH + '/' + video_obj.thumbnail + thumbnailPath: constants.THUMBNAILS_STATIC_PATH + '/' + video_obj.thumbnail } return formated_video diff --git a/server/tests/api/multiplePods.js b/server/tests/api/multiplePods.js index c19f120ef..b361e373b 100644 --- a/server/tests/api/multiplePods.js +++ b/server/tests/api/multiplePods.js @@ -110,7 +110,7 @@ describe('Test multiple pods', function () { expect(video.magnetUri).to.equal.magnetUri } - utils.testImage(server.url, 'video_short1.webm', video.thumbnail_path, function (err, test) { + utils.testImage(server.url, 'video_short1.webm', video.thumbnailPath, function (err, test) { if (err) throw err expect(test).to.equal(true) @@ -165,7 +165,7 @@ describe('Test multiple pods', function () { expect(video.magnetUri).to.equal.magnetUri } - utils.testImage(server.url, 'video_short2.webm', video.thumbnail_path, function (err, test) { + utils.testImage(server.url, 'video_short2.webm', video.thumbnailPath, function (err, test) { if (err) throw err expect(test).to.equal(true) @@ -241,11 +241,11 @@ describe('Test multiple pods', function () { expect(video2.magnetUri).to.equal.magnetUri } - utils.testImage(server.url, 'video_short3.webm', video1.thumbnail_path, function (err, test) { + utils.testImage(server.url, 'video_short3.webm', video1.thumbnailPath, function (err, test) { if (err) throw err expect(test).to.equal(true) - utils.testImage(server.url, 'video_short.webm', video2.thumbnail_path, function (err, test) { + utils.testImage(server.url, 'video_short.webm', video2.thumbnailPath, function (err, test) { if (err) throw err expect(test).to.equal(true) diff --git a/server/tests/api/singlePod.js b/server/tests/api/singlePod.js index 9a9af0901..e8b578770 100644 --- a/server/tests/api/singlePod.js +++ b/server/tests/api/singlePod.js @@ -76,7 +76,7 @@ describe('Test a single pod', function () { expect(video.author).to.equal('root') expect(video.isLocal).to.be.true - utils.testImage(server.url, 'video_short.webm', video.thumbnail_path, function (err, test) { + utils.testImage(server.url, 'video_short.webm', video.thumbnailPath, function (err, test) { if (err) throw err expect(test).to.equal(true) @@ -108,7 +108,7 @@ describe('Test a single pod', function () { expect(video.author).to.equal('root') expect(video.isLocal).to.be.true - utils.testImage(server.url, 'video_short.webm', video.thumbnail_path, function (err, test) { + utils.testImage(server.url, 'video_short.webm', video.thumbnailPath, function (err, test) { if (err) throw err expect(test).to.equal(true) @@ -137,7 +137,7 @@ describe('Test a single pod', function () { expect(video.author).to.equal('root') expect(video.isLocal).to.be.true - utils.testImage(server.url, 'video_short.webm', video.thumbnail_path, function (err, test) { + utils.testImage(server.url, 'video_short.webm', video.thumbnailPath, function (err, test) { if (err) throw err expect(test).to.equal(true) @@ -220,7 +220,7 @@ describe('Test a single pod', function () { if (err) throw err const video_name = video.name.replace(' name', '') - utils.testImage(server.url, video_name, video.thumbnail_path, function (err, test) { + utils.testImage(server.url, video_name, video.thumbnailPath, function (err, test) { if (err) throw err expect(test).to.equal(true)