aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/tests
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2016-03-07 18:53:03 +0100
committerChocobozzz <florian.bigard@gmail.com>2016-03-07 18:53:03 +0100
commit3d446a26ada901331faaaf3be9083dfe6773b50a (patch)
tree35262fa99301db3f22ca6e61a84ce346ed4f4bb7 /server/tests
parent6a1e67b30a77b0e24314617f794a7122dd83c570 (diff)
downloadPeerTube-3d446a26ada901331faaaf3be9083dfe6773b50a.tar.gz
PeerTube-3d446a26ada901331faaaf3be9083dfe6773b50a.tar.zst
PeerTube-3d446a26ada901331faaaf3be9083dfe6773b50a.zip
Fix tests
Diffstat (limited to 'server/tests')
-rw-r--r--server/tests/api/checkParams.js2
-rw-r--r--server/tests/api/singlePod.js2
-rw-r--r--server/tests/api/utils.js4
3 files changed, 4 insertions, 4 deletions
diff --git a/server/tests/api/checkParams.js b/server/tests/api/checkParams.js
index 1c1ec71b3..01b620873 100644
--- a/server/tests/api/checkParams.js
+++ b/server/tests/api/checkParams.js
@@ -252,7 +252,7 @@ describe('Test parameters validator', function () {
252 it('Should have 404 with nothing', function (done) { 252 it('Should have 404 with nothing', function (done) {
253 request(url) 253 request(url)
254 .delete(path) 254 .delete(path)
255 .expect(404, done) 255 .expect(400, done)
256 }) 256 })
257 257
258 it('Should fail without a mongodb id', function (done) { 258 it('Should fail without a mongodb id', function (done) {
diff --git a/server/tests/api/singlePod.js b/server/tests/api/singlePod.js
index 3dd72c01b..d572aacf6 100644
--- a/server/tests/api/singlePod.js
+++ b/server/tests/api/singlePod.js
@@ -112,7 +112,7 @@ describe('Test a single pod', function () {
112 utils.removeVideo(url, video_id, function (err) { 112 utils.removeVideo(url, video_id, function (err) {
113 if (err) throw err 113 if (err) throw err
114 114
115 fs.readdir(pathUtils.join(__dirname, '../../test1/uploads/'), function (err, files) { 115 fs.readdir(pathUtils.join(__dirname, '../../../test1/uploads/'), function (err, files) {
116 if (err) throw err 116 if (err) throw err
117 117
118 expect(files.length).to.equal(0) 118 expect(files.length).to.equal(0)
diff --git a/server/tests/api/utils.js b/server/tests/api/utils.js
index 47b706294..c70696571 100644
--- a/server/tests/api/utils.js
+++ b/server/tests/api/utils.js
@@ -22,7 +22,7 @@ var testUtils = {
22// ---------------------- Export functions -------------------- 22// ---------------------- Export functions --------------------
23 23
24function flushTests (callback) { 24function flushTests (callback) {
25 exec(pathUtils.join(__dirname, '../../scripts/clean_test.sh'), callback) 25 exec(pathUtils.join(__dirname, '../../../bin/clean_test.sh'), callback)
26} 26}
27 27
28function getFriendsList (url, end) { 28function getFriendsList (url, end) {
@@ -139,7 +139,7 @@ function runServer (number, callback) {
139 detached: true 139 detached: true
140 } 140 }
141 141
142 var app = fork(pathUtils.join(__dirname, '../../server.js'), [], options) 142 var app = fork(pathUtils.join(__dirname, '../../../server.js'), [], options)
143 app.stdout.on('data', function onStdout (data) { 143 app.stdout.on('data', function onStdout (data) {
144 var dont_continue = false 144 var dont_continue = false
145 // Check if all required sentences are here 145 // Check if all required sentences are here