diff options
author | kontrollanten <6680299+kontrollanten@users.noreply.github.com> | 2022-10-04 10:53:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-04 10:53:00 +0200 |
commit | 6c5f0d3aebbd9debcd33a9aab306b130547852a5 (patch) | |
tree | bb5da168dc1d60f13c3fd6247fa9082928529a8a /server/tests/shared/actors.ts | |
parent | cfd57d2ca0bb058087f7dc90fcc3e8442b0288e1 (diff) | |
download | PeerTube-6c5f0d3aebbd9debcd33a9aab306b130547852a5.tar.gz PeerTube-6c5f0d3aebbd9debcd33a9aab306b130547852a5.tar.zst PeerTube-6c5f0d3aebbd9debcd33a9aab306b130547852a5.zip |
server: serve files from storage/well-known (#5214)
* server: serve files from storage/well-known
closes #5206
* well-known: add tests
* test: try to skip new tests
* test: another try
* fix(config/prod): well_known path
* test: fix broken tests
* Update misc-endpoints.ts
* Use getDirectoryPath for tests
* Fix tests
Co-authored-by: Chocobozzz <me@florianbigard.com>
Diffstat (limited to 'server/tests/shared/actors.ts')
-rw-r--r-- | server/tests/shared/actors.ts | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/server/tests/shared/actors.ts b/server/tests/shared/actors.ts index f8f4a5137..41fd72e89 100644 --- a/server/tests/shared/actors.ts +++ b/server/tests/shared/actors.ts | |||
@@ -2,8 +2,6 @@ | |||
2 | 2 | ||
3 | import { expect } from 'chai' | 3 | import { expect } from 'chai' |
4 | import { pathExists, readdir } from 'fs-extra' | 4 | import { pathExists, readdir } from 'fs-extra' |
5 | import { join } from 'path' | ||
6 | import { root } from '@shared/core-utils' | ||
7 | import { Account, VideoChannel } from '@shared/models' | 5 | import { Account, VideoChannel } from '@shared/models' |
8 | import { PeerTubeServer } from '@shared/server-commands' | 6 | import { PeerTubeServer } from '@shared/server-commands' |
9 | 7 | ||
@@ -31,11 +29,9 @@ async function expectAccountFollows (options: { | |||
31 | return expectActorFollow({ ...options, data }) | 29 | return expectActorFollow({ ...options, data }) |
32 | } | 30 | } |
33 | 31 | ||
34 | async function checkActorFilesWereRemoved (filename: string, serverNumber: number) { | 32 | async function checkActorFilesWereRemoved (filename: string, server: PeerTubeServer) { |
35 | const testDirectory = 'test' + serverNumber | ||
36 | |||
37 | for (const directory of [ 'avatars' ]) { | 33 | for (const directory of [ 'avatars' ]) { |
38 | const directoryPath = join(root(), testDirectory, directory) | 34 | const directoryPath = server.getDirectoryPath(directory) |
39 | 35 | ||
40 | const directoryExists = await pathExists(directoryPath) | 36 | const directoryExists = await pathExists(directoryPath) |
41 | expect(directoryExists).to.be.true | 37 | expect(directoryExists).to.be.true |