Support m4v videos

[github/Chocobozzz/PeerTube.git] / server / tests / feeds / feeds.ts

diff --git a/server/tests/feeds/feeds.ts b/server/tests/feeds/feeds.ts
index f65148f00bc5ffdbfe80386a1d4fd61a9b9d36d9..437470327bb73b7764b80d30b82e0bce61a0f9c0 100644 (file)
--- a/server/tests/feeds/feeds.ts
+++ b/server/tests/feeds/feeds.ts
@@ -3,20 +3,22 @@
 import * as chai from 'chai'
 import 'mocha'
 import {
+  cleanupTests,
+  createUser,
   doubleFollow,
   flushAndRunMultipleServers,
-  flushTests,
   getJSONfeed,
+  getMyUserInformation,
   getXMLfeed,
-  killallServers,
   ServerInfo,
   setAccessTokensToServers,
   uploadVideo,
-  wait
-} from '../utils'
-import { join } from 'path'
+  userLogin
+} from '../../../shared/extra-utils'
 import * as libxmljs from 'libxmljs'
-import { addVideoCommentThread } from '../utils/videos/video-comments'
+import { addVideoCommentThread } from '../../../shared/extra-utils/videos/video-comments'
+import { waitJobs } from '../../../shared/extra-utils/server/jobs'
+import { User } from '../../../shared/models/users'
 
 chai.use(require('chai-xml'))
 chai.use(require('chai-json-schema'))
