diff options
Diffstat (limited to 'server/tests/api/activitypub/fetch.ts')
-rw-r--r-- | server/tests/api/activitypub/fetch.ts | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/server/tests/api/activitypub/fetch.ts b/server/tests/api/activitypub/fetch.ts index 35fd94eed..d5e21404c 100644 --- a/server/tests/api/activitypub/fetch.ts +++ b/server/tests/api/activitypub/fetch.ts | |||
@@ -1,23 +1,19 @@ | |||
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 'mocha' | 3 | import 'mocha' |
4 | 4 | import * as chai from 'chai' | |
5 | import { | 5 | import { |
6 | cleanupTests, | 6 | cleanupTests, |
7 | closeAllSequelize, | ||
8 | createUser, | 7 | createUser, |
9 | doubleFollow, | 8 | doubleFollow, |
10 | flushAndRunMultipleServers, | 9 | flushAndRunMultipleServers, |
11 | getVideosListSort, | 10 | getVideosListSort, |
12 | ServerInfo, | 11 | ServerInfo, |
13 | setAccessTokensToServers, | 12 | setAccessTokensToServers, |
14 | setActorField, | ||
15 | setVideoField, | ||
16 | uploadVideo, | 13 | uploadVideo, |
17 | userLogin, | 14 | userLogin, |
18 | waitJobs | 15 | waitJobs |
19 | } from '../../../../shared/extra-utils' | 16 | } from '../../../../shared/extra-utils' |
20 | import * as chai from 'chai' | ||
21 | import { Video } from '../../../../shared/models/videos' | 17 | import { Video } from '../../../../shared/models/videos' |
22 | 18 | ||
23 | const expect = chai.expect | 19 | const expect = chai.expect |
@@ -50,12 +46,12 @@ describe('Test ActivityPub fetcher', function () { | |||
50 | { | 46 | { |
51 | const to = 'http://localhost:' + servers[0].port + '/accounts/user1' | 47 | const to = 'http://localhost:' + servers[0].port + '/accounts/user1' |
52 | const value = 'http://localhost:' + servers[1].port + '/accounts/user1' | 48 | const value = 'http://localhost:' + servers[1].port + '/accounts/user1' |
53 | await setActorField(servers[0].internalServerNumber, to, 'url', value) | 49 | await servers[0].sqlCommand.setActorField(to, 'url', value) |
54 | } | 50 | } |
55 | 51 | ||
56 | { | 52 | { |
57 | const value = 'http://localhost:' + servers[2].port + '/videos/watch/' + badVideoUUID | 53 | const value = 'http://localhost:' + servers[2].port + '/videos/watch/' + badVideoUUID |
58 | await setVideoField(servers[0].internalServerNumber, badVideoUUID, 'url', value) | 54 | await servers[0].sqlCommand.setVideoField(badVideoUUID, 'url', value) |
59 | } | 55 | } |
60 | }) | 56 | }) |
61 | 57 | ||
@@ -88,7 +84,5 @@ describe('Test ActivityPub fetcher', function () { | |||
88 | this.timeout(20000) | 84 | this.timeout(20000) |
89 | 85 | ||
90 | await cleanupTests(servers) | 86 | await cleanupTests(servers) |
91 | |||
92 | await closeAllSequelize(servers) | ||
93 | }) | 87 | }) |
94 | }) | 88 | }) |