import * as chai from 'chai'
import {
cleanupTests,
- flushAndRunMultipleServers,
+ createMultipleServers,
FollowsCommand,
- ServerInfo,
+ PeerTubeServer,
setAccessTokensToServers,
waitJobs
} from '@shared/extra-utils'
const expect = chai.expect
-async function checkServer1And2HasFollowers (servers: ServerInfo[], state = 'accepted') {
+async function checkServer1And2HasFollowers (servers: PeerTubeServer[], state = 'accepted') {
const fns = [
- servers[0].followsCommand.getFollowings.bind(servers[0].followsCommand),
- servers[1].followsCommand.getFollowers.bind(servers[1].followsCommand)
+ servers[0].follows.getFollowings.bind(servers[0].follows),
+ servers[1].follows.getFollowers.bind(servers[1].follows)
]
for (const fn of fns) {
}
}
-async function checkNoFollowers (servers: ServerInfo[]) {
+async function checkNoFollowers (servers: PeerTubeServer[]) {
const fns = [
- servers[0].followsCommand.getFollowings.bind(servers[0].followsCommand),
- servers[1].followsCommand.getFollowers.bind(servers[1].followsCommand)
+ servers[0].follows.getFollowings.bind(servers[0].follows),
+ servers[1].follows.getFollowers.bind(servers[1].follows)
]
for (const fn of fns) {
}
describe('Test follows moderation', function () {
- let servers: ServerInfo[] = []
+ let servers: PeerTubeServer[] = []
let commands: FollowsCommand[]
before(async function () {
this.timeout(30000)
- servers = await flushAndRunMultipleServers(3)
+ servers = await createMultipleServers(3)
// Get the access tokens
await setAccessTokensToServers(servers)
- commands = servers.map(s => s.followsCommand)
+ commands = servers.map(s => s.follows)
})
it('Should have server 1 following server 2', async function () {
this.timeout(30000)
- await commands[0].follow({ targets: [ servers[1].url ] })
+ await commands[0].follow({ hosts: [ servers[1].url ] })
await waitJobs(servers)
})
}
}
- await servers[1].configCommand.updateCustomSubConfig({ newConfig: subConfig })
+ await servers[1].config.updateCustomSubConfig({ newConfig: subConfig })
- await commands[0].follow({ targets: [ servers[1].url ] })
+ await commands[0].follow({ hosts: [ servers[1].url ] })
await waitJobs(servers)
await checkNoFollowers(servers)
}
}
- await servers[1].configCommand.updateCustomSubConfig({ newConfig: subConfig })
+ await servers[1].config.updateCustomSubConfig({ newConfig: subConfig })
- await commands[0].follow({ targets: [ servers[1].url ] })
+ await commands[0].follow({ hosts: [ servers[1].url ] })
await waitJobs(servers)
await checkServer1And2HasFollowers(servers)
}
}
- await servers[1].configCommand.updateCustomSubConfig({ newConfig: subConfig })
- await servers[2].configCommand.updateCustomSubConfig({ newConfig: subConfig })
+ await servers[1].config.updateCustomSubConfig({ newConfig: subConfig })
+ await servers[2].config.updateCustomSubConfig({ newConfig: subConfig })
- await commands[0].follow({ targets: [ servers[1].url ] })
+ await commands[0].follow({ hosts: [ servers[1].url ] })
await waitJobs(servers)
await checkServer1And2HasFollowers(servers, 'pending')
it('Should reject another follower', async function () {
this.timeout(20000)
- await commands[0].follow({ targets: [ servers[2].url ] })
+ await commands[0].follow({ hosts: [ servers[2].url ] })
await waitJobs(servers)
{