aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/tests/utils
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2016-12-11 21:50:51 +0100
committerChocobozzz <florian.bigard@gmail.com>2016-12-19 21:22:28 +0100
commitfeb4bdfd9b46e87aadfa7c0d5338cde887d1f58c (patch)
tree2abc9fbc9569760e218fd52835850b757344b420 /server/tests/utils
parent108626609eda75e4ecc0a83a650a4d53c46220e0 (diff)
downloadPeerTube-feb4bdfd9b46e87aadfa7c0d5338cde887d1f58c.tar.gz
PeerTube-feb4bdfd9b46e87aadfa7c0d5338cde887d1f58c.tar.zst
PeerTube-feb4bdfd9b46e87aadfa7c0d5338cde887d1f58c.zip
First version with PostgreSQL
Diffstat (limited to 'server/tests/utils')
-rw-r--r--server/tests/utils/servers.js4
-rw-r--r--server/tests/utils/videos.js2
2 files changed, 3 insertions, 3 deletions
diff --git a/server/tests/utils/servers.js b/server/tests/utils/servers.js
index 01c9a2f39..4e55f8f5c 100644
--- a/server/tests/utils/servers.js
+++ b/server/tests/utils/servers.js
@@ -60,12 +60,12 @@ function runServer (number, callback) {
60 60
61 // These actions are async so we need to be sure that they have both been done 61 // These actions are async so we need to be sure that they have both been done
62 const serverRunString = { 62 const serverRunString = {
63 'Connected to mongodb': false, 63 'Database is ready': false,
64 'Server listening on port': false 64 'Server listening on port': false
65 } 65 }
66 66
67 const regexps = { 67 const regexps = {
68 client_id: 'Client id: ([a-f0-9]+)', 68 client_id: 'Client id: (.+)',
69 client_secret: 'Client secret: (.+)', 69 client_secret: 'Client secret: (.+)',
70 user_username: 'Username: (.+)', 70 user_username: 'Username: (.+)',
71 user_password: 'User password: (.+)' 71 user_password: 'User password: (.+)'
diff --git a/server/tests/utils/videos.js b/server/tests/utils/videos.js
index 536093db1..5c120597f 100644
--- a/server/tests/utils/videos.js
+++ b/server/tests/utils/videos.js
@@ -25,7 +25,7 @@ function getAllVideosListBy (url, end) {
25 25
26 request(url) 26 request(url)
27 .get(path) 27 .get(path)
28 .query({ sort: 'createdDate' }) 28 .query({ sort: 'createdAt' })
29 .query({ start: 0 }) 29 .query({ start: 0 })
30 .query({ count: 10000 }) 30 .query({ count: 10000 })
31 .set('Accept', 'application/json') 31 .set('Accept', 'application/json')