aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/tests
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2016-08-09 21:44:45 +0200
committerChocobozzz <florian.bigard@gmail.com>2016-08-09 21:44:45 +0200
commit68a3b9f2aacb0225ae8b883b561b144bac339cbd (patch)
treee3d75b7952073ba4b2ef4b62ed57ded9f3cf0f1e /server/tests
parent45b81debd6d6647980da7ad5a984bafa37cb79ea (diff)
downloadPeerTube-68a3b9f2aacb0225ae8b883b561b144bac339cbd.tar.gz
PeerTube-68a3b9f2aacb0225ae8b883b561b144bac339cbd.tar.zst
PeerTube-68a3b9f2aacb0225ae8b883b561b144bac339cbd.zip
Server: delete user with the id and not the username
Diffstat (limited to 'server/tests')
-rw-r--r--server/tests/api/checkParams.js8
-rw-r--r--server/tests/api/users.js2
-rw-r--r--server/tests/utils/users.js6
3 files changed, 8 insertions, 8 deletions
diff --git a/server/tests/api/checkParams.js b/server/tests/api/checkParams.js
index 128b07c4a..882948fac 100644
--- a/server/tests/api/checkParams.js
+++ b/server/tests/api/checkParams.js
@@ -610,23 +610,23 @@ describe('Test parameters validator', function () {
610 }) 610 })
611 611
612 describe('When removing an user', function () { 612 describe('When removing an user', function () {
613 it('Should fail with an incorrect username', function (done) { 613 it('Should fail with an incorrect id', function (done) {
614 request(server.url) 614 request(server.url)
615 .delete(path + 'bla-bla') 615 .delete(path + 'bla-bla')
616 .set('Authorization', 'Bearer ' + server.accessToken) 616 .set('Authorization', 'Bearer ' + server.accessToken)
617 .expect(400, done) 617 .expect(400, done)
618 }) 618 })
619 619
620 it('Should return 404 with a non existing username', function (done) { 620 it('Should return 404 with a non existing id', function (done) {
621 request(server.url) 621 request(server.url)
622 .delete(path + 'qzzerg') 622 .delete(path + '579f982228c99c221d8092b8')
623 .set('Authorization', 'Bearer ' + server.accessToken) 623 .set('Authorization', 'Bearer ' + server.accessToken)
624 .expect(404, done) 624 .expect(404, done)
625 }) 625 })
626 626
627 it('Should success with the correct parameters', function (done) { 627 it('Should success with the correct parameters', function (done) {
628 request(server.url) 628 request(server.url)
629 .delete(path + 'user1') 629 .delete(path + userId)
630 .set('Authorization', 'Bearer ' + server.accessToken) 630 .set('Authorization', 'Bearer ' + server.accessToken)
631 .expect(204, done) 631 .expect(204, done)
632 }) 632 })
diff --git a/server/tests/api/users.js b/server/tests/api/users.js
index 6f9eef181..a2557d2ab 100644
--- a/server/tests/api/users.js
+++ b/server/tests/api/users.js
@@ -235,7 +235,7 @@ describe('Test users', function () {
235 }) 235 })
236 236
237 it('Should be able to remove this user', function (done) { 237 it('Should be able to remove this user', function (done) {
238 usersUtils.removeUser(server.url, accessToken, 'user_1', done) 238 usersUtils.removeUser(server.url, userId, accessToken, done)
239 }) 239 })
240 240
241 it('Should not be able to login with this user', function (done) { 241 it('Should not be able to login with this user', function (done) {
diff --git a/server/tests/utils/users.js b/server/tests/utils/users.js
index ed7a9d672..3b560e409 100644
--- a/server/tests/utils/users.js
+++ b/server/tests/utils/users.js
@@ -52,7 +52,7 @@ function getUsersList (url, end) {
52 .end(end) 52 .end(end)
53} 53}
54 54
55function removeUser (url, token, username, expectedStatus, end) { 55function removeUser (url, userId, accessToken, expectedStatus, end) {
56 if (!end) { 56 if (!end) {
57 end = expectedStatus 57 end = expectedStatus
58 expectedStatus = 204 58 expectedStatus = 204
@@ -61,9 +61,9 @@ function removeUser (url, token, username, expectedStatus, end) {
61 const path = '/api/v1/users' 61 const path = '/api/v1/users'
62 62
63 request(url) 63 request(url)
64 .delete(path + '/' + username) 64 .delete(path + '/' + userId)
65 .set('Accept', 'application/json') 65 .set('Accept', 'application/json')
66 .set('Authorization', 'Bearer ' + token) 66 .set('Authorization', 'Bearer ' + accessToken)
67 .expect(expectedStatus) 67 .expect(expectedStatus)
68 .end(end) 68 .end(end)
69} 69}