import 'mocha'
import * as chai from 'chai'
-import * as libxmljs from 'libxmljs'
-import {
- addAccountToAccountBlocklist,
- addAccountToServerBlocklist,
- removeAccountFromServerBlocklist
-} from '@shared/extra-utils/users/blocklist'
-import { addUserSubscription, listUserSubscriptionVideos } from '@shared/extra-utils/users/user-subscriptions'
-import { VideoPrivacy } from '@shared/models'
-import { ScopedToken } from '@shared/models/users/user-scoped-token'
+import * as xmlParser from 'fast-xml-parser'
+import { HttpStatusCode } from '@shared/core-utils'
import {
+ addVideoCommentThread,
cleanupTests,
createUser,
doubleFollow,
flushAndRunMultipleServers,
flushAndRunServer,
- getJSONfeed,
getMyUserInformation,
getUserScopedTokens,
- getXMLfeed,
renewUserScopedTokens,
ServerInfo,
setAccessTokensToServers,
uploadVideo,
uploadVideoAndGetId,
- userLogin
-} from '../../../shared/extra-utils'
-import { waitJobs } from '../../../shared/extra-utils/server/jobs'
-import { addVideoCommentThread } from '../../../shared/extra-utils/videos/video-comments'
-import { User } from '../../../shared/models/users'
-import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
+ userLogin,
+ waitJobs
+} from '@shared/extra-utils'
+import { User, VideoPrivacy } from '@shared/models'
+import { ScopedToken } from '@shared/models/users/user-scoped-token'
chai.use(require('chai-xml'))
chai.use(require('chai-json-schema'))
it('Should be well formed XML (covers RSS 2.0 and ATOM 1.0 endpoints)', async function () {
for (const feed of [ 'video-comments' as 'video-comments', 'videos' as 'videos' ]) {
- const rss = await getXMLfeed(servers[0].url, feed)
- expect(rss.text).xml.to.be.valid()
+ const rss = await servers[0].feedCommand.getXML({ feed })
+ expect(rss).xml.to.be.valid()
- const atom = await getXMLfeed(servers[0].url, feed, 'atom')
- expect(atom.text).xml.to.be.valid()
+ const atom = await servers[0].feedCommand.getXML({ feed, format: 'atom' })
+ expect(atom).xml.to.be.valid()
}
})
it('Should be well formed JSON (covers JSON feed 1.0 endpoint)', async function () {
for (const feed of [ 'video-comments' as 'video-comments', 'videos' as 'videos' ]) {
- const json = await getJSONfeed(servers[0].url, feed)
- expect(JSON.parse(json.text)).to.be.jsonSchema({ type: 'object' })
+ const jsonText = await servers[0].feedCommand.getJSON({ feed })
+ expect(JSON.parse(jsonText)).to.be.jsonSchema({ type: 'object' })
}
})
})
it('Should contain a valid enclosure (covers RSS 2.0 endpoint)', async function () {
for (const server of servers) {
- const rss = await getXMLfeed(server.url, 'videos')
- const xmlDoc = libxmljs.parseXmlString(rss.text)
- const xmlEnclosure = xmlDoc.get('/rss/channel/item/enclosure')
- expect(xmlEnclosure).to.exist
- expect(xmlEnclosure.attr('type').value()).to.be.equal('application/x-bittorrent')
- expect(xmlEnclosure.attr('length').value()).to.be.equal('218910')
- expect(xmlEnclosure.attr('url').value()).to.contain('720.torrent')
+ const rss = await server.feedCommand.getXML({ feed: 'videos' })
+ expect(xmlParser.validate(rss)).to.be.true
+
+ const xmlDoc = xmlParser.parse(rss, { parseAttributeValue: true, ignoreAttributes: false })
+
+ const enclosure = xmlDoc.rss.channel.item[0].enclosure
+ expect(enclosure).to.exist
+ expect(enclosure['@_type']).to.equal('application/x-bittorrent')
+ expect(enclosure['@_length']).to.equal(218910)
+ expect(enclosure['@_url']).to.contain('720.torrent')
}
})
it('Should contain a valid \'attachments\' object (covers JSON feed 1.0 endpoint)', async function () {
for (const server of servers) {
- const json = await getJSONfeed(server.url, 'videos')
- const jsonObj = JSON.parse(json.text)
+ const json = await server.feedCommand.getJSON({ feed: 'videos' })
+ const jsonObj = JSON.parse(json)
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)
it('Should filter by account', async function () {
{
- const json = await getJSONfeed(servers[0].url, 'videos', { accountId: rootAccountId })
- const jsonObj = JSON.parse(json.text)
+ const json = await servers[0].feedCommand.getJSON({ feed: 'videos', query: { accountId: rootAccountId } })
+ const jsonObj = JSON.parse(json)
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)
+ const json = await servers[0].feedCommand.getJSON({ feed: 'videos', query: { accountId: userAccountId } })
+ const jsonObj = JSON.parse(json)
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)
+ const json = await server.feedCommand.getJSON({ feed: 'videos', query: { accountName: 'root@localhost:' + servers[0].port } })
+ const jsonObj = JSON.parse(json)
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)
+ const json = await server.feedCommand.getJSON({ feed: 'videos', query: { accountName: 'john@localhost:' + servers[0].port } })
+ const jsonObj = JSON.parse(json)
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)
+ const json = await servers[0].feedCommand.getJSON({ feed: 'videos', query: { videoChannelId: rootChannelId } })
+ const jsonObj = JSON.parse(json)
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)
+ const json = await servers[0].feedCommand.getJSON({ feed: 'videos', query: { videoChannelId: userChannelId } })
+ const jsonObj = JSON.parse(json)
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)
+ const query = { videoChannelName: 'root_channel@localhost:' + servers[0].port }
+ const json = await server.feedCommand.getJSON({ feed: 'videos', query })
+ const jsonObj = JSON.parse(json)
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)
+ const query = { videoChannelName: 'john_channel@localhost:' + servers[0].port }
+ const json = await server.feedCommand.getJSON({ feed: 'videos', query })
+ const jsonObj = JSON.parse(json)
expect(jsonObj.items.length).to.be.equal(1)
expect(jsonObj.items[0].title).to.equal('user video')
}
await waitJobs([ serverHLSOnly ])
- const json = await getJSONfeed(serverHLSOnly.url, 'videos')
- const jsonObj = JSON.parse(json.text)
+ const json = await serverHLSOnly.feedCommand.getJSON({ feed: 'videos' })
+ const jsonObj = JSON.parse(json)
expect(jsonObj.items.length).to.be.equal(1)
expect(jsonObj.items[0].attachments).to.exist
expect(jsonObj.items[0].attachments.length).to.be.eq(4)
it('Should contain valid comments (covers JSON feed 1.0 endpoint) and not from unlisted videos', async function () {
for (const server of servers) {
- const json = await getJSONfeed(server.url, 'video-comments')
+ const json = await server.feedCommand.getJSON({ feed: 'video-comments' })
- const jsonObj = JSON.parse(json.text)
+ const jsonObj = JSON.parse(json)
expect(jsonObj.items.length).to.be.equal(2)
expect(jsonObj.items[0].html_content).to.equal('super comment 2')
expect(jsonObj.items[1].html_content).to.equal('super comment 1')
const remoteHandle = 'root@localhost:' + servers[0].port
- await addAccountToServerBlocklist(servers[1].url, servers[1].accessToken, remoteHandle)
+ await servers[1].blocklistCommand.addToServerBlocklist({ account: remoteHandle })
{
- const json = await getJSONfeed(servers[1].url, 'video-comments', { version: 2 })
- const jsonObj = JSON.parse(json.text)
+ const json = await servers[1].feedCommand.getJSON({ feed: 'video-comments', query: { version: 2 } })
+ const jsonObj = JSON.parse(json)
expect(jsonObj.items.length).to.be.equal(0)
}
- await removeAccountFromServerBlocklist(servers[1].url, servers[1].accessToken, remoteHandle)
+ await servers[1].blocklistCommand.removeFromServerBlocklist({ account: remoteHandle })
{
const videoUUID = (await uploadVideoAndGetId({ server: servers[1], videoName: 'server 2' })).uuid
await addVideoCommentThread(servers[0].url, servers[0].accessToken, videoUUID, 'super comment')
await waitJobs(servers)
- const json = await getJSONfeed(servers[1].url, 'video-comments', { version: 3 })
- const jsonObj = JSON.parse(json.text)
+ const json = await servers[1].feedCommand.getJSON({ feed: 'video-comments', query: { version: 3 } })
+ const jsonObj = JSON.parse(json)
expect(jsonObj.items.length).to.be.equal(3)
}
- await addAccountToAccountBlocklist(servers[1].url, servers[1].accessToken, remoteHandle)
+ await servers[1].blocklistCommand.addToMyBlocklist({ account: remoteHandle })
{
- const json = await getJSONfeed(servers[1].url, 'video-comments', { version: 4 })
- const jsonObj = JSON.parse(json.text)
+ const json = await servers[1].feedCommand.getJSON({ feed: 'video-comments', query: { version: 4 } })
+ const jsonObj = JSON.parse(json)
expect(jsonObj.items.length).to.be.equal(2)
}
})
}
{
- const res = await listUserSubscriptionVideos(servers[0].url, feeduserAccessToken)
- expect(res.body.total).to.equal(0)
+ const body = await servers[0].subscriptionsCommand.listVideos({ token: feeduserAccessToken })
+ expect(body.total).to.equal(0)
- const json = await getJSONfeed(servers[0].url, 'subscriptions', { accountId: feeduserAccountId, token: feeduserFeedToken })
- const jsonObj = JSON.parse(json.text)
+ const query = { accountId: feeduserAccountId, token: feeduserFeedToken }
+ const json = await servers[0].feedCommand.getJSON({ feed: 'subscriptions', query })
+ const jsonObj = JSON.parse(json)
expect(jsonObj.items.length).to.be.equal(0) // no subscription, it should not list the instance's videos but list 0 videos
}
})
it('Should fail with an invalid token', async function () {
- await getJSONfeed(servers[0].url, 'subscriptions', { accountId: feeduserAccountId, token: 'toto' }, HttpStatusCode.FORBIDDEN_403)
+ const query = { accountId: feeduserAccountId, token: 'toto' }
+ await servers[0].feedCommand.getJSON({ feed: 'subscriptions', query, expectedStatus: HttpStatusCode.FORBIDDEN_403 })
})
it('Should fail with a token of another user', async function () {
- await getJSONfeed(
- servers[0].url,
- 'subscriptions',
- { accountId: feeduserAccountId, token: userFeedToken },
- HttpStatusCode.FORBIDDEN_403
- )
+ const query = { accountId: feeduserAccountId, token: userFeedToken }
+ await servers[0].feedCommand.getJSON({ feed: 'subscriptions', query, expectedStatus: HttpStatusCode.FORBIDDEN_403 })
})
it('Should list no videos for a user with videos but no subscriptions', async function () {
- const res = await listUserSubscriptionVideos(servers[0].url, userAccessToken)
- expect(res.body.total).to.equal(0)
+ const body = await servers[0].subscriptionsCommand.listVideos({ token: userAccessToken })
+ expect(body.total).to.equal(0)
- const json = await getJSONfeed(servers[0].url, 'subscriptions', { accountId: userAccountId, token: userFeedToken })
- const jsonObj = JSON.parse(json.text)
+ const query = { accountId: userAccountId, token: userFeedToken }
+ const json = await servers[0].feedCommand.getJSON({ feed: 'subscriptions', query })
+ const jsonObj = JSON.parse(json)
expect(jsonObj.items.length).to.be.equal(0) // no subscription, it should not list the instance's videos but list 0 videos
})
it('Should list self videos for a user with a subscription to themselves', async function () {
this.timeout(30000)
- await addUserSubscription(servers[0].url, userAccessToken, 'john_channel@localhost:' + servers[0].port)
+ await servers[0].subscriptionsCommand.add({ token: userAccessToken, targetUri: 'john_channel@localhost:' + servers[0].port })
await waitJobs(servers)
{
- const res = await listUserSubscriptionVideos(servers[0].url, userAccessToken)
- expect(res.body.total).to.equal(1)
- expect(res.body.data[0].name).to.equal('user video')
+ const body = await servers[0].subscriptionsCommand.listVideos({ token: userAccessToken })
+ expect(body.total).to.equal(1)
+ expect(body.data[0].name).to.equal('user video')
- const json = await getJSONfeed(servers[0].url, 'subscriptions', { accountId: userAccountId, token: userFeedToken, version: 1 })
- const jsonObj = JSON.parse(json.text)
+ const query = { accountId: userAccountId, token: userFeedToken, version: 1 }
+ const json = await servers[0].feedCommand.getJSON({ feed: 'subscriptions', query })
+ const jsonObj = JSON.parse(json)
expect(jsonObj.items.length).to.be.equal(1) // subscribed to self, it should not list the instance's videos but list john's
}
})
it('Should list videos of a user\'s subscription', async function () {
this.timeout(30000)
- await addUserSubscription(servers[0].url, userAccessToken, 'root_channel@localhost:' + servers[0].port)
+ await servers[0].subscriptionsCommand.add({ token: userAccessToken, targetUri: 'root_channel@localhost:' + servers[0].port })
await waitJobs(servers)
{
- const res = await listUserSubscriptionVideos(servers[0].url, userAccessToken)
- expect(res.body.total).to.equal(2, "there should be 2 videos part of the subscription")
+ const body = await servers[0].subscriptionsCommand.listVideos({ token: userAccessToken })
+ expect(body.total).to.equal(2, "there should be 2 videos part of the subscription")
- const json = await getJSONfeed(servers[0].url, 'subscriptions', { accountId: userAccountId, token: userFeedToken, version: 2 })
- const jsonObj = JSON.parse(json.text)
+ const query = { accountId: userAccountId, token: userFeedToken, version: 2 }
+ const json = await servers[0].feedCommand.getJSON({ feed: 'subscriptions', query })
+ const jsonObj = JSON.parse(json)
expect(jsonObj.items.length).to.be.equal(2) // subscribed to root, it should not list the instance's videos but list root/john's
}
})
it('Should renew the token, and so have an invalid old token', async function () {
await renewUserScopedTokens(servers[0].url, userAccessToken)
- await getJSONfeed(
- servers[0].url,
- 'subscriptions',
- { accountId: userAccountId, token: userFeedToken, version: 3 },
- HttpStatusCode.FORBIDDEN_403
- )
+ const query = { accountId: userAccountId, token: userFeedToken, version: 3 }
+ await servers[0].feedCommand.getJSON({ feed: 'subscriptions', query, expectedStatus: HttpStatusCode.FORBIDDEN_403 })
})
it('Should succeed with the new token', async function () {
const token: ScopedToken = res2.body
userFeedToken = token.feedToken
- await getJSONfeed(servers[0].url, 'subscriptions', { accountId: userAccountId, token: userFeedToken, version: 4 })
+ const query = { accountId: userAccountId, token: userFeedToken, version: 4 }
+ await servers[0].feedCommand.getJSON({ feed: 'subscriptions', query })
})
})
projects / github / Chocobozzz / PeerTube.git / blobdiff