From b4c5ac97ffa3e16f837b7e2d72291656eefac812 Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Sun, 26 Mar 2017 18:39:01 +0200
Subject: Server: refractoring upload/update video test utils

---
 server/tests/real-world/real-world.js   | 25 ++++++++++++++-----------
 server/tests/real-world/tools/upload.js | 11 +++++++++--
 2 files changed, 23 insertions(+), 13 deletions(-)

(limited to 'server/tests/real-world')

diff --git a/server/tests/real-world/real-world.js b/server/tests/real-world/real-world.js
index f17c83f85..32afeec68 100644
--- a/server/tests/real-world/real-world.js
+++ b/server/tests/real-world/real-world.js
@@ -200,15 +200,16 @@ function exitServers (servers, callback) {
 function upload (servers, numServer, callback) {
   if (!callback) callback = function () {}
 
-  const name = Date.now() + ' name'
-  const category = 4
-  const description = Date.now() + ' description'
-  const tags = [ Date.now().toString().substring(0, 5) + 't1', Date.now().toString().substring(0, 5) + 't2' ]
-  const file = 'video_short1.webm'
-
   console.log('Uploading video to server ' + numServer)
 
-  videosUtils.uploadVideo(servers[numServer].url, servers[numServer].accessToken, name, category, description, tags, file, callback)
+  const videoAttributes = {
+    name: Date.now() + ' name',
+    category: 4,
+    description: Date.now() + ' description',
+    tags: [ Date.now().toString().substring(0, 5) + 't1', Date.now().toString().substring(0, 5) + 't2' ],
+    fixture: 'video_short1.webm'
+  }
+  videosUtils.uploadVideo(servers[numServer].url, servers[numServer].accessToken, videoAttributes, callback)
 }
 
 function update (servers, numServer, callback) {
@@ -221,13 +222,15 @@ function update (servers, numServer, callback) {
     if (videos.length === 0) return callback()
 
     const toUpdate = videos[getRandomInt(0, videos.length)].id
-    const name = Date.now() + ' name'
-    const description = Date.now() + ' description'
-    const tags = [ Date.now().toString().substring(0, 5) + 't1', Date.now().toString().substring(0, 5) + 't2' ]
+    const attributes = {
+      name: Date.now() + ' name',
+      description: Date.now() + ' description',
+      tags: [ Date.now().toString().substring(0, 5) + 't1', Date.now().toString().substring(0, 5) + 't2' ]
+    }
 
     console.log('Updating video of server ' + numServer)
 
-    videosUtils.updateVideo(servers[numServer].url, servers[numServer].accessToken, toUpdate, name, description, tags, callback)
+    videosUtils.updateVideo(servers[numServer].url, servers[numServer].accessToken, toUpdate, attributes, callback)
   })
 }
 
diff --git a/server/tests/real-world/tools/upload.js b/server/tests/real-world/tools/upload.js
index 49076ee2a..856251c7f 100644
--- a/server/tests/real-world/tools/upload.js
+++ b/server/tests/real-world/tools/upload.js
@@ -49,10 +49,17 @@ function list (val) {
   return val.split(',')
 }
 
-function upload (url, accessToken, name, category, description, tags, file) {
+function upload (url, accessToken, name, category, description, tags, fixture) {
   console.log('Uploading %s video...', program.name)
 
-  utils.uploadVideo(url, accessToken, name, category, description, tags, file, function (err) {
+  const videoAttributes = {
+    name,
+    category,
+    description,
+    tags,
+    fixture
+  }
+  utils.uploadVideo(url, accessToken, videoAttributes, function (err) {
     if (err) throw err
 
     console.log('Video uploaded.')
-- 
cgit v1.2.3