aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2016-05-10 22:24:04 +0200
committerChocobozzz <florian.bigard@gmail.com>2016-05-10 22:24:04 +0200
commit36d560246f1d53f1d1c41d789d93349118b3492d (patch)
treefac4a278d00b7f5a4e7dcca1dc445f41fd41da62
parent9e5f374090ea0fb16f93edd79d5ad61a55db91e5 (diff)
downloadPeerTube-36d560246f1d53f1d1c41d789d93349118b3492d.tar.gz
PeerTube-36d560246f1d53f1d1c41d789d93349118b3492d.tar.zst
PeerTube-36d560246f1d53f1d1c41d789d93349118b3492d.zip
thumbnail_path -> thumbnailPath
-rw-r--r--server/controllers/api/v1/videos.js2
-rw-r--r--server/tests/api/multiplePods.js8
-rw-r--r--server/tests/api/singlePod.js8
3 files changed, 9 insertions, 9 deletions
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) {
182 magnetUri: video_obj.magnetUri, 182 magnetUri: video_obj.magnetUri,
183 author: video_obj.author, 183 author: video_obj.author,
184 duration: video_obj.duration, 184 duration: video_obj.duration,
185 thumbnail_path: constants.THUMBNAILS_STATIC_PATH + '/' + video_obj.thumbnail 185 thumbnailPath: constants.THUMBNAILS_STATIC_PATH + '/' + video_obj.thumbnail
186 } 186 }
187 187
188 return formated_video 188 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 () {
110 expect(video.magnetUri).to.equal.magnetUri 110 expect(video.magnetUri).to.equal.magnetUri
111 } 111 }
112 112
113 utils.testImage(server.url, 'video_short1.webm', video.thumbnail_path, function (err, test) { 113 utils.testImage(server.url, 'video_short1.webm', video.thumbnailPath, function (err, test) {
114 if (err) throw err 114 if (err) throw err
115 expect(test).to.equal(true) 115 expect(test).to.equal(true)
116 116
@@ -165,7 +165,7 @@ describe('Test multiple pods', function () {
165 expect(video.magnetUri).to.equal.magnetUri 165 expect(video.magnetUri).to.equal.magnetUri
166 } 166 }
167 167
168 utils.testImage(server.url, 'video_short2.webm', video.thumbnail_path, function (err, test) { 168 utils.testImage(server.url, 'video_short2.webm', video.thumbnailPath, function (err, test) {
169 if (err) throw err 169 if (err) throw err
170 expect(test).to.equal(true) 170 expect(test).to.equal(true)
171 171
@@ -241,11 +241,11 @@ describe('Test multiple pods', function () {
241 expect(video2.magnetUri).to.equal.magnetUri 241 expect(video2.magnetUri).to.equal.magnetUri
242 } 242 }
243 243
244 utils.testImage(server.url, 'video_short3.webm', video1.thumbnail_path, function (err, test) { 244 utils.testImage(server.url, 'video_short3.webm', video1.thumbnailPath, function (err, test) {
245 if (err) throw err 245 if (err) throw err
246 expect(test).to.equal(true) 246 expect(test).to.equal(true)
247 247
248 utils.testImage(server.url, 'video_short.webm', video2.thumbnail_path, function (err, test) { 248 utils.testImage(server.url, 'video_short.webm', video2.thumbnailPath, function (err, test) {
249 if (err) throw err 249 if (err) throw err
250 expect(test).to.equal(true) 250 expect(test).to.equal(true)
251 251
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 () {
76 expect(video.author).to.equal('root') 76 expect(video.author).to.equal('root')
77 expect(video.isLocal).to.be.true 77 expect(video.isLocal).to.be.true
78 78
79 utils.testImage(server.url, 'video_short.webm', video.thumbnail_path, function (err, test) { 79 utils.testImage(server.url, 'video_short.webm', video.thumbnailPath, function (err, test) {
80 if (err) throw err 80 if (err) throw err
81 expect(test).to.equal(true) 81 expect(test).to.equal(true)
82 82
@@ -108,7 +108,7 @@ describe('Test a single pod', function () {
108 expect(video.author).to.equal('root') 108 expect(video.author).to.equal('root')
109 expect(video.isLocal).to.be.true 109 expect(video.isLocal).to.be.true
110 110
111 utils.testImage(server.url, 'video_short.webm', video.thumbnail_path, function (err, test) { 111 utils.testImage(server.url, 'video_short.webm', video.thumbnailPath, function (err, test) {
112 if (err) throw err 112 if (err) throw err
113 expect(test).to.equal(true) 113 expect(test).to.equal(true)
114 114
@@ -137,7 +137,7 @@ describe('Test a single pod', function () {
137 expect(video.author).to.equal('root') 137 expect(video.author).to.equal('root')
138 expect(video.isLocal).to.be.true 138 expect(video.isLocal).to.be.true
139 139
140 utils.testImage(server.url, 'video_short.webm', video.thumbnail_path, function (err, test) { 140 utils.testImage(server.url, 'video_short.webm', video.thumbnailPath, function (err, test) {
141 if (err) throw err 141 if (err) throw err
142 expect(test).to.equal(true) 142 expect(test).to.equal(true)
143 143
@@ -220,7 +220,7 @@ describe('Test a single pod', function () {
220 if (err) throw err 220 if (err) throw err
221 const video_name = video.name.replace(' name', '') 221 const video_name = video.name.replace(' name', '')
222 222
223 utils.testImage(server.url, video_name, video.thumbnail_path, function (err, test) { 223 utils.testImage(server.url, video_name, video.thumbnailPath, function (err, test) {
224 if (err) throw err 224 if (err) throw err
225 225
226 expect(test).to.equal(true) 226 expect(test).to.equal(true)