diff options
author | Chocobozzz <me@florianbigard.com> | 2021-07-13 14:23:01 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-07-20 15:27:18 +0200 |
commit | 7926c5f9b3ffcabb1ffb0dcfa5e48b8e0b88fbc0 (patch) | |
tree | 7a166515e4d57a06eb3c08be569f106ed049988b /server/tests/api/activitypub | |
parent | d0a0fa429d4651710ed951a3c11af0219e408964 (diff) | |
download | PeerTube-7926c5f9b3ffcabb1ffb0dcfa5e48b8e0b88fbc0.tar.gz PeerTube-7926c5f9b3ffcabb1ffb0dcfa5e48b8e0b88fbc0.tar.zst PeerTube-7926c5f9b3ffcabb1ffb0dcfa5e48b8e0b88fbc0.zip |
Introduce user command
Diffstat (limited to 'server/tests/api/activitypub')
-rw-r--r-- | server/tests/api/activitypub/fetch.ts | 3 | ||||
-rw-r--r-- | server/tests/api/activitypub/refresher.ts | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/server/tests/api/activitypub/fetch.ts b/server/tests/api/activitypub/fetch.ts index c1af23016..162f3ec83 100644 --- a/server/tests/api/activitypub/fetch.ts +++ b/server/tests/api/activitypub/fetch.ts | |||
@@ -4,7 +4,6 @@ import 'mocha' | |||
4 | import * as chai from 'chai' | 4 | import * as chai from 'chai' |
5 | import { | 5 | import { |
6 | cleanupTests, | 6 | cleanupTests, |
7 | createUser, | ||
8 | doubleFollow, | 7 | doubleFollow, |
9 | flushAndRunMultipleServers, | 8 | flushAndRunMultipleServers, |
10 | getVideosListSort, | 9 | getVideosListSort, |
@@ -32,7 +31,7 @@ describe('Test ActivityPub fetcher', function () { | |||
32 | 31 | ||
33 | const user = { username: 'user1', password: 'password' } | 32 | const user = { username: 'user1', password: 'password' } |
34 | for (const server of servers) { | 33 | for (const server of servers) { |
35 | await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password }) | 34 | await server.usersCommand.create({ username: user.username, password: user.password }) |
36 | } | 35 | } |
37 | 36 | ||
38 | const userAccessToken = await servers[0].loginCommand.getAccessToken(user) | 37 | const userAccessToken = await servers[0].loginCommand.getAccessToken(user) |
diff --git a/server/tests/api/activitypub/refresher.ts b/server/tests/api/activitypub/refresher.ts index af919f2f3..5a37dbc40 100644 --- a/server/tests/api/activitypub/refresher.ts +++ b/server/tests/api/activitypub/refresher.ts | |||
@@ -6,7 +6,6 @@ import { | |||
6 | cleanupTests, | 6 | cleanupTests, |
7 | doubleFollow, | 7 | doubleFollow, |
8 | flushAndRunMultipleServers, | 8 | flushAndRunMultipleServers, |
9 | generateUserAccessToken, | ||
10 | getVideo, | 9 | getVideo, |
11 | killallServers, | 10 | killallServers, |
12 | reRunServer, | 11 | reRunServer, |
@@ -44,10 +43,10 @@ describe('Test AP refresher', function () { | |||
44 | } | 43 | } |
45 | 44 | ||
46 | { | 45 | { |
47 | const a1 = await generateUserAccessToken(servers[1], 'user1') | 46 | const a1 = await servers[1].usersCommand.generateUserAndToken('user1') |
48 | await uploadVideo(servers[1].url, a1, { name: 'video4' }) | 47 | await uploadVideo(servers[1].url, a1, { name: 'video4' }) |
49 | 48 | ||
50 | const a2 = await generateUserAccessToken(servers[1], 'user2') | 49 | const a2 = await servers[1].usersCommand.generateUserAndToken('user2') |
51 | await uploadVideo(servers[1].url, a2, { name: 'video5' }) | 50 | await uploadVideo(servers[1].url, a2, { name: 'video5' }) |
52 | } | 51 | } |
53 | 52 | ||