@@ -25,6 +27,11 @@ const expect = chai.expect
 
 describe('Test syndication feeds', () => {
   let servers: ServerInfo[] = []
+  let userAccessToken: string
+  let rootAccountId: number
+  let rootChannelId: number
+  let userAccountId: number
+  let userChannelId: number
 
   before(async function () {
     this.timeout(120000)
@@ -35,18 +42,42 @@ describe('Test syndication feeds', () => {
     await setAccessTokensToServers(servers)
     await doubleFollow(servers[0], servers[1])
 
-    const videoAttributes = {
-      name: 'my super name for server 1',
-      description: 'my super description for server 1',
-      fixture: 'video_short.webm'
+    {
+      const res = await getMyUserInformation(servers[0].url, servers[0].accessToken)
+      const user: User = res.body
+      rootAccountId = user.account.id
+      rootChannelId = user.videoChannels[0].id
     }
-    const res = await uploadVideo(servers[0].url, servers[0].accessToken, videoAttributes)
-    const videoId = res.body.video.id
 
-    await addVideoCommentThread(servers[0].url, servers[0].accessToken, videoId, 'super comment 1')
-    await addVideoCommentThread(servers[0].url, servers[0].accessToken, videoId, 'super comment 2')
+    {
+      const attr = { username: 'john', password: 'password' }
+      await createUser({ url: servers[ 0 ].url, accessToken: servers[ 0 ].accessToken, username: attr.username, password: attr.password })
+      userAccessToken = await userLogin(servers[0], attr)
 
-    await wait(10000)
+      const res = await getMyUserInformation(servers[0].url, userAccessToken)
+      const user: User = res.body
+      userAccountId = user.account.id
+      userChannelId = user.videoChannels[0].id
+    }
+
+    {
+      await uploadVideo(servers[ 0 ].url, userAccessToken, { name: 'user video' })
+    }
+
+    {
+      const videoAttributes = {
+        name: 'my super name for server 1',
+        description: 'my super description for server 1',
+        fixture: 'video_short.webm'
+      }
+      const res = await uploadVideo(servers[ 0 ].url, servers[ 0 ].accessToken, videoAttributes)
+      const videoId = res.body.video.id
+
+      await addVideoCommentThread(servers[ 0 ].url, servers[ 0 ].accessToken, videoId, 'super comment 1')
+      await addVideoCommentThread(servers[ 0 ].url, servers[ 0 ].accessToken, videoId, 'super comment 2')
+    }
+
+    await waitJobs(servers)
   })
 
   describe('All feed', function () {
@@ -86,7 +117,7 @@ describe('Test syndication feeds', () => {
       for (const server of servers) {
         const json = await getJSONfeed(server.url, 'videos')
         const jsonObj = JSON.parse(json.text)
-        expect(jsonObj.items.length).to.be.equal(1)
+        expect(jsonObj.items.length).to.be.equal(2)
         expect(jsonObj.items[ 0 ].attachments).to.exist
         expect(jsonObj.items[ 0 ].attachments.length).to.be.eq(1)
         expect(jsonObj.items[ 0 ].attachments[ 0 ].mime_type).to.be.eq('application/x-bittorrent')
@@ -94,6 +125,74 @@ describe('Test syndication feeds', () => {
         expect(jsonObj.items[ 0 ].attachments[ 0 ].url).to.contain('720.torrent')
       }
     })
+
+    it('Should filter by account', async function () {
+      {
+        const json = await getJSONfeed(servers[0].url, 'videos', { accountId: rootAccountId })
+        const jsonObj = JSON.parse(json.text)
+        expect(jsonObj.items.length).to.be.equal(1)
+        expect(jsonObj.items[ 0 ].title).to.equal('my super name for server 1')
+        expect(jsonObj.items[ 0 ].author.name).to.equal('root')
+      }
+
+      {
+        const json = await getJSONfeed(servers[0].url, 'videos', { accountId: userAccountId })
+        const jsonObj = JSON.parse(json.text)
+        expect(jsonObj.items.length).to.be.equal(1)
+        expect(jsonObj.items[ 0 ].title).to.equal('user video')
+        expect(jsonObj.items[ 0 ].author.name).to.equal('john')
+      }
+
+      for (const server of servers) {
+        {
+          const json = await getJSONfeed(server.url, 'videos', { accountName: 'root@localhost:' + servers[0].port })
+          const jsonObj = JSON.parse(json.text)
+          expect(jsonObj.items.length).to.be.equal(1)
+          expect(jsonObj.items[ 0 ].title).to.equal('my super name for server 1')
+        }
+
+        {
+          const json = await getJSONfeed(server.url, 'videos', { accountName: 'john@localhost:' + servers[0].port })
+          const jsonObj = JSON.parse(json.text)
+          expect(jsonObj.items.length).to.be.equal(1)
+          expect(jsonObj.items[ 0 ].title).to.equal('user video')
+        }
+      }
+    })
+
+    it('Should filter by video channel', async function () {
+      {
+        const json = await getJSONfeed(servers[0].url, 'videos', { videoChannelId: rootChannelId })
+        const jsonObj = JSON.parse(json.text)
+        expect(jsonObj.items.length).to.be.equal(1)
+        expect(jsonObj.items[ 0 ].title).to.equal('my super name for server 1')
+        expect(jsonObj.items[ 0 ].author.name).to.equal('root')
+      }
+
+      {
+        const json = await getJSONfeed(servers[0].url, 'videos', { videoChannelId: userChannelId })
+        const jsonObj = JSON.parse(json.text)
+        expect(jsonObj.items.length).to.be.equal(1)
+        expect(jsonObj.items[ 0 ].title).to.equal('user video')
+        expect(jsonObj.items[ 0 ].author.name).to.equal('john')
+      }
+
+      for (const server of servers) {
+        {
+          const json = await getJSONfeed(server.url, 'videos', { videoChannelName: 'root_channel@localhost:' + servers[0].port })
+          const jsonObj = JSON.parse(json.text)
+          expect(jsonObj.items.length).to.be.equal(1)
+          expect(jsonObj.items[ 0 ].title).to.equal('my super name for server 1')
+        }
+
+        {
+          const json = await getJSONfeed(server.url, 'videos', { videoChannelName: 'john_channel@localhost:' + servers[0].port })
+          const jsonObj = JSON.parse(json.text)
+          expect(jsonObj.items.length).to.be.equal(1)
+          expect(jsonObj.items[ 0 ].title).to.equal('user video')
+        }
+      }
+    })
   })
 
   describe('Video comments feed', function () {
@@ -110,11 +209,6 @@ describe('Test syndication feeds', () => {
   })
 
   after(async function () {
-    killallServers(servers)
-
-    // Keep the logs if the test failed
-    if (this['ok']) {
-      await flushTests()
-    }
+    await cleanupTests(servers)
   })
 })