Remove useless anonymous functions of files

1 files changed, 169 insertions, 171 deletions

diff --git a/tests/api/utils.js b/tests/api/utils.js
index b71e943ed..47b706294 100644
--- a/tests/api/utils.js
+++ b/tests/api/utils.js
@@ -1,187 +1,185 @@
-;(function () {
-  'use strict'
-
-  var child_process = require('child_process')
-  var exec = child_process.exec
-  var fork = child_process.fork
-  var pathUtils = require('path')
-  var request = require('supertest')
-
-  var testUtils = {
-    flushTests: flushTests,
-    getFriendsList: getFriendsList,
-    getVideosList: getVideosList,
-    makeFriends: makeFriends,
-    quitFriends: quitFriends,
-    removeVideo: removeVideo,
-    flushAndRunMultipleServers: flushAndRunMultipleServers,
-    runServer: runServer,
-    searchVideo: searchVideo,
-    uploadVideo: uploadVideo
+'use strict'
+
+var child_process = require('child_process')
+var exec = child_process.exec
+var fork = child_process.fork
+var pathUtils = require('path')
+var request = require('supertest')
+
+var testUtils = {
+  flushTests: flushTests,
+  getFriendsList: getFriendsList,
+  getVideosList: getVideosList,
+  makeFriends: makeFriends,
+  quitFriends: quitFriends,
+  removeVideo: removeVideo,
+  flushAndRunMultipleServers: flushAndRunMultipleServers,
+  runServer: runServer,
+  searchVideo: searchVideo,
+  uploadVideo: uploadVideo
+}
+
+// ---------------------- Export functions --------------------
+
+function flushTests (callback) {
+  exec(pathUtils.join(__dirname, '../../scripts/clean_test.sh'), callback)
+}
+
+function getFriendsList (url, end) {
+  var path = '/api/v1/pods/'
+
+  request(url)
+    .get(path)
+    .set('Accept', 'application/json')
+    .expect(200)
+    .expect('Content-Type', /json/)
+    .end(end)
+}
+
+function getVideosList (url, end) {
+  var path = '/api/v1/videos'
+
+  request(url)
+    .get(path)
+    .set('Accept', 'application/json')
+    .expect(200)
+    .expect('Content-Type', /json/)
+    .end(end)
+}
+
+function makeFriends (url, expected_status, callback) {
+  if (!callback) {
+    callback = expected_status
+    expected_status = 204
   }
 
-  // ---------------------- Export functions --------------------
+  var path = '/api/v1/pods/makefriends'
 
-  function flushTests (callback) {
-    exec(pathUtils.join(__dirname, '../../scripts/clean_test.sh'), callback)
-  }
-
-  function getFriendsList (url, end) {
-    var path = '/api/v1/pods/'
-
-    request(url)
-      .get(path)
-      .set('Accept', 'application/json')
-      .expect(200)
-      .expect('Content-Type', /json/)
-      .end(end)
-  }
-
-  function getVideosList (url, end) {
-    var path = '/api/v1/videos'
-
-    request(url)
-      .get(path)
-      .set('Accept', 'application/json')
-      .expect(200)
-      .expect('Content-Type', /json/)
-      .end(end)
-  }
-
-  function makeFriends (url, expected_status, callback) {
-    if (!callback) {
-      callback = expected_status
-      expected_status = 204
-    }
-
-    var path = '/api/v1/pods/makefriends'
-
-    // The first pod make friend with the third
-    request(url)
-      .get(path)
-      .set('Accept', 'application/json')
-      .expect(expected_status)
-      .end(function (err, res) {
-        if (err) throw err
-
-        // Wait for the request between pods
-        setTimeout(callback, 1000)
-      })
-  }
-
-  function quitFriends (url, callback) {
-    var path = '/api/v1/pods/quitfriends'
+  // The first pod make friend with the third
+  request(url)
+    .get(path)
+    .set('Accept', 'application/json')
+    .expect(expected_status)
+    .end(function (err, res) {
+      if (err) throw err
 
-    // The first pod make friend with the third
-    request(url)
-      .get(path)
-      .set('Accept', 'application/json')
-      .expect(204)
-      .end(function (err, res) {
-        if (err) throw err
-
-        // Wait for the request between pods
-        setTimeout(callback, 1000)
-      })
-  }
-
-  function removeVideo (url, id, end) {
-    var path = '/api/v1/videos'
-
-    request(url)
-      .delete(path + '/' + id)
-      .set('Accept', 'application/json')
-      .expect(204)
-      .end(end)
-  }
-
-  function flushAndRunMultipleServers (total_servers, serversRun) {
-    var apps = []
-    var urls = []
-    var i = 0
-
-    function anotherServerDone (number, app, url) {
-      apps[number - 1] = app
-      urls[number - 1] = url
-      i++
-      if (i === total_servers) {
-        serversRun(apps, urls)
-      }
-    }
-
-    flushTests(function () {
-      for (var j = 1; j <= total_servers; j++) {
-        (function (k) { // TODO: ES6 with let
-          // For the virtual buffer
-          setTimeout(function () {
-            runServer(k, function (app, url) {
-              anotherServerDone(k, app, url)
-            })
-          }, 1000 * k)
-        })(j)
-      }
+      // Wait for the request between pods
+      setTimeout(callback, 1000)
     })
-  }
+}
 
-  function runServer (number, callback) {
-    var port = 9000 + number
-    var server_run_string = {
-      'Connected to mongodb': false,
-      'Server listening on port': false
-    }
+function quitFriends (url, callback) {
+  var path = '/api/v1/pods/quitfriends'
 
-    // Share the environment
-    var env = Object.create(process.env)
-    env.NODE_ENV = 'test'
-    env.NODE_APP_INSTANCE = number
-    var options = {
-      silent: true,
-      env: env,
-      detached: true
-    }
-
-    var app = fork(pathUtils.join(__dirname, '../../server.js'), [], options)
-    app.stdout.on('data', function onStdout (data) {
-      var dont_continue = false
-      // Check if all required sentences are here
-      for (var key of Object.keys(server_run_string)) {
-        if (data.toString().indexOf(key) !== -1) server_run_string[key] = true
-        if (server_run_string[key] === false) dont_continue = true
-      }
+  // The first pod make friend with the third
+  request(url)
+    .get(path)
+    .set('Accept', 'application/json')
+    .expect(204)
+    .end(function (err, res) {
+      if (err) throw err
 
-      // If no, there is maybe one thing not already initialized (mongodb...)
-      if (dont_continue === true) return
-
-      app.stdout.removeListener('data', onStdout)
-      callback(app, 'http://localhost:' + port)
+      // Wait for the request between pods
+      setTimeout(callback, 1000)
     })
+}
+
+function removeVideo (url, id, end) {
+  var path = '/api/v1/videos'
+
+  request(url)
+    .delete(path + '/' + id)
+    .set('Accept', 'application/json')
+    .expect(204)
+    .end(end)
+}
+
+function flushAndRunMultipleServers (total_servers, serversRun) {
+  var apps = []
+  var urls = []
+  var i = 0
+
+  function anotherServerDone (number, app, url) {
+    apps[number - 1] = app
+    urls[number - 1] = url
+    i++
+    if (i === total_servers) {
+      serversRun(apps, urls)
+    }
   }
 
-  function searchVideo (url, search, end) {
-    var path = '/api/v1/videos'
-
-    request(url)
-      .get(path + '/search/' + search)
-      .set('Accept', 'application/json')
-      .expect(200)
-      .expect('Content-Type', /json/)
-      .end(end)
+  flushTests(function () {
+    for (var j = 1; j <= total_servers; j++) {
+      (function (k) { // TODO: ES6 with let
+        // For the virtual buffer
+        setTimeout(function () {
+          runServer(k, function (app, url) {
+            anotherServerDone(k, app, url)
+          })
+        }, 1000 * k)
+      })(j)
+    }
+  })
+}
+
+function runServer (number, callback) {
+  var port = 9000 + number
+  var server_run_string = {
+    'Connected to mongodb': false,
+    'Server listening on port': false
   }
 
-  function uploadVideo (url, name, description, fixture, end) {
-    var path = '/api/v1/videos'
-
-    request(url)
-      .post(path)
-      .set('Accept', 'application/json')
-      .field('name', name)
-      .field('description', description)
-      .attach('input_video', pathUtils.join(__dirname, 'fixtures', fixture))
-      .expect(201)
-      .end(end)
+  // Share the environment
+  var env = Object.create(process.env)
+  env.NODE_ENV = 'test'
+  env.NODE_APP_INSTANCE = number
+  var options = {
+    silent: true,
+    env: env,
+    detached: true
   }
 
-  // ---------------------------------------------------------------------------
+  var app = fork(pathUtils.join(__dirname, '../../server.js'), [], options)
+  app.stdout.on('data', function onStdout (data) {
+    var dont_continue = false
+    // Check if all required sentences are here
+    for (var key of Object.keys(server_run_string)) {
+      if (data.toString().indexOf(key) !== -1) server_run_string[key] = true
+      if (server_run_string[key] === false) dont_continue = true
+    }
 
-  module.exports = testUtils
-})()
+    // If no, there is maybe one thing not already initialized (mongodb...)
+    if (dont_continue === true) return
+
+    app.stdout.removeListener('data', onStdout)
+    callback(app, 'http://localhost:' + port)
+  })
+}
+
+function searchVideo (url, search, end) {
+  var path = '/api/v1/videos'
+
+  request(url)
+    .get(path + '/search/' + search)
+    .set('Accept', 'application/json')
+    .expect(200)
+    .expect('Content-Type', /json/)
+    .end(end)
+}
+
+function uploadVideo (url, name, description, fixture, end) {
+  var path = '/api/v1/videos'
+
+  request(url)
+    .post(path)
+    .set('Accept', 'application/json')
+    .field('name', name)
+    .field('description', description)
+    .attach('input_video', pathUtils.join(__dirname, 'fixtures', fixture))
+    .expect(201)
+    .end(end)
+}
+
+// ---------------------------------------------------------------------------
+
+module.exports = testUtils