diff options
Diffstat (limited to 'server/tests/api/search/search-activitypub-videos.ts')
-rw-r--r-- | server/tests/api/search/search-activitypub-videos.ts | 124 |
1 files changed, 61 insertions, 63 deletions
diff --git a/server/tests/api/search/search-activitypub-videos.ts b/server/tests/api/search/search-activitypub-videos.ts index e9b4978da..b3cfcacca 100644 --- a/server/tests/api/search/search-activitypub-videos.ts +++ b/server/tests/api/search/search-activitypub-videos.ts | |||
@@ -1,92 +1,90 @@ | |||
1 | /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ | 1 | /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ |
2 | 2 | ||
3 | import * as chai from 'chai' | ||
4 | import 'mocha' | 3 | import 'mocha' |
4 | import * as chai from 'chai' | ||
5 | import { | 5 | import { |
6 | addVideoChannel, | ||
7 | cleanupTests, | 6 | cleanupTests, |
8 | flushAndRunMultipleServers, | 7 | createMultipleServers, |
9 | getVideosList, | 8 | PeerTubeServer, |
10 | removeVideo, | 9 | SearchCommand, |
11 | searchVideo, | ||
12 | searchVideoWithToken, | ||
13 | ServerInfo, | ||
14 | setAccessTokensToServers, | 10 | setAccessTokensToServers, |
15 | updateVideo, | 11 | wait, |
16 | uploadVideo, | 12 | waitJobs |
17 | wait | 13 | } from '@shared/extra-utils' |
18 | } from '../../../../shared/extra-utils' | 14 | import { VideoPrivacy } from '@shared/models' |
19 | import { waitJobs } from '../../../../shared/extra-utils/server/jobs' | ||
20 | import { Video, VideoPrivacy } from '../../../../shared/models/videos' | ||
21 | 15 | ||
22 | const expect = chai.expect | 16 | const expect = chai.expect |
23 | 17 | ||
24 | describe('Test ActivityPub videos search', function () { | 18 | describe('Test ActivityPub videos search', function () { |
25 | let servers: ServerInfo[] | 19 | let servers: PeerTubeServer[] |
26 | let videoServer1UUID: string | 20 | let videoServer1UUID: string |
27 | let videoServer2UUID: string | 21 | let videoServer2UUID: string |
28 | 22 | ||
23 | let command: SearchCommand | ||
24 | |||
29 | before(async function () { | 25 | before(async function () { |
30 | this.timeout(120000) | 26 | this.timeout(120000) |
31 | 27 | ||
32 | servers = await flushAndRunMultipleServers(2) | 28 | servers = await createMultipleServers(2) |
33 | 29 | ||
34 | await setAccessTokensToServers(servers) | 30 | await setAccessTokensToServers(servers) |
35 | 31 | ||
36 | { | 32 | { |
37 | const res = await uploadVideo(servers[0].url, servers[0].accessToken, { name: 'video 1 on server 1' }) | 33 | const { uuid } = await servers[0].videos.upload({ attributes: { name: 'video 1 on server 1' } }) |
38 | videoServer1UUID = res.body.video.uuid | 34 | videoServer1UUID = uuid |
39 | } | 35 | } |
40 | 36 | ||
41 | { | 37 | { |
42 | const res = await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'video 1 on server 2' }) | 38 | const { uuid } = await servers[1].videos.upload({ attributes: { name: 'video 1 on server 2' } }) |
43 | videoServer2UUID = res.body.video.uuid | 39 | videoServer2UUID = uuid |
44 | } | 40 | } |
45 | 41 | ||
46 | await waitJobs(servers) | 42 | await waitJobs(servers) |
43 | |||
44 | command = servers[0].search | ||
47 | }) | 45 | }) |
48 | 46 | ||
49 | it('Should not find a remote video', async function () { | 47 | it('Should not find a remote video', async function () { |
50 | { | 48 | { |
51 | const search = 'http://localhost:' + servers[1].port + '/videos/watch/43' | 49 | const search = 'http://localhost:' + servers[1].port + '/videos/watch/43' |
52 | const res = await searchVideoWithToken(servers[0].url, search, servers[0].accessToken) | 50 | const body = await command.searchVideos({ search, token: servers[0].accessToken }) |
53 | 51 | ||
54 | expect(res.body.total).to.equal(0) | 52 | expect(body.total).to.equal(0) |
55 | expect(res.body.data).to.be.an('array') | 53 | expect(body.data).to.be.an('array') |
56 | expect(res.body.data).to.have.lengthOf(0) | 54 | expect(body.data).to.have.lengthOf(0) |
57 | } | 55 | } |
58 | 56 | ||
59 | { | 57 | { |
60 | // Without token | 58 | // Without token |
61 | const search = 'http://localhost:' + servers[1].port + '/videos/watch/' + videoServer2UUID | 59 | const search = 'http://localhost:' + servers[1].port + '/videos/watch/' + videoServer2UUID |
62 | const res = await searchVideo(servers[0].url, search) | 60 | const body = await command.searchVideos({ search }) |
63 | 61 | ||
64 | expect(res.body.total).to.equal(0) | 62 | expect(body.total).to.equal(0) |
65 | expect(res.body.data).to.be.an('array') | 63 | expect(body.data).to.be.an('array') |
66 | expect(res.body.data).to.have.lengthOf(0) | 64 | expect(body.data).to.have.lengthOf(0) |
67 | } | 65 | } |
68 | }) | 66 | }) |
69 | 67 | ||
70 | it('Should search a local video', async function () { | 68 | it('Should search a local video', async function () { |
71 | const search = 'http://localhost:' + servers[0].port + '/videos/watch/' + videoServer1UUID | 69 | const search = 'http://localhost:' + servers[0].port + '/videos/watch/' + videoServer1UUID |
72 | const res = await searchVideo(servers[0].url, search) | 70 | const body = await command.searchVideos({ search }) |
73 | 71 | ||
74 | expect(res.body.total).to.equal(1) | 72 | expect(body.total).to.equal(1) |
75 | expect(res.body.data).to.be.an('array') | 73 | expect(body.data).to.be.an('array') |
76 | expect(res.body.data).to.have.lengthOf(1) | 74 | expect(body.data).to.have.lengthOf(1) |
77 | expect(res.body.data[0].name).to.equal('video 1 on server 1') | 75 | expect(body.data[0].name).to.equal('video 1 on server 1') |
78 | }) | 76 | }) |
79 | 77 | ||
80 | it('Should search a local video with an alternative URL', async function () { | 78 | it('Should search a local video with an alternative URL', async function () { |
81 | const search = 'http://localhost:' + servers[0].port + '/w/' + videoServer1UUID | 79 | const search = 'http://localhost:' + servers[0].port + '/w/' + videoServer1UUID |
82 | const res1 = await searchVideo(servers[0].url, search) | 80 | const body1 = await command.searchVideos({ search }) |
83 | const res2 = await searchVideoWithToken(servers[0].url, search, servers[0].accessToken) | 81 | const body2 = await command.searchVideos({ search, token: servers[0].accessToken }) |
84 | 82 | ||
85 | for (const res of [ res1, res2 ]) { | 83 | for (const body of [ body1, body2 ]) { |
86 | expect(res.body.total).to.equal(1) | 84 | expect(body.total).to.equal(1) |
87 | expect(res.body.data).to.be.an('array') | 85 | expect(body.data).to.be.an('array') |
88 | expect(res.body.data).to.have.lengthOf(1) | 86 | expect(body.data).to.have.lengthOf(1) |
89 | expect(res.body.data[0].name).to.equal('video 1 on server 1') | 87 | expect(body.data[0].name).to.equal('video 1 on server 1') |
90 | } | 88 | } |
91 | }) | 89 | }) |
92 | 90 | ||
@@ -97,20 +95,20 @@ describe('Test ActivityPub videos search', function () { | |||
97 | ] | 95 | ] |
98 | 96 | ||
99 | for (const search of searches) { | 97 | for (const search of searches) { |
100 | const res = await searchVideoWithToken(servers[0].url, search, servers[0].accessToken) | 98 | const body = await command.searchVideos({ search, token: servers[0].accessToken }) |
101 | 99 | ||
102 | expect(res.body.total).to.equal(1) | 100 | expect(body.total).to.equal(1) |
103 | expect(res.body.data).to.be.an('array') | 101 | expect(body.data).to.be.an('array') |
104 | expect(res.body.data).to.have.lengthOf(1) | 102 | expect(body.data).to.have.lengthOf(1) |
105 | expect(res.body.data[0].name).to.equal('video 1 on server 2') | 103 | expect(body.data[0].name).to.equal('video 1 on server 2') |
106 | } | 104 | } |
107 | }) | 105 | }) |
108 | 106 | ||
109 | it('Should not list this remote video', async function () { | 107 | it('Should not list this remote video', async function () { |
110 | const res = await getVideosList(servers[0].url) | 108 | const { total, data } = await servers[0].videos.list() |
111 | expect(res.body.total).to.equal(1) | 109 | expect(total).to.equal(1) |
112 | expect(res.body.data).to.have.lengthOf(1) | 110 | expect(data).to.have.lengthOf(1) |
113 | expect(res.body.data[0].name).to.equal('video 1 on server 1') | 111 | expect(data[0].name).to.equal('video 1 on server 1') |
114 | }) | 112 | }) |
115 | 113 | ||
116 | it('Should update video of server 2, and refresh it on server 1', async function () { | 114 | it('Should update video of server 2, and refresh it on server 1', async function () { |
@@ -120,8 +118,8 @@ describe('Test ActivityPub videos search', function () { | |||
120 | name: 'super_channel', | 118 | name: 'super_channel', |
121 | displayName: 'super channel' | 119 | displayName: 'super channel' |
122 | } | 120 | } |
123 | const resChannel = await addVideoChannel(servers[1].url, servers[1].accessToken, channelAttributes) | 121 | const created = await servers[1].channels.create({ attributes: channelAttributes }) |
124 | const videoChannelId = resChannel.body.videoChannel.id | 122 | const videoChannelId = created.id |
125 | 123 | ||
126 | const attributes = { | 124 | const attributes = { |
127 | name: 'updated', | 125 | name: 'updated', |
@@ -129,7 +127,7 @@ describe('Test ActivityPub videos search', function () { | |||
129 | privacy: VideoPrivacy.UNLISTED, | 127 | privacy: VideoPrivacy.UNLISTED, |
130 | channelId: videoChannelId | 128 | channelId: videoChannelId |
131 | } | 129 | } |
132 | await updateVideo(servers[1].url, servers[1].accessToken, videoServer2UUID, attributes) | 130 | await servers[1].videos.update({ id: videoServer2UUID, attributes }) |
133 | 131 | ||
134 | await waitJobs(servers) | 132 | await waitJobs(servers) |
135 | // Expire video | 133 | // Expire video |
@@ -137,16 +135,16 @@ describe('Test ActivityPub videos search', function () { | |||
137 | 135 | ||
138 | // Will run refresh async | 136 | // Will run refresh async |
139 | const search = 'http://localhost:' + servers[1].port + '/videos/watch/' + videoServer2UUID | 137 | const search = 'http://localhost:' + servers[1].port + '/videos/watch/' + videoServer2UUID |
140 | await searchVideoWithToken(servers[0].url, search, servers[0].accessToken) | 138 | await command.searchVideos({ search, token: servers[0].accessToken }) |
141 | 139 | ||
142 | // Wait refresh | 140 | // Wait refresh |
143 | await wait(5000) | 141 | await wait(5000) |
144 | 142 | ||
145 | const res = await searchVideoWithToken(servers[0].url, search, servers[0].accessToken) | 143 | const body = await command.searchVideos({ search, token: servers[0].accessToken }) |
146 | expect(res.body.total).to.equal(1) | 144 | expect(body.total).to.equal(1) |
147 | expect(res.body.data).to.have.lengthOf(1) | 145 | expect(body.data).to.have.lengthOf(1) |
148 | 146 | ||
149 | const video: Video = res.body.data[0] | 147 | const video = body.data[0] |
150 | expect(video.name).to.equal('updated') | 148 | expect(video.name).to.equal('updated') |
151 | expect(video.channel.name).to.equal('super_channel') | 149 | expect(video.channel.name).to.equal('super_channel') |
152 | expect(video.privacy.id).to.equal(VideoPrivacy.UNLISTED) | 150 | expect(video.privacy.id).to.equal(VideoPrivacy.UNLISTED) |
@@ -155,7 +153,7 @@ describe('Test ActivityPub videos search', function () { | |||
155 | it('Should delete video of server 2, and delete it on server 1', async function () { | 153 | it('Should delete video of server 2, and delete it on server 1', async function () { |
156 | this.timeout(120000) | 154 | this.timeout(120000) |
157 | 155 | ||
158 | await removeVideo(servers[1].url, servers[1].accessToken, videoServer2UUID) | 156 | await servers[1].videos.remove({ id: videoServer2UUID }) |
159 | 157 | ||
160 | await waitJobs(servers) | 158 | await waitJobs(servers) |
161 | // Expire video | 159 | // Expire video |
@@ -163,14 +161,14 @@ describe('Test ActivityPub videos search', function () { | |||
163 | 161 | ||
164 | // Will run refresh async | 162 | // Will run refresh async |
165 | const search = 'http://localhost:' + servers[1].port + '/videos/watch/' + videoServer2UUID | 163 | const search = 'http://localhost:' + servers[1].port + '/videos/watch/' + videoServer2UUID |
166 | await searchVideoWithToken(servers[0].url, search, servers[0].accessToken) | 164 | await command.searchVideos({ search, token: servers[0].accessToken }) |
167 | 165 | ||
168 | // Wait refresh | 166 | // Wait refresh |
169 | await wait(5000) | 167 | await wait(5000) |
170 | 168 | ||
171 | const res = await searchVideoWithToken(servers[0].url, search, servers[0].accessToken) | 169 | const body = await command.searchVideos({ search, token: servers[0].accessToken }) |
172 | expect(res.body.total).to.equal(0) | 170 | expect(body.total).to.equal(0) |
173 | expect(res.body.data).to.have.lengthOf(0) | 171 | expect(body.data).to.have.lengthOf(0) |
174 | }) | 172 | }) |
175 | 173 | ||
176 | after(async function () { | 174 | after(async function () { |