From c48e82b5e0478434de30626d14594a97f2402e7c Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 11 Sep 2018 16:27:07 +0200
Subject: Basic video redundancy implementation
---
server/tests/api/check-params/follows.ts | 9 ---
server/tests/api/check-params/index.ts | 8 ++-
server/tests/api/check-params/redundancy.ts | 103 ++++++++++++++++++++++++++++
3 files changed, 108 insertions(+), 12 deletions(-)
create mode 100644 server/tests/api/check-params/redundancy.ts
(limited to 'server/tests/api/check-params')
diff --git a/server/tests/api/check-params/follows.ts b/server/tests/api/check-params/follows.ts
index 2bc3b27d9..cdc95c81a 100644
--- a/server/tests/api/check-params/follows.ts
+++ b/server/tests/api/check-params/follows.ts
@@ -169,15 +169,6 @@ describe('Test server follows API validators', function () {
statusCodeExpected: 404
})
})
-
- it('Should succeed with the correct parameters', async function () {
- await makeDeleteRequest({
- url: server.url,
- path: path + '/localhost:9002',
- token: server.accessToken,
- statusCodeExpected: 404
- })
- })
})
})
diff --git a/server/tests/api/check-params/index.ts b/server/tests/api/check-params/index.ts
index 777acbb0f..44460a167 100644
--- a/server/tests/api/check-params/index.ts
+++ b/server/tests/api/check-params/index.ts
@@ -1,15 +1,17 @@
// Order of the tests we want to execute
import './accounts'
+import './config'
import './follows'
import './jobs'
+import './redundancy'
+import './search'
import './services'
+import './user-subscriptions'
import './users'
import './video-abuses'
import './video-blacklist'
import './video-captions'
import './video-channels'
import './video-comments'
-import './videos'
import './video-imports'
-import './search'
-import './user-subscriptions'
+import './videos'
diff --git a/server/tests/api/check-params/redundancy.ts b/server/tests/api/check-params/redundancy.ts
new file mode 100644
index 000000000..aa588e3dd
--- /dev/null
+++ b/server/tests/api/check-params/redundancy.ts
@@ -0,0 +1,103 @@
+/* tslint:disable:no-unused-expression */
+
+import 'mocha'
+
+import {
+ createUser,
+ doubleFollow,
+ flushAndRunMultipleServers,
+ flushTests,
+ killallServers,
+ makePutBodyRequest,
+ ServerInfo,
+ setAccessTokensToServers,
+ userLogin
+} from '../../utils'
+
+describe('Test server redundancy API validators', function () {
+ let servers: ServerInfo[]
+ let userAccessToken = null
+
+ // ---------------------------------------------------------------
+
+ before(async function () {
+ this.timeout(30000)
+
+ await flushTests()
+ servers = await flushAndRunMultipleServers(2)
+
+ await setAccessTokensToServers(servers)
+ await doubleFollow(servers[0], servers[1])
+
+ const user = {
+ username: 'user1',
+ password: 'password'
+ }
+
+ await createUser(servers[0].url, servers[0].accessToken, user.username, user.password)
+ userAccessToken = await userLogin(servers[0], user)
+ })
+
+ describe('When updating redundancy', function () {
+ const path = '/api/v1/server/redundancy'
+
+ it('Should fail with an invalid token', async function () {
+ await makePutBodyRequest({
+ url: servers[0].url,
+ path: path + '/localhost:9002',
+ fields: { redundancyAllowed: true },
+ token: 'fake_token',
+ statusCodeExpected: 401
+ })
+ })
+
+ it('Should fail if the user is not an administrator', async function () {
+ await makePutBodyRequest({
+ url: servers[0].url,
+ path: path + '/localhost:9002',
+ fields: { redundancyAllowed: true },
+ token: userAccessToken,
+ statusCodeExpected: 403
+ })
+ })
+
+ it('Should fail if we do not follow this server', async function () {
+ await makePutBodyRequest({
+ url: servers[0].url,
+ path: path + '/example.com',
+ fields: { redundancyAllowed: true },
+ token: servers[0].accessToken,
+ statusCodeExpected: 404
+ })
+ })
+
+ it('Should fail without de redundancyAllowed param', async function () {
+ await makePutBodyRequest({
+ url: servers[0].url,
+ path: path + '/localhost:9002',
+ fields: { blabla: true },
+ token: servers[0].accessToken,
+ statusCodeExpected: 400
+ })
+ })
+
+ it('Should succeed with the correct parameters', async function () {
+ await makePutBodyRequest({
+ url: servers[0].url,
+ path: path + '/localhost:9002',
+ fields: { redundancyAllowed: true },
+ token: servers[0].accessToken,
+ statusCodeExpected: 204
+ })
+ })
+ })
+
+ after(async function () {
+ killallServers(servers)
+
+ // Keep the logs if the test failed
+ if (this['ok']) {
+ await flushTests()
+ }
+ })
+})
--
cgit v1.2.3