From f595d3947708114deeed4312cc5ffd285745b090 Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Fri, 8 Dec 2017 17:31:21 +0100
Subject: Finish admin design

---
 server/tests/api/multiple-servers.ts | 46 ++++++++++++++++++++++++++++++++++++
 server/tests/api/single-server.ts    | 37 -----------------------------
 2 files changed, 46 insertions(+), 37 deletions(-)

(limited to 'server/tests')

diff --git a/server/tests/api/multiple-servers.ts b/server/tests/api/multiple-servers.ts
index c7f19f261..c9f74cc8c 100644
--- a/server/tests/api/multiple-servers.ts
+++ b/server/tests/api/multiple-servers.ts
@@ -2,6 +2,8 @@
 
 import 'mocha'
 import * as chai from 'chai'
+import { join } from "path"
+import * as request from 'supertest'
 
 import {
   dateIsValid,
@@ -707,6 +709,50 @@ describe('Test multiple servers', function () {
     })
   })
 
+  describe('With minimum parameters', function () {
+    it('Should upload and propagate the video', async function () {
+      this.timeout(50000)
+
+      const path = '/api/v1/videos/upload'
+
+      const req = request(servers[1].url)
+        .post(path)
+        .set('Accept', 'application/json')
+        .set('Authorization', 'Bearer ' + servers[1].accessToken)
+        .field('name', 'minimum parameters')
+        .field('privacy', '1')
+        .field('nsfw', 'false')
+        .field('channelId', '1')
+
+      const filePath = join(__dirname, '..', 'api', 'fixtures', 'video_short.webm')
+
+      await req.attach('videofile', filePath)
+        .expect(200)
+
+      await wait(25000)
+
+      for (const server of servers) {
+        const res = await getVideosList(server.url)
+        const video = res.body.data.find(v => v.name === 'minimum parameters')
+
+        expect(video.name).to.equal('minimum parameters')
+        expect(video.category).to.equal(null)
+        expect(video.categoryLabel).to.equal('Misc')
+        expect(video.licence).to.equal(null)
+        expect(video.licenceLabel).to.equal('Unknown')
+        expect(video.language).to.equal(null)
+        expect(video.languageLabel).to.equal('Unknown')
+        expect(video.nsfw).to.not.be.ok
+        expect(video.description).to.equal(null)
+        expect(video.serverHost).to.equal('localhost:9002')
+        expect(video.accountName).to.equal('root')
+        expect(video.tags).to.deep.equal([ ])
+        expect(dateIsValid(video.createdAt)).to.be.true
+        expect(dateIsValid(video.updatedAt)).to.be.true
+      }
+    })
+  })
+
   after(async function () {
     killallServers(servers)
 
diff --git a/server/tests/api/single-server.ts b/server/tests/api/single-server.ts
index e99955ef4..91460c7ae 100644
--- a/server/tests/api/single-server.ts
+++ b/server/tests/api/single-server.ts
@@ -694,43 +694,6 @@ describe('Test a single server', function () {
     expect(video.dislikes).to.equal(1)
   })
 
-  it('Should upload a video with minimum parameters', async function () {
-    const path = '/api/v1/videos/upload'
-
-    const req = request(server.url)
-      .post(path)
-      .set('Accept', 'application/json')
-      .set('Authorization', 'Bearer ' + server.accessToken)
-      .field('name', 'minimum parameters')
-      .field('privacy', '1')
-      .field('nsfw', 'false')
-      .field('channelId', '1')
-
-    const filePath = join(__dirname, '..', 'api', 'fixtures', 'video_short.webm')
-
-    await req.attach('videofile', filePath)
-      .expect(200)
-
-    const res = await getVideosList(server.url)
-    const video = res.body.data.find(v => v.name === 'minimum parameters')
-
-    expect(video.name).to.equal('minimum parameters')
-    expect(video.category).to.equal(null)
-    expect(video.categoryLabel).to.equal('Misc')
-    expect(video.licence).to.equal(null)
-    expect(video.licenceLabel).to.equal('Unknown')
-    expect(video.language).to.equal(null)
-    expect(video.languageLabel).to.equal('Unknown')
-    expect(video.nsfw).to.not.be.ok
-    expect(video.description).to.equal(null)
-    expect(video.serverHost).to.equal('localhost:9001')
-    expect(video.accountName).to.equal('root')
-    expect(video.isLocal).to.be.true
-    expect(video.tags).to.deep.equal([ ])
-    expect(dateIsValid(video.createdAt)).to.be.true
-    expect(dateIsValid(video.updatedAt)).to.be.true
-  })
-
   after(async function () {
     killallServers([ server ])
 
-- 
cgit v1.2.3