diff options
Diffstat (limited to 'server/tests/api/activitypub')
-rw-r--r-- | server/tests/api/activitypub/cleaner.ts | 8 | ||||
-rw-r--r-- | server/tests/api/activitypub/client.ts | 8 | ||||
-rw-r--r-- | server/tests/api/activitypub/fetch.ts | 6 | ||||
-rw-r--r-- | server/tests/api/activitypub/refresher.ts | 11 | ||||
-rw-r--r-- | server/tests/api/activitypub/security.ts | 17 |
5 files changed, 24 insertions, 26 deletions
diff --git a/server/tests/api/activitypub/cleaner.ts b/server/tests/api/activitypub/cleaner.ts index 1421824da..a5ce449f3 100644 --- a/server/tests/api/activitypub/cleaner.ts +++ b/server/tests/api/activitypub/cleaner.ts | |||
@@ -5,8 +5,8 @@ import * as chai from 'chai' | |||
5 | import { | 5 | import { |
6 | cleanupTests, | 6 | cleanupTests, |
7 | doubleFollow, | 7 | doubleFollow, |
8 | flushAndRunMultipleServers, | 8 | createMultipleServers, |
9 | ServerInfo, | 9 | PeerTubeServer, |
10 | setAccessTokensToServers, | 10 | setAccessTokensToServers, |
11 | wait, | 11 | wait, |
12 | waitJobs | 12 | waitJobs |
@@ -15,7 +15,7 @@ import { | |||
15 | const expect = chai.expect | 15 | const expect = chai.expect |
16 | 16 | ||
17 | describe('Test AP cleaner', function () { | 17 | describe('Test AP cleaner', function () { |
18 | let servers: ServerInfo[] = [] | 18 | let servers: PeerTubeServer[] = [] |
19 | let videoUUID1: string | 19 | let videoUUID1: string |
20 | let videoUUID2: string | 20 | let videoUUID2: string |
21 | let videoUUID3: string | 21 | let videoUUID3: string |
@@ -30,7 +30,7 @@ describe('Test AP cleaner', function () { | |||
30 | videos: { cleanup_remote_interactions: true } | 30 | videos: { cleanup_remote_interactions: true } |
31 | } | 31 | } |
32 | } | 32 | } |
33 | servers = await flushAndRunMultipleServers(3, config) | 33 | servers = await createMultipleServers(3, config) |
34 | 34 | ||
35 | // Get the access tokens | 35 | // Get the access tokens |
36 | await setAccessTokensToServers(servers) | 36 | await setAccessTokensToServers(servers) |
diff --git a/server/tests/api/activitypub/client.ts b/server/tests/api/activitypub/client.ts index 5845045a3..720231f02 100644 --- a/server/tests/api/activitypub/client.ts +++ b/server/tests/api/activitypub/client.ts | |||
@@ -6,9 +6,9 @@ import { HttpStatusCode } from '@shared/core-utils' | |||
6 | import { | 6 | import { |
7 | cleanupTests, | 7 | cleanupTests, |
8 | doubleFollow, | 8 | doubleFollow, |
9 | flushAndRunMultipleServers, | 9 | createMultipleServers, |
10 | makeActivityPubGetRequest, | 10 | makeActivityPubGetRequest, |
11 | ServerInfo, | 11 | PeerTubeServer, |
12 | setAccessTokensToServers, | 12 | setAccessTokensToServers, |
13 | setDefaultVideoChannel | 13 | setDefaultVideoChannel |
14 | } from '@shared/extra-utils' | 14 | } from '@shared/extra-utils' |
@@ -17,7 +17,7 @@ import { VideoPlaylistPrivacy } from '@shared/models' | |||
17 | const expect = chai.expect | 17 | const expect = chai.expect |
18 | 18 | ||
19 | describe('Test activitypub', function () { | 19 | describe('Test activitypub', function () { |
20 | let servers: ServerInfo[] = [] | 20 | let servers: PeerTubeServer[] = [] |
21 | let video: { id: number, uuid: string, shortUUID: string } | 21 | let video: { id: number, uuid: string, shortUUID: string } |
22 | let playlist: { id: number, uuid: string, shortUUID: string } | 22 | let playlist: { id: number, uuid: string, shortUUID: string } |
23 | 23 | ||
@@ -62,7 +62,7 @@ describe('Test activitypub', function () { | |||
62 | before(async function () { | 62 | before(async function () { |
63 | this.timeout(30000) | 63 | this.timeout(30000) |
64 | 64 | ||
65 | servers = await flushAndRunMultipleServers(2) | 65 | servers = await createMultipleServers(2) |
66 | 66 | ||
67 | await setAccessTokensToServers(servers) | 67 | await setAccessTokensToServers(servers) |
68 | await setDefaultVideoChannel(servers) | 68 | await setDefaultVideoChannel(servers) |
diff --git a/server/tests/api/activitypub/fetch.ts b/server/tests/api/activitypub/fetch.ts index 34694a773..ddfe6cfe0 100644 --- a/server/tests/api/activitypub/fetch.ts +++ b/server/tests/api/activitypub/fetch.ts | |||
@@ -2,19 +2,19 @@ | |||
2 | 2 | ||
3 | import 'mocha' | 3 | import 'mocha' |
4 | import * as chai from 'chai' | 4 | import * as chai from 'chai' |
5 | import { cleanupTests, doubleFollow, flushAndRunMultipleServers, ServerInfo, setAccessTokensToServers, waitJobs } from '@shared/extra-utils' | 5 | import { cleanupTests, doubleFollow, createMultipleServers, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/extra-utils' |
6 | 6 | ||
7 | const expect = chai.expect | 7 | const expect = chai.expect |
8 | 8 | ||
9 | describe('Test ActivityPub fetcher', function () { | 9 | describe('Test ActivityPub fetcher', function () { |
10 | let servers: ServerInfo[] | 10 | let servers: PeerTubeServer[] |
11 | 11 | ||
12 | // --------------------------------------------------------------- | 12 | // --------------------------------------------------------------- |
13 | 13 | ||
14 | before(async function () { | 14 | before(async function () { |
15 | this.timeout(60000) | 15 | this.timeout(60000) |
16 | 16 | ||
17 | servers = await flushAndRunMultipleServers(3) | 17 | servers = await createMultipleServers(3) |
18 | 18 | ||
19 | // Get the access tokens | 19 | // Get the access tokens |
20 | await setAccessTokensToServers(servers) | 20 | await setAccessTokensToServers(servers) |
diff --git a/server/tests/api/activitypub/refresher.ts b/server/tests/api/activitypub/refresher.ts index d2f71e857..bbec0d309 100644 --- a/server/tests/api/activitypub/refresher.ts +++ b/server/tests/api/activitypub/refresher.ts | |||
@@ -5,10 +5,9 @@ import { HttpStatusCode } from '@shared/core-utils' | |||
5 | import { | 5 | import { |
6 | cleanupTests, | 6 | cleanupTests, |
7 | doubleFollow, | 7 | doubleFollow, |
8 | flushAndRunMultipleServers, | 8 | createMultipleServers, |
9 | killallServers, | 9 | killallServers, |
10 | reRunServer, | 10 | PeerTubeServer, |
11 | ServerInfo, | ||
12 | setAccessTokensToServers, | 11 | setAccessTokensToServers, |
13 | setDefaultVideoChannel, | 12 | setDefaultVideoChannel, |
14 | wait, | 13 | wait, |
@@ -17,7 +16,7 @@ import { | |||
17 | import { VideoPlaylistPrivacy } from '@shared/models' | 16 | import { VideoPlaylistPrivacy } from '@shared/models' |
18 | 17 | ||
19 | describe('Test AP refresher', function () { | 18 | describe('Test AP refresher', function () { |
20 | let servers: ServerInfo[] = [] | 19 | let servers: PeerTubeServer[] = [] |
21 | let videoUUID1: string | 20 | let videoUUID1: string |
22 | let videoUUID2: string | 21 | let videoUUID2: string |
23 | let videoUUID3: string | 22 | let videoUUID3: string |
@@ -27,7 +26,7 @@ describe('Test AP refresher', function () { | |||
27 | before(async function () { | 26 | before(async function () { |
28 | this.timeout(60000) | 27 | this.timeout(60000) |
29 | 28 | ||
30 | servers = await flushAndRunMultipleServers(2, { transcoding: { enabled: false } }) | 29 | servers = await createMultipleServers(2, { transcoding: { enabled: false } }) |
31 | 30 | ||
32 | // Get the access tokens | 31 | // Get the access tokens |
33 | await setAccessTokensToServers(servers) | 32 | await setAccessTokensToServers(servers) |
@@ -95,7 +94,7 @@ describe('Test AP refresher', function () { | |||
95 | // The refresh should fail | 94 | // The refresh should fail |
96 | await waitJobs([ servers[0] ]) | 95 | await waitJobs([ servers[0] ]) |
97 | 96 | ||
98 | await reRunServer(servers[1]) | 97 | await servers[1].run() |
99 | 98 | ||
100 | await servers[0].videos.get({ id: videoUUID3 }) | 99 | await servers[0].videos.get({ id: videoUUID3 }) |
101 | }) | 100 | }) |
diff --git a/server/tests/api/activitypub/security.ts b/server/tests/api/activitypub/security.ts index ab0eb256e..c173648b3 100644 --- a/server/tests/api/activitypub/security.ts +++ b/server/tests/api/activitypub/security.ts | |||
@@ -7,10 +7,9 @@ import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-c | |||
7 | import { | 7 | import { |
8 | buildAbsoluteFixturePath, | 8 | buildAbsoluteFixturePath, |
9 | cleanupTests, | 9 | cleanupTests, |
10 | flushAndRunMultipleServers, | 10 | createMultipleServers, |
11 | killallServers, | 11 | killallServers, |
12 | reRunServer, | 12 | PeerTubeServer, |
13 | ServerInfo, | ||
14 | wait | 13 | wait |
15 | } from '../../../../shared/extra-utils' | 14 | } from '../../../../shared/extra-utils' |
16 | import { makeFollowRequest, makePOSTAPRequest } from '../../../../shared/extra-utils/requests/activitypub' | 15 | import { makeFollowRequest, makePOSTAPRequest } from '../../../../shared/extra-utils/requests/activitypub' |
@@ -20,7 +19,7 @@ import { buildGlobalHeaders } from '../../../lib/job-queue/handlers/utils/activi | |||
20 | 19 | ||
21 | const expect = chai.expect | 20 | const expect = chai.expect |
22 | 21 | ||
23 | function setKeysOfServer (onServer: ServerInfo, ofServer: ServerInfo, publicKey: string, privateKey: string) { | 22 | function setKeysOfServer (onServer: PeerTubeServer, ofServer: PeerTubeServer, publicKey: string, privateKey: string) { |
24 | const url = 'http://localhost:' + ofServer.port + '/accounts/peertube' | 23 | const url = 'http://localhost:' + ofServer.port + '/accounts/peertube' |
25 | 24 | ||
26 | return Promise.all([ | 25 | return Promise.all([ |
@@ -29,7 +28,7 @@ function setKeysOfServer (onServer: ServerInfo, ofServer: ServerInfo, publicKey: | |||
29 | ]) | 28 | ]) |
30 | } | 29 | } |
31 | 30 | ||
32 | function setUpdatedAtOfServer (onServer: ServerInfo, ofServer: ServerInfo, updatedAt: string) { | 31 | function setUpdatedAtOfServer (onServer: PeerTubeServer, ofServer: PeerTubeServer, updatedAt: string) { |
33 | const url = 'http://localhost:' + ofServer.port + '/accounts/peertube' | 32 | const url = 'http://localhost:' + ofServer.port + '/accounts/peertube' |
34 | 33 | ||
35 | return Promise.all([ | 34 | return Promise.all([ |
@@ -38,7 +37,7 @@ function setUpdatedAtOfServer (onServer: ServerInfo, ofServer: ServerInfo, updat | |||
38 | ]) | 37 | ]) |
39 | } | 38 | } |
40 | 39 | ||
41 | function getAnnounceWithoutContext (server: ServerInfo) { | 40 | function getAnnounceWithoutContext (server: PeerTubeServer) { |
42 | const json = require(buildAbsoluteFixturePath('./ap-json/peertube/announce-without-context.json')) | 41 | const json = require(buildAbsoluteFixturePath('./ap-json/peertube/announce-without-context.json')) |
43 | const result: typeof json = {} | 42 | const result: typeof json = {} |
44 | 43 | ||
@@ -54,7 +53,7 @@ function getAnnounceWithoutContext (server: ServerInfo) { | |||
54 | } | 53 | } |
55 | 54 | ||
56 | describe('Test ActivityPub security', function () { | 55 | describe('Test ActivityPub security', function () { |
57 | let servers: ServerInfo[] | 56 | let servers: PeerTubeServer[] |
58 | let url: string | 57 | let url: string |
59 | 58 | ||
60 | const keys = require(buildAbsoluteFixturePath('./ap-json/peertube/keys.json')) | 59 | const keys = require(buildAbsoluteFixturePath('./ap-json/peertube/keys.json')) |
@@ -72,7 +71,7 @@ describe('Test ActivityPub security', function () { | |||
72 | before(async function () { | 71 | before(async function () { |
73 | this.timeout(60000) | 72 | this.timeout(60000) |
74 | 73 | ||
75 | servers = await flushAndRunMultipleServers(3) | 74 | servers = await createMultipleServers(3) |
76 | 75 | ||
77 | url = servers[0].url + '/inbox' | 76 | url = servers[0].url + '/inbox' |
78 | 77 | ||
@@ -172,7 +171,7 @@ describe('Test ActivityPub security', function () { | |||
172 | 171 | ||
173 | // Invalid peertube actor cache | 172 | // Invalid peertube actor cache |
174 | await killallServers([ servers[1] ]) | 173 | await killallServers([ servers[1] ]) |
175 | await reRunServer(servers[1]) | 174 | await servers[1].run() |
176 | 175 | ||
177 | const body = activityPubContextify(getAnnounceWithoutContext(servers[1])) | 176 | const body = activityPubContextify(getAnnounceWithoutContext(servers[1])) |
178 | const headers = buildGlobalHeaders(body) | 177 | const headers = buildGlobalHeaders(body) |