diff options
Diffstat (limited to 'server/tests/feeds/feeds.ts')
-rw-r--r-- | server/tests/feeds/feeds.ts | 122 |
1 files changed, 60 insertions, 62 deletions
diff --git a/server/tests/feeds/feeds.ts b/server/tests/feeds/feeds.ts index 7bad81751..4d29a2e39 100644 --- a/server/tests/feeds/feeds.ts +++ b/server/tests/feeds/feeds.ts | |||
@@ -11,16 +11,15 @@ import { | |||
11 | import { addUserSubscription, listUserSubscriptionVideos } from '@shared/extra-utils/users/user-subscriptions' | 11 | import { addUserSubscription, listUserSubscriptionVideos } from '@shared/extra-utils/users/user-subscriptions' |
12 | import { VideoPrivacy } from '@shared/models' | 12 | import { VideoPrivacy } from '@shared/models' |
13 | import { ScopedToken } from '@shared/models/users/user-scoped-token' | 13 | import { ScopedToken } from '@shared/models/users/user-scoped-token' |
14 | import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes' | ||
14 | import { | 15 | import { |
15 | cleanupTests, | 16 | cleanupTests, |
16 | createUser, | 17 | createUser, |
17 | doubleFollow, | 18 | doubleFollow, |
18 | flushAndRunMultipleServers, | 19 | flushAndRunMultipleServers, |
19 | flushAndRunServer, | 20 | flushAndRunServer, |
20 | getJSONfeed, | ||
21 | getMyUserInformation, | 21 | getMyUserInformation, |
22 | getUserScopedTokens, | 22 | getUserScopedTokens, |
23 | getXMLfeed, | ||
24 | renewUserScopedTokens, | 23 | renewUserScopedTokens, |
25 | ServerInfo, | 24 | ServerInfo, |
26 | setAccessTokensToServers, | 25 | setAccessTokensToServers, |
@@ -31,7 +30,6 @@ import { | |||
31 | import { waitJobs } from '../../../shared/extra-utils/server/jobs' | 30 | import { waitJobs } from '../../../shared/extra-utils/server/jobs' |
32 | import { addVideoCommentThread } from '../../../shared/extra-utils/videos/video-comments' | 31 | import { addVideoCommentThread } from '../../../shared/extra-utils/videos/video-comments' |
33 | import { User } from '../../../shared/models/users' | 32 | import { User } from '../../../shared/models/users' |
34 | import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes' | ||
35 | 33 | ||
36 | chai.use(require('chai-xml')) | 34 | chai.use(require('chai-xml')) |
37 | chai.use(require('chai-json-schema')) | 35 | chai.use(require('chai-json-schema')) |
@@ -118,18 +116,18 @@ describe('Test syndication feeds', () => { | |||
118 | 116 | ||
119 | it('Should be well formed XML (covers RSS 2.0 and ATOM 1.0 endpoints)', async function () { | 117 | it('Should be well formed XML (covers RSS 2.0 and ATOM 1.0 endpoints)', async function () { |
120 | for (const feed of [ 'video-comments' as 'video-comments', 'videos' as 'videos' ]) { | 118 | for (const feed of [ 'video-comments' as 'video-comments', 'videos' as 'videos' ]) { |
121 | const rss = await getXMLfeed(servers[0].url, feed) | 119 | const rss = await servers[0].feedCommand.getXML({ feed }) |
122 | expect(rss.text).xml.to.be.valid() | 120 | expect(rss).xml.to.be.valid() |
123 | 121 | ||
124 | const atom = await getXMLfeed(servers[0].url, feed, 'atom') | 122 | const atom = await servers[0].feedCommand.getXML({ feed, format: 'atom' }) |
125 | expect(atom.text).xml.to.be.valid() | 123 | expect(atom).xml.to.be.valid() |
126 | } | 124 | } |
127 | }) | 125 | }) |
128 | 126 | ||
129 | it('Should be well formed JSON (covers JSON feed 1.0 endpoint)', async function () { | 127 | it('Should be well formed JSON (covers JSON feed 1.0 endpoint)', async function () { |
130 | for (const feed of [ 'video-comments' as 'video-comments', 'videos' as 'videos' ]) { | 128 | for (const feed of [ 'video-comments' as 'video-comments', 'videos' as 'videos' ]) { |
131 | const json = await getJSONfeed(servers[0].url, feed) | 129 | const jsonText = await servers[0].feedCommand.getJSON({ feed }) |
132 | expect(JSON.parse(json.text)).to.be.jsonSchema({ type: 'object' }) | 130 | expect(JSON.parse(jsonText)).to.be.jsonSchema({ type: 'object' }) |
133 | } | 131 | } |
134 | }) | 132 | }) |
135 | }) | 133 | }) |
@@ -138,10 +136,10 @@ describe('Test syndication feeds', () => { | |||
138 | 136 | ||
139 | it('Should contain a valid enclosure (covers RSS 2.0 endpoint)', async function () { | 137 | it('Should contain a valid enclosure (covers RSS 2.0 endpoint)', async function () { |
140 | for (const server of servers) { | 138 | for (const server of servers) { |
141 | const rss = await getXMLfeed(server.url, 'videos') | 139 | const rss = await server.feedCommand.getXML({ feed: 'videos' }) |
142 | expect(xmlParser.validate(rss.text)).to.be.true | 140 | expect(xmlParser.validate(rss)).to.be.true |
143 | 141 | ||
144 | const xmlDoc = xmlParser.parse(rss.text, { parseAttributeValue: true, ignoreAttributes: false }) | 142 | const xmlDoc = xmlParser.parse(rss, { parseAttributeValue: true, ignoreAttributes: false }) |
145 | 143 | ||
146 | const enclosure = xmlDoc.rss.channel.item[0].enclosure | 144 | const enclosure = xmlDoc.rss.channel.item[0].enclosure |
147 | expect(enclosure).to.exist | 145 | expect(enclosure).to.exist |
@@ -153,8 +151,8 @@ describe('Test syndication feeds', () => { | |||
153 | 151 | ||
154 | it('Should contain a valid \'attachments\' object (covers JSON feed 1.0 endpoint)', async function () { | 152 | it('Should contain a valid \'attachments\' object (covers JSON feed 1.0 endpoint)', async function () { |
155 | for (const server of servers) { | 153 | for (const server of servers) { |
156 | const json = await getJSONfeed(server.url, 'videos') | 154 | const json = await server.feedCommand.getJSON({ feed: 'videos' }) |
157 | const jsonObj = JSON.parse(json.text) | 155 | const jsonObj = JSON.parse(json) |
158 | expect(jsonObj.items.length).to.be.equal(2) | 156 | expect(jsonObj.items.length).to.be.equal(2) |
159 | expect(jsonObj.items[0].attachments).to.exist | 157 | expect(jsonObj.items[0].attachments).to.exist |
160 | expect(jsonObj.items[0].attachments.length).to.be.eq(1) | 158 | expect(jsonObj.items[0].attachments.length).to.be.eq(1) |
@@ -166,16 +164,16 @@ describe('Test syndication feeds', () => { | |||
166 | 164 | ||
167 | it('Should filter by account', async function () { | 165 | it('Should filter by account', async function () { |
168 | { | 166 | { |
169 | const json = await getJSONfeed(servers[0].url, 'videos', { accountId: rootAccountId }) | 167 | const json = await servers[0].feedCommand.getJSON({ feed: 'videos', query: { accountId: rootAccountId } }) |
170 | const jsonObj = JSON.parse(json.text) | 168 | const jsonObj = JSON.parse(json) |
171 | expect(jsonObj.items.length).to.be.equal(1) | 169 | expect(jsonObj.items.length).to.be.equal(1) |
172 | expect(jsonObj.items[0].title).to.equal('my super name for server 1') | 170 | expect(jsonObj.items[0].title).to.equal('my super name for server 1') |
173 | expect(jsonObj.items[0].author.name).to.equal('root') | 171 | expect(jsonObj.items[0].author.name).to.equal('root') |
174 | } | 172 | } |
175 | 173 | ||
176 | { | 174 | { |
177 | const json = await getJSONfeed(servers[0].url, 'videos', { accountId: userAccountId }) | 175 | const json = await servers[0].feedCommand.getJSON({ feed: 'videos', query: { accountId: userAccountId } }) |
178 | const jsonObj = JSON.parse(json.text) | 176 | const jsonObj = JSON.parse(json) |
179 | expect(jsonObj.items.length).to.be.equal(1) | 177 | expect(jsonObj.items.length).to.be.equal(1) |
180 | expect(jsonObj.items[0].title).to.equal('user video') | 178 | expect(jsonObj.items[0].title).to.equal('user video') |
181 | expect(jsonObj.items[0].author.name).to.equal('john') | 179 | expect(jsonObj.items[0].author.name).to.equal('john') |
@@ -183,15 +181,15 @@ describe('Test syndication feeds', () => { | |||
183 | 181 | ||
184 | for (const server of servers) { | 182 | for (const server of servers) { |
185 | { | 183 | { |
186 | const json = await getJSONfeed(server.url, 'videos', { accountName: 'root@localhost:' + servers[0].port }) | 184 | const json = await server.feedCommand.getJSON({ feed: 'videos', query: { accountName: 'root@localhost:' + servers[0].port } }) |
187 | const jsonObj = JSON.parse(json.text) | 185 | const jsonObj = JSON.parse(json) |
188 | expect(jsonObj.items.length).to.be.equal(1) | 186 | expect(jsonObj.items.length).to.be.equal(1) |
189 | expect(jsonObj.items[0].title).to.equal('my super name for server 1') | 187 | expect(jsonObj.items[0].title).to.equal('my super name for server 1') |
190 | } | 188 | } |
191 | 189 | ||
192 | { | 190 | { |
193 | const json = await getJSONfeed(server.url, 'videos', { accountName: 'john@localhost:' + servers[0].port }) | 191 | const json = await server.feedCommand.getJSON({ feed: 'videos', query: { accountName: 'john@localhost:' + servers[0].port } }) |
194 | const jsonObj = JSON.parse(json.text) | 192 | const jsonObj = JSON.parse(json) |
195 | expect(jsonObj.items.length).to.be.equal(1) | 193 | expect(jsonObj.items.length).to.be.equal(1) |
196 | expect(jsonObj.items[0].title).to.equal('user video') | 194 | expect(jsonObj.items[0].title).to.equal('user video') |
197 | } | 195 | } |
@@ -200,16 +198,16 @@ describe('Test syndication feeds', () => { | |||
200 | 198 | ||
201 | it('Should filter by video channel', async function () { | 199 | it('Should filter by video channel', async function () { |
202 | { | 200 | { |
203 | const json = await getJSONfeed(servers[0].url, 'videos', { videoChannelId: rootChannelId }) | 201 | const json = await servers[0].feedCommand.getJSON({ feed: 'videos', query: { videoChannelId: rootChannelId } }) |
204 | const jsonObj = JSON.parse(json.text) | 202 | const jsonObj = JSON.parse(json) |
205 | expect(jsonObj.items.length).to.be.equal(1) | 203 | expect(jsonObj.items.length).to.be.equal(1) |
206 | expect(jsonObj.items[0].title).to.equal('my super name for server 1') | 204 | expect(jsonObj.items[0].title).to.equal('my super name for server 1') |
207 | expect(jsonObj.items[0].author.name).to.equal('root') | 205 | expect(jsonObj.items[0].author.name).to.equal('root') |
208 | } | 206 | } |
209 | 207 | ||
210 | { | 208 | { |
211 | const json = await getJSONfeed(servers[0].url, 'videos', { videoChannelId: userChannelId }) | 209 | const json = await servers[0].feedCommand.getJSON({ feed: 'videos', query: { videoChannelId: userChannelId } }) |
212 | const jsonObj = JSON.parse(json.text) | 210 | const jsonObj = JSON.parse(json) |
213 | expect(jsonObj.items.length).to.be.equal(1) | 211 | expect(jsonObj.items.length).to.be.equal(1) |
214 | expect(jsonObj.items[0].title).to.equal('user video') | 212 | expect(jsonObj.items[0].title).to.equal('user video') |
215 | expect(jsonObj.items[0].author.name).to.equal('john') | 213 | expect(jsonObj.items[0].author.name).to.equal('john') |
@@ -217,15 +215,17 @@ describe('Test syndication feeds', () => { | |||
217 | 215 | ||
218 | for (const server of servers) { | 216 | for (const server of servers) { |
219 | { | 217 | { |
220 | const json = await getJSONfeed(server.url, 'videos', { videoChannelName: 'root_channel@localhost:' + servers[0].port }) | 218 | const query = { videoChannelName: 'root_channel@localhost:' + servers[0].port } |
221 | const jsonObj = JSON.parse(json.text) | 219 | const json = await server.feedCommand.getJSON({ feed: 'videos', query }) |
220 | const jsonObj = JSON.parse(json) | ||
222 | expect(jsonObj.items.length).to.be.equal(1) | 221 | expect(jsonObj.items.length).to.be.equal(1) |
223 | expect(jsonObj.items[0].title).to.equal('my super name for server 1') | 222 | expect(jsonObj.items[0].title).to.equal('my super name for server 1') |
224 | } | 223 | } |
225 | 224 | ||
226 | { | 225 | { |
227 | const json = await getJSONfeed(server.url, 'videos', { videoChannelName: 'john_channel@localhost:' + servers[0].port }) | 226 | const query = { videoChannelName: 'john_channel@localhost:' + servers[0].port } |
228 | const jsonObj = JSON.parse(json.text) | 227 | const json = await server.feedCommand.getJSON({ feed: 'videos', query }) |
228 | const jsonObj = JSON.parse(json) | ||
229 | expect(jsonObj.items.length).to.be.equal(1) | 229 | expect(jsonObj.items.length).to.be.equal(1) |
230 | expect(jsonObj.items[0].title).to.equal('user video') | 230 | expect(jsonObj.items[0].title).to.equal('user video') |
231 | } | 231 | } |
@@ -239,8 +239,8 @@ describe('Test syndication feeds', () => { | |||
239 | 239 | ||
240 | await waitJobs([ serverHLSOnly ]) | 240 | await waitJobs([ serverHLSOnly ]) |
241 | 241 | ||
242 | const json = await getJSONfeed(serverHLSOnly.url, 'videos') | 242 | const json = await serverHLSOnly.feedCommand.getJSON({ feed: 'videos' }) |
243 | const jsonObj = JSON.parse(json.text) | 243 | const jsonObj = JSON.parse(json) |
244 | expect(jsonObj.items.length).to.be.equal(1) | 244 | expect(jsonObj.items.length).to.be.equal(1) |
245 | expect(jsonObj.items[0].attachments).to.exist | 245 | expect(jsonObj.items[0].attachments).to.exist |
246 | expect(jsonObj.items[0].attachments.length).to.be.eq(4) | 246 | expect(jsonObj.items[0].attachments.length).to.be.eq(4) |
@@ -257,9 +257,9 @@ describe('Test syndication feeds', () => { | |||
257 | 257 | ||
258 | it('Should contain valid comments (covers JSON feed 1.0 endpoint) and not from unlisted videos', async function () { | 258 | it('Should contain valid comments (covers JSON feed 1.0 endpoint) and not from unlisted videos', async function () { |
259 | for (const server of servers) { | 259 | for (const server of servers) { |
260 | const json = await getJSONfeed(server.url, 'video-comments') | 260 | const json = await server.feedCommand.getJSON({ feed: 'video-comments' }) |
261 | 261 | ||
262 | const jsonObj = JSON.parse(json.text) | 262 | const jsonObj = JSON.parse(json) |
263 | expect(jsonObj.items.length).to.be.equal(2) | 263 | expect(jsonObj.items.length).to.be.equal(2) |
264 | expect(jsonObj.items[0].html_content).to.equal('super comment 2') | 264 | expect(jsonObj.items[0].html_content).to.equal('super comment 2') |
265 | expect(jsonObj.items[1].html_content).to.equal('super comment 1') | 265 | expect(jsonObj.items[1].html_content).to.equal('super comment 1') |
@@ -274,8 +274,8 @@ describe('Test syndication feeds', () => { | |||
274 | await addAccountToServerBlocklist(servers[1].url, servers[1].accessToken, remoteHandle) | 274 | await addAccountToServerBlocklist(servers[1].url, servers[1].accessToken, remoteHandle) |
275 | 275 | ||
276 | { | 276 | { |
277 | const json = await getJSONfeed(servers[1].url, 'video-comments', { version: 2 }) | 277 | const json = await servers[1].feedCommand.getJSON({ feed: 'video-comments', query: { version: 2 } }) |
278 | const jsonObj = JSON.parse(json.text) | 278 | const jsonObj = JSON.parse(json) |
279 | expect(jsonObj.items.length).to.be.equal(0) | 279 | expect(jsonObj.items.length).to.be.equal(0) |
280 | } | 280 | } |
281 | 281 | ||
@@ -287,16 +287,16 @@ describe('Test syndication feeds', () => { | |||
287 | await addVideoCommentThread(servers[0].url, servers[0].accessToken, videoUUID, 'super comment') | 287 | await addVideoCommentThread(servers[0].url, servers[0].accessToken, videoUUID, 'super comment') |
288 | await waitJobs(servers) | 288 | await waitJobs(servers) |
289 | 289 | ||
290 | const json = await getJSONfeed(servers[1].url, 'video-comments', { version: 3 }) | 290 | const json = await servers[1].feedCommand.getJSON({ feed: 'video-comments', query: { version: 3 } }) |
291 | const jsonObj = JSON.parse(json.text) | 291 | const jsonObj = JSON.parse(json) |
292 | expect(jsonObj.items.length).to.be.equal(3) | 292 | expect(jsonObj.items.length).to.be.equal(3) |
293 | } | 293 | } |
294 | 294 | ||
295 | await addAccountToAccountBlocklist(servers[1].url, servers[1].accessToken, remoteHandle) | 295 | await addAccountToAccountBlocklist(servers[1].url, servers[1].accessToken, remoteHandle) |
296 | 296 | ||
297 | { | 297 | { |
298 | const json = await getJSONfeed(servers[1].url, 'video-comments', { version: 4 }) | 298 | const json = await servers[1].feedCommand.getJSON({ feed: 'video-comments', query: { version: 4 } }) |
299 | const jsonObj = JSON.parse(json.text) | 299 | const jsonObj = JSON.parse(json) |
300 | expect(jsonObj.items.length).to.be.equal(2) | 300 | expect(jsonObj.items.length).to.be.equal(2) |
301 | } | 301 | } |
302 | }) | 302 | }) |
@@ -327,31 +327,30 @@ describe('Test syndication feeds', () => { | |||
327 | const res = await listUserSubscriptionVideos(servers[0].url, feeduserAccessToken) | 327 | const res = await listUserSubscriptionVideos(servers[0].url, feeduserAccessToken) |
328 | expect(res.body.total).to.equal(0) | 328 | expect(res.body.total).to.equal(0) |
329 | 329 | ||
330 | const json = await getJSONfeed(servers[0].url, 'subscriptions', { accountId: feeduserAccountId, token: feeduserFeedToken }) | 330 | const query = { accountId: feeduserAccountId, token: feeduserFeedToken } |
331 | const jsonObj = JSON.parse(json.text) | 331 | const json = await servers[0].feedCommand.getJSON({ feed: 'subscriptions', query }) |
332 | const jsonObj = JSON.parse(json) | ||
332 | expect(jsonObj.items.length).to.be.equal(0) // no subscription, it should not list the instance's videos but list 0 videos | 333 | expect(jsonObj.items.length).to.be.equal(0) // no subscription, it should not list the instance's videos but list 0 videos |
333 | } | 334 | } |
334 | }) | 335 | }) |
335 | 336 | ||
336 | it('Should fail with an invalid token', async function () { | 337 | it('Should fail with an invalid token', async function () { |
337 | await getJSONfeed(servers[0].url, 'subscriptions', { accountId: feeduserAccountId, token: 'toto' }, HttpStatusCode.FORBIDDEN_403) | 338 | const query = { accountId: feeduserAccountId, token: 'toto' } |
339 | await servers[0].feedCommand.getJSON({ feed: 'subscriptions', query, expectedStatus: HttpStatusCode.FORBIDDEN_403 }) | ||
338 | }) | 340 | }) |
339 | 341 | ||
340 | it('Should fail with a token of another user', async function () { | 342 | it('Should fail with a token of another user', async function () { |
341 | await getJSONfeed( | 343 | const query = { accountId: feeduserAccountId, token: userFeedToken } |
342 | servers[0].url, | 344 | await servers[0].feedCommand.getJSON({ feed: 'subscriptions', query, expectedStatus: HttpStatusCode.FORBIDDEN_403 }) |
343 | 'subscriptions', | ||
344 | { accountId: feeduserAccountId, token: userFeedToken }, | ||
345 | HttpStatusCode.FORBIDDEN_403 | ||
346 | ) | ||
347 | }) | 345 | }) |
348 | 346 | ||
349 | it('Should list no videos for a user with videos but no subscriptions', async function () { | 347 | it('Should list no videos for a user with videos but no subscriptions', async function () { |
350 | const res = await listUserSubscriptionVideos(servers[0].url, userAccessToken) | 348 | const res = await listUserSubscriptionVideos(servers[0].url, userAccessToken) |
351 | expect(res.body.total).to.equal(0) | 349 | expect(res.body.total).to.equal(0) |
352 | 350 | ||
353 | const json = await getJSONfeed(servers[0].url, 'subscriptions', { accountId: userAccountId, token: userFeedToken }) | 351 | const query = { accountId: userAccountId, token: userFeedToken } |
354 | const jsonObj = JSON.parse(json.text) | 352 | const json = await servers[0].feedCommand.getJSON({ feed: 'subscriptions', query }) |
353 | const jsonObj = JSON.parse(json) | ||
355 | expect(jsonObj.items.length).to.be.equal(0) // no subscription, it should not list the instance's videos but list 0 videos | 354 | expect(jsonObj.items.length).to.be.equal(0) // no subscription, it should not list the instance's videos but list 0 videos |
356 | }) | 355 | }) |
357 | 356 | ||
@@ -366,8 +365,9 @@ describe('Test syndication feeds', () => { | |||
366 | expect(res.body.total).to.equal(1) | 365 | expect(res.body.total).to.equal(1) |
367 | expect(res.body.data[0].name).to.equal('user video') | 366 | expect(res.body.data[0].name).to.equal('user video') |
368 | 367 | ||
369 | const json = await getJSONfeed(servers[0].url, 'subscriptions', { accountId: userAccountId, token: userFeedToken, version: 1 }) | 368 | const query = { accountId: userAccountId, token: userFeedToken, version: 1 } |
370 | const jsonObj = JSON.parse(json.text) | 369 | const json = await servers[0].feedCommand.getJSON({ feed: 'subscriptions', query }) |
370 | const jsonObj = JSON.parse(json) | ||
371 | expect(jsonObj.items.length).to.be.equal(1) // subscribed to self, it should not list the instance's videos but list john's | 371 | expect(jsonObj.items.length).to.be.equal(1) // subscribed to self, it should not list the instance's videos but list john's |
372 | } | 372 | } |
373 | }) | 373 | }) |
@@ -382,8 +382,9 @@ describe('Test syndication feeds', () => { | |||
382 | const res = await listUserSubscriptionVideos(servers[0].url, userAccessToken) | 382 | const res = await listUserSubscriptionVideos(servers[0].url, userAccessToken) |
383 | expect(res.body.total).to.equal(2, "there should be 2 videos part of the subscription") | 383 | expect(res.body.total).to.equal(2, "there should be 2 videos part of the subscription") |
384 | 384 | ||
385 | const json = await getJSONfeed(servers[0].url, 'subscriptions', { accountId: userAccountId, token: userFeedToken, version: 2 }) | 385 | const query = { accountId: userAccountId, token: userFeedToken, version: 2 } |
386 | const jsonObj = JSON.parse(json.text) | 386 | const json = await servers[0].feedCommand.getJSON({ feed: 'subscriptions', query }) |
387 | const jsonObj = JSON.parse(json) | ||
387 | expect(jsonObj.items.length).to.be.equal(2) // subscribed to root, it should not list the instance's videos but list root/john's | 388 | expect(jsonObj.items.length).to.be.equal(2) // subscribed to root, it should not list the instance's videos but list root/john's |
388 | } | 389 | } |
389 | }) | 390 | }) |
@@ -391,12 +392,8 @@ describe('Test syndication feeds', () => { | |||
391 | it('Should renew the token, and so have an invalid old token', async function () { | 392 | it('Should renew the token, and so have an invalid old token', async function () { |
392 | await renewUserScopedTokens(servers[0].url, userAccessToken) | 393 | await renewUserScopedTokens(servers[0].url, userAccessToken) |
393 | 394 | ||
394 | await getJSONfeed( | 395 | const query = { accountId: userAccountId, token: userFeedToken, version: 3 } |
395 | servers[0].url, | 396 | await servers[0].feedCommand.getJSON({ feed: 'subscriptions', query, expectedStatus: HttpStatusCode.FORBIDDEN_403 }) |
396 | 'subscriptions', | ||
397 | { accountId: userAccountId, token: userFeedToken, version: 3 }, | ||
398 | HttpStatusCode.FORBIDDEN_403 | ||
399 | ) | ||
400 | }) | 397 | }) |
401 | 398 | ||
402 | it('Should succeed with the new token', async function () { | 399 | it('Should succeed with the new token', async function () { |
@@ -404,7 +401,8 @@ describe('Test syndication feeds', () => { | |||
404 | const token: ScopedToken = res2.body | 401 | const token: ScopedToken = res2.body |
405 | userFeedToken = token.feedToken | 402 | userFeedToken = token.feedToken |
406 | 403 | ||
407 | await getJSONfeed(servers[0].url, 'subscriptions', { accountId: userAccountId, token: userFeedToken, version: 4 }) | 404 | const query = { accountId: userAccountId, token: userFeedToken, version: 4 } |
405 | await servers[0].feedCommand.getJSON({ feed: 'subscriptions', query }) | ||
408 | }) | 406 | }) |
409 | 407 | ||
410 | }) | 408 | }) |