1 files changed, 31 insertions, 28 deletions

diff --git a/server/tests/api/users.js b/server/tests/api/users.js
index e1d4a8cf4..6f9eef181 100644
--- a/server/tests/api/users.js
+++ b/server/tests/api/users.js
@@ -5,11 +5,14 @@ const expect = chai.expect
 const pathUtils = require('path')
 const series = require('async/series')
 
+const loginUtils = require('../utils/login')
+const podsUtils = require('../utils/pods')
+const serversUtils = require('../utils/servers')
+const usersUtils = require('../utils/users')
+const videosUtils = require('../utils/videos')
 const webtorrent = require(pathUtils.join(__dirname, '../../lib/webtorrent'))
 webtorrent.silent = true
 
-const utils = require('./utils')
-
 describe('Test users', function () {
   let server = null
   let accessToken = null
@@ -22,10 +25,10 @@ describe('Test users', function () {
 
     series([
       function (next) {
-        utils.flushTests(next)
+        serversUtils.flushTests(next)
       },
       function (next) {
-        utils.runServer(1, function (server1) {
+        serversUtils.runServer(1, function (server1) {
           server = server1
           next()
         })
@@ -41,7 +44,7 @@ describe('Test users', function () {
 
   it('Should not login with an invalid client id', function (done) {
     const client = { id: 'client', password: server.client.secret }
-    utils.login(server.url, client, server.user, 400, function (err, res) {
+    loginUtils.login(server.url, client, server.user, 400, function (err, res) {
       if (err) throw err
 
       expect(res.body.error).to.equal('invalid_client')
@@ -51,7 +54,7 @@ describe('Test users', function () {
 
   it('Should not login with an invalid client password', function (done) {
     const client = { id: server.client.id, password: 'coucou' }
-    utils.login(server.url, client, server.user, 400, function (err, res) {
+    loginUtils.login(server.url, client, server.user, 400, function (err, res) {
       if (err) throw err
 
       expect(res.body.error).to.equal('invalid_client')
@@ -61,7 +64,7 @@ describe('Test users', function () {
 
   it('Should not login with an invalid username', function (done) {
     const user = { username: 'captain crochet', password: server.user.password }
-    utils.login(server.url, server.client, user, 400, function (err, res) {
+    loginUtils.login(server.url, server.client, user, 400, function (err, res) {
       if (err) throw err
 
       expect(res.body.error).to.equal('invalid_grant')
@@ -71,7 +74,7 @@ describe('Test users', function () {
 
   it('Should not login with an invalid password', function (done) {
     const user = { username: server.user.username, password: 'mewthree' }
-    utils.login(server.url, server.client, user, 400, function (err, res) {
+    loginUtils.login(server.url, server.client, user, 400, function (err, res) {
       if (err) throw err
 
       expect(res.body.error).to.equal('invalid_grant')
@@ -86,21 +89,21 @@ describe('Test users', function () {
     const description = 'my super description'
     const tags = [ 'tag1', 'tag2' ]
     const video = 'video_short.webm'
-    utils.uploadVideo(server.url, accessToken, name, description, tags, video, 401, done)
+    videosUtils.uploadVideo(server.url, accessToken, name, description, tags, video, 401, done)
   })
 
   it('Should not be able to make friends', function (done) {
     accessToken = 'mysupertoken'
-    utils.makeFriends(server.url, accessToken, 401, done)
+    podsUtils.makeFriends(server.url, accessToken, 401, done)
   })
 
   it('Should not be able to quit friends', function (done) {
     accessToken = 'mysupertoken'
-    utils.quitFriends(server.url, accessToken, 401, done)
+    podsUtils.quitFriends(server.url, accessToken, 401, done)
   })
 
   it('Should be able to login', function (done) {
-    utils.login(server.url, server.client, server.user, 200, function (err, res) {
+    loginUtils.login(server.url, server.client, server.user, 200, function (err, res) {
       if (err) throw err
 
       accessToken = res.body.access_token
@@ -113,10 +116,10 @@ describe('Test users', function () {
     const description = 'my super description'
     const tags = [ 'tag1', 'tag2' ]
     const video = 'video_short.webm'
-    utils.uploadVideo(server.url, accessToken, name, description, tags, video, 204, function (err, res) {
+    videosUtils.uploadVideo(server.url, accessToken, name, description, tags, video, 204, function (err, res) {
       if (err) throw err
 
-      utils.getVideosList(server.url, function (err, res) {
+      videosUtils.getVideosList(server.url, function (err, res) {
         if (err) throw err
 
         const video = res.body.data[0]
@@ -133,17 +136,17 @@ describe('Test users', function () {
     const description = 'my super description 2'
     const tags = [ 'tag1' ]
     const video = 'video_short.webm'
-    utils.uploadVideo(server.url, accessToken, name, description, tags, video, 204, done)
+    videosUtils.uploadVideo(server.url, accessToken, name, description, tags, video, 204, done)
   })
 
   it('Should not be able to remove the video with an incorrect token', function (done) {
-    utils.removeVideo(server.url, 'bad_token', videoId, 401, done)
+    videosUtils.removeVideo(server.url, 'bad_token', videoId, 401, done)
   })
 
   it('Should not be able to remove the video with the token of another account')
 
   it('Should be able to remove the video with the correct token', function (done) {
-    utils.removeVideo(server.url, accessToken, videoId, done)
+    videosUtils.removeVideo(server.url, accessToken, videoId, done)
   })
 
   it('Should logout (revoke token)')
@@ -161,7 +164,7 @@ describe('Test users', function () {
   it('Should be able to upload a video again')
 
   it('Should be able to create a new user', function (done) {
-    utils.createUser(server.url, accessToken, 'user_1', 'super password', done)
+    usersUtils.createUser(server.url, accessToken, 'user_1', 'super password', done)
   })
 
   it('Should be able to login with this user', function (done) {
@@ -170,7 +173,7 @@ describe('Test users', function () {
       password: 'super password'
     }
 
-    utils.loginAndGetAccessToken(server, function (err, token) {
+    loginUtils.loginAndGetAccessToken(server, function (err, token) {
       if (err) throw err
 
       accessTokenUser = token
@@ -180,7 +183,7 @@ describe('Test users', function () {
   })
 
   it('Should be able to get the user informations', function (done) {
-    utils.getUserInformation(server.url, accessTokenUser, function (err, res) {
+    usersUtils.getUserInformation(server.url, accessTokenUser, function (err, res) {
       if (err) throw err
 
       const user = res.body
@@ -199,11 +202,11 @@ describe('Test users', function () {
     const description = 'my super description'
     const tags = [ 'tag1', 'tag2', 'tag3' ]
     const file = 'video_short.webm'
-    utils.uploadVideo(server.url, accessTokenUser, name, description, tags, file, done)
+    videosUtils.uploadVideo(server.url, accessTokenUser, name, description, tags, file, done)
   })
 
   it('Should list all the users', function (done) {
-    utils.getUsersList(server.url, function (err, res) {
+    usersUtils.getUsersList(server.url, function (err, res) {
       if (err) throw err
 
       const users = res.body.data
@@ -223,25 +226,25 @@ describe('Test users', function () {
   })
 
   it('Should update the user password', function (done) {
-    utils.updateUser(server.url, userId, accessTokenUser, 'new password', function (err, res) {
+    usersUtils.updateUser(server.url, userId, accessTokenUser, 'new password', function (err, res) {
       if (err) throw err
 
       server.user.password = 'new password'
-      utils.login(server.url, server.client, server.user, 200, done)
+      loginUtils.login(server.url, server.client, server.user, 200, done)
     })
   })
 
   it('Should be able to remove this user', function (done) {
-    utils.removeUser(server.url, accessToken, 'user_1', done)
+    usersUtils.removeUser(server.url, accessToken, 'user_1', done)
   })
 
   it('Should not be able to login with this user', function (done) {
     // server.user is already set to user 1
-    utils.login(server.url, server.client, server.user, 400, done)
+    loginUtils.login(server.url, server.client, server.user, 400, done)
   })
 
   it('Should not have videos of this user', function (done) {
-    utils.getVideosList(server.url, function (err, res) {
+    videosUtils.getVideosList(server.url, function (err, res) {
       if (err) throw err
 
       expect(res.body.total).to.equal(1)
@@ -257,7 +260,7 @@ describe('Test users', function () {
 
     // Keep the logs if the test failed
     if (this.ok) {
-      utils.flushTests(done)
+      serversUtils.flushTests(done)
     } else {
       done()
     }