X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fmisc-endpoints.ts;h=4968eef089c8487ccb3a68cae8e5f3a6fd0069f2;hb=29b84d749eb650c75b143b523bfe088a43617d82;hp=32b035c9ef63f15ab1d9f7ef160a24c6264a03f6;hpb=a30a136c9896c656cab98d2c92cde32c534dc098;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/tests/misc-endpoints.ts b/server/tests/misc-endpoints.ts
index 32b035c9e..4968eef08 100644
--- a/server/tests/misc-endpoints.ts
+++ b/server/tests/misc-endpoints.ts
@@ -2,27 +2,18 @@
import 'mocha'
import * as chai from 'chai'
-import {
- addVideoChannel,
- cleanupTests,
- createUser,
- flushAndRunServer,
- makeGetRequest,
- ServerInfo,
- setAccessTokensToServers,
- uploadVideo
-} from '../../shared/extra-utils'
-import { VideoPrivacy } from '../../shared/models/videos'
+import { cleanupTests, createSingleServer, makeGetRequest, PeerTubeServer, setAccessTokensToServers } from '@shared/extra-utils'
+import { HttpStatusCode, VideoPrivacy } from '@shared/models'
const expect = chai.expect
describe('Test misc endpoints', function () {
- let server: ServerInfo
+ let server: PeerTubeServer
before(async function () {
this.timeout(120000)
- server = await flushAndRunServer(1)
+ server = await createSingleServer(1)
await setAccessTokensToServers([ server ])
})
@@ -32,7 +23,7 @@ describe('Test misc endpoints', function () {
const res = await makeGetRequest({
url: server.url,
path: '/.well-known/security.txt',
- statusCodeExpected: 200
+ expectedStatus: HttpStatusCode.OK_200
})
expect(res.text).to.contain('security issue')
@@ -42,7 +33,7 @@ describe('Test misc endpoints', function () {
const res = await makeGetRequest({
url: server.url,
path: '/.well-known/nodeinfo',
- statusCodeExpected: 200
+ expectedStatus: HttpStatusCode.OK_200
})
expect(res.body.links).to.be.an('array')
@@ -54,7 +45,7 @@ describe('Test misc endpoints', function () {
const res = await makeGetRequest({
url: server.url,
path: '/.well-known/dnt-policy.txt',
- statusCodeExpected: 200
+ expectedStatus: HttpStatusCode.OK_200
})
expect(res.text).to.contain('http://www.w3.org/TR/tracking-dnt')
@@ -64,7 +55,7 @@ describe('Test misc endpoints', function () {
const res = await makeGetRequest({
url: server.url,
path: '/.well-known/dnt',
- statusCodeExpected: 200
+ expectedStatus: HttpStatusCode.OK_200
})
expect(res.body.tracking).to.equal('N')
@@ -74,11 +65,36 @@ describe('Test misc endpoints', function () {
const res = await makeGetRequest({
url: server.url,
path: '/.well-known/change-password',
- statusCodeExpected: 302
+ expectedStatus: HttpStatusCode.FOUND_302
})
expect(res.header.location).to.equal('/my-account/settings')
})
+
+ it('Should test webfinger', async function () {
+ const resource = 'acct:peertube@' + server.host
+ const accountUrl = server.url + '/accounts/peertube'
+
+ const res = await makeGetRequest({
+ url: server.url,
+ path: '/.well-known/webfinger?resource=' + resource,
+ expectedStatus: HttpStatusCode.OK_200
+ })
+
+ const data = res.body
+
+ expect(data.subject).to.equal(resource)
+ expect(data.aliases).to.contain(accountUrl)
+
+ const self = data.links.find(l => l.rel === 'self')
+ expect(self).to.exist
+ expect(self.type).to.equal('application/activity+json')
+ expect(self.href).to.equal(accountUrl)
+
+ const remoteInteract = data.links.find(l => l.rel === 'http://ostatus.org/schema/1.0/subscribe')
+ expect(remoteInteract).to.exist
+ expect(remoteInteract.template).to.equal(server.url + '/remote-interaction?uri={uri}')
+ })
})
describe('Test classic static endpoints', function () {
@@ -87,7 +103,7 @@ describe('Test misc endpoints', function () {
const res = await makeGetRequest({
url: server.url,
path: '/robots.txt',
- statusCodeExpected: 200
+ expectedStatus: HttpStatusCode.OK_200
})
expect(res.text).to.contain('User-agent')
@@ -97,7 +113,7 @@ describe('Test misc endpoints', function () {
await makeGetRequest({
url: server.url,
path: '/security.txt',
- statusCodeExpected: 301
+ expectedStatus: HttpStatusCode.MOVED_PERMANENTLY_301
})
})
@@ -105,10 +121,12 @@ describe('Test misc endpoints', function () {
const res = await makeGetRequest({
url: server.url,
path: '/nodeinfo/2.0.json',
- statusCodeExpected: 200
+ expectedStatus: HttpStatusCode.OK_200
})
expect(res.body.software.name).to.equal('peertube')
+ expect(res.body.usage.users.activeMonth).to.equal(1)
+ expect(res.body.usage.users.activeHalfyear).to.equal(1)
})
})
@@ -118,55 +136,55 @@ describe('Test misc endpoints', function () {
const res = await makeGetRequest({
url: server.url,
path: '/sitemap.xml',
- statusCodeExpected: 200
+ expectedStatus: HttpStatusCode.OK_200
})
expect(res.text).to.contain('xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"')
- expect(res.text).to.contain('http://localhost:9001/about/instance')
+ expect(res.text).to.contain('http://localhost:' + server.port + '/about/instance')
})
it('Should get the empty cached sitemap', async function () {
const res = await makeGetRequest({
url: server.url,
path: '/sitemap.xml',
- statusCodeExpected: 200
+ expectedStatus: HttpStatusCode.OK_200
})
expect(res.text).to.contain('xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"')
- expect(res.text).to.contain('http://localhost:9001/about/instance')
+ expect(res.text).to.contain('http://localhost:' + server.port + '/about/instance')
})
it('Should add videos, channel and accounts and get sitemap', async function () {
this.timeout(35000)
- await uploadVideo(server.url, server.accessToken, { name: 'video 1', nsfw: false })
- await uploadVideo(server.url, server.accessToken, { name: 'video 2', nsfw: false })
- await uploadVideo(server.url, server.accessToken, { name: 'video 3', privacy: VideoPrivacy.PRIVATE })
+ await server.videos.upload({ attributes: { name: 'video 1', nsfw: false } })
+ await server.videos.upload({ attributes: { name: 'video 2', nsfw: false } })
+ await server.videos.upload({ attributes: { name: 'video 3', privacy: VideoPrivacy.PRIVATE } })
- await addVideoChannel(server.url, server.accessToken, { name: 'channel1', displayName: 'channel 1' })
- await addVideoChannel(server.url, server.accessToken, { name: 'channel2', displayName: 'channel 2' })
+ await server.channels.create({ attributes: { name: 'channel1', displayName: 'channel 1' } })
+ await server.channels.create({ attributes: { name: 'channel2', displayName: 'channel 2' } })
- await createUser({ url: server.url, accessToken: server.accessToken, username: 'user1', password: 'password' })
- await createUser({ url: server.url, accessToken: server.accessToken, username: 'user2', password: 'password' })
+ await server.users.create({ username: 'user1', password: 'password' })
+ await server.users.create({ username: 'user2', password: 'password' })
const res = await makeGetRequest({
url: server.url,
path: '/sitemap.xml?t=1', // avoid using cache
- statusCodeExpected: 200
+ expectedStatus: HttpStatusCode.OK_200
})
expect(res.text).to.contain('xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"')
- expect(res.text).to.contain('http://localhost:9001/about/instance')
+ expect(res.text).to.contain('http://localhost:' + server.port + '/about/instance')
expect(res.text).to.contain('video 1')
expect(res.text).to.contain('video 2')
expect(res.text).to.not.contain('video 3')
- expect(res.text).to.contain('http://localhost:9001/video-channels/channel1')
- expect(res.text).to.contain('http://localhost:9001/video-channels/channel2')
+ expect(res.text).to.contain('http://localhost:' + server.port + '/video-channels/channel1')
+ expect(res.text).to.contain('http://localhost:' + server.port + '/video-channels/channel2')
- expect(res.text).to.contain('http://localhost:9001/accounts/user1')
- expect(res.text).to.contain('http://localhost:9001/accounts/user2')
+ expect(res.text).to.contain('http://localhost:' + server.port + '/accounts/user1')
+ expect(res.text).to.contain('http://localhost:' + server.port + '/accounts/user2')
})
})