Fix feeds with channel filter

pull/1082/merge
Chocobozzz 2018-09-13 09:48:34 +02:00
parent 4035d2b6e9
commit 662fb3ab5e
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
3 changed files with 113 additions and 13 deletions

View File

@ -23,7 +23,7 @@ const videoFeedsValidator = [
if (areValidationErrors(req, res)) return
if (req.query.accountId && !await isAccountIdExist(req.query.accountId, res)) return
if (req.query.videoChannelName && !await isVideoChannelIdExist(req.query.videoChannelName, res)) return
if (req.query.videoChannelId && !await isVideoChannelIdExist(req.query.videoChannelId, res)) return
if (req.query.accountName && !await isAccountNameWithHostExist(req.query.accountName, res)) return
if (req.query.videoChannelName && !await isVideoChannelNameWithHostExist(req.query.videoChannelName, res)) return

View File

@ -3,19 +3,21 @@
import * as chai from 'chai'
import 'mocha'
import {
createUser,
doubleFollow,
flushAndRunMultipleServers,
flushTests,
getJSONfeed,
getJSONfeed, getMyUserInformation,
getXMLfeed,
killallServers,
ServerInfo,
setAccessTokensToServers,
uploadVideo
uploadVideo, userLogin
} from '../utils'
import * as libxmljs from 'libxmljs'
import { addVideoCommentThread } from '../utils/videos/video-comments'
import { waitJobs } from '../utils/server/jobs'
import { User } from '../../../shared/models/users'
chai.use(require('chai-xml'))
chai.use(require('chai-json-schema'))
@ -24,6 +26,11 @@ const expect = chai.expect
describe('Test syndication feeds', () => {
let servers: ServerInfo[] = []
let userAccessToken: string
let rootAccountUUID: string
let rootChannelUUID: string
let userAccountUUID: string
let userChannelUUID: string
before(async function () {
this.timeout(120000)
@ -34,16 +41,40 @@ 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
rootAccountUUID = user.account.uuid
rootChannelUUID = user.videoChannels[0].uuid
}
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(servers[0].url, servers[0].accessToken, attr.username, attr.password)
userAccessToken = await userLogin(servers[0], attr)
const res = await getMyUserInformation(servers[0].url, userAccessToken)
const user: User = res.body
userAccountUUID = user.account.uuid
userChannelUUID = user.videoChannels[0].uuid
}
{
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)
})
@ -85,7 +116,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')
@ -93,6 +124,74 @@ describe('Test syndication feeds', () => {
expect(jsonObj.items[ 0 ].attachments[ 0 ].url).to.contain('720.torrent')
}
})
it('Should filter by account', async function () {
for (const server of servers) {
{
const json = await getJSONfeed(server.url, 'videos', { accountId: rootAccountUUID })
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(server.url, 'videos', { accountId: userAccountUUID })
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')
}
}
{
const json = await getJSONfeed(servers[0].url, 'videos', { accountName: 'root' })
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(servers[0].url, 'videos', { accountName: 'john' })
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 () {
for (const server of servers) {
{
const json = await getJSONfeed(server.url, 'videos', { videoChannelId: rootChannelUUID })
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(server.url, 'videos', { videoChannelId: userChannelUUID })
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')
}
}
{
const json = await getJSONfeed(servers[0].url, 'videos', { videoChannelName: 'root_channel' })
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(servers[0].url, 'videos', { videoChannelName: 'john_channel' })
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 () {

View File

@ -13,11 +13,12 @@ function getXMLfeed (url: string, feed: FeedType, format?: string) {
.expect('Content-Type', /xml/)
}
function getJSONfeed (url: string, feed: FeedType) {
function getJSONfeed (url: string, feed: FeedType, query: any = {}) {
const path = '/feeds/' + feed + '.json'
return request(url)
.get(path)
.query(query)
.set('Accept', 'application/json')
.expect(200)
.expect('Content-Type', /json/